提交 80020839 编写于 作者: 钟一霄's avatar 钟一霄

1. 移动端更新显示:微信关怀模式下大字体正常显示

2. **散客预约、团队预约**页面:更新周一闭馆不可预约限制
上级 0581d9b8
流水线 #41041 已通过 ,包含阶段
in 1 minute 和 26 second
...@@ -16,3 +16,45 @@ ...@@ -16,3 +16,45 @@
@import "uview-ui/index.scss"; @import "uview-ui/index.scss";
</style> </style>
<script>
// 1. 判断是否在微信环境
function isWeixin() {
return /MicroMessenger/i.test(navigator.userAgent);
}
// 2. 设置字体不缩放
function disableWeixinFontScale() {
if (!isWeixin()) return; // 非微信环境不执行
if (typeof WeixinJSBridge !== "undefined" && WeixinJSBridge.invoke) {
try {
WeixinJSBridge.invoke('setFontSizeCallback', { 'fontSize': 0 });
WeixinJSBridge.on('menu:setfont', function() {
WeixinJSBridge.invoke('setFontSizeCallback', { 'fontSize': 0 });
});
} catch (e) {
console.warn("微信字体调整禁用失败:", e);
}
} else {
console.log("WeixinJSBridge 未加载,尝试监听事件...");
document.addEventListener('WeixinJSBridgeReady', disableWeixinFontScale, false);
}
}
// 3. 初始化
disableWeixinFontScale();
</script>
<style>
body {
-webkit-text-size-adjust: 100% !important;
text-size-adjust: 100% !important;
-moz-text-size-adjust: 100% !important;
}
.vxe-tooltip--wrapper, .theme--dark, .is--enterable, .is--arrow{
z-index: 9999999 !important;
}
</style>
\ No newline at end of file
## 琼台博物馆预约 ## 琼台博物馆预约
### 单点方式 ### 单点方式
浏览器手机号登录 /pages/loginPC/index 浏览器手机号登录 /pages/loginPC/index
### 更新日志 ### 更新日志
- 202400620
- 202400620
- 单位名称和车辆信息两项必填。车辆信息车牌和‘无’字都可以通过校验 - 单位名称和车辆信息两项必填。车辆信息车牌和‘无’字都可以通过校验
- 车辆信息旁边备注:填写正确的车牌信息(若无车辆填无) - 车辆信息旁边备注:填写正确的车牌信息(若无车辆填无)
- 202400730 - 202400730
- 新增闭管公告 - 新增闭管公告
- 20260106
- 移动端更新显示:微信关怀模式下大字体正常显示
- **散客预约、团队预约**页面:更新周一闭馆不可预约限制
{ {
"name" : "museum-reservation", "name" : "museum-reservation",
"appid" : "__UNI__B09330D", "appid" : "__UNI__810EADB",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",
......
此差异已折叠。
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<!-- 日期--> <!-- 日期-->
<view v-for="(item,index) in dateList" v-if="index < 3" :key="index" <view v-for="(item,index) in dateList" v-if="index < 3" :key="index"
ref="selectAppointmentDate" ref="selectAppointmentDate"
:class="['content-header-content-header-footer-leftItem','content-header-content-header-footer-leftItem1'][item.state]" :class="['content-header-content-header-footer-leftItem','content-header-content-header-footer-leftItem1','content-header-content-header-footer-leftItem1'][item.state]"
@click="selectAppointmentDate(item,index)"> @click="selectAppointmentDate(item,index)">
<view class="content-header-content-header-footer-leftItem-top"> <view class="content-header-content-header-footer-leftItem-top">
<view class="content-header-content-header-footer-leftItem-top-left"> <view class="content-header-content-header-footer-leftItem-top-left">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<view class="content-header-content-header-footer-leftItem-top-right-item"> <view class="content-header-content-header-footer-leftItem-top-right-item">
<u-icon v-if="item.OkState === 3" color="#ffffff" <u-icon v-if="item.OkState === 3" color="#ffffff"
name="checkbox-mark"></u-icon> name="checkbox-mark"></u-icon>
<span v-else>{{ ['可订', '已满'][item.state] }}</span> <span v-else>{{ ['可订', '已满', '闭馆'][item.state] }}</span>
</view> </view>
</view> </view>
</view> </view>
...@@ -75,13 +75,13 @@ ...@@ -75,13 +75,13 @@
</view> </view>
<view class="content-header-content-footer-content"> <view class="content-header-content-footer-content">
<view <view
:class="['content-header-content-footer-footer-leftItem','content-header-content-footer-footer-leftItem2'][itemObject.forestate]" :class="['content-header-content-footer-footer-leftItem','content-header-content-footer-footer-leftItem2','content-header-content-footer-footer-leftItem2'][itemObject.forestate]"
@click="lastAndAfternoonStatusFun(itemObject,1)"> @click="lastAndAfternoonStatusFun(itemObject,1)">
<view class="antemeridian-top"> <view class="antemeridian-top">
<view class="antemeridian-item"> <view class="antemeridian-item">
<u-icon v-if="lastAndAfternoonStatus === 3" color="#ffffff" <u-icon v-if="lastAndAfternoonStatus === 3" color="#ffffff"
name="checkbox-mark"></u-icon> name="checkbox-mark"></u-icon>
<span v-else> {{ ['可订', '已满'][itemObject.forestate] }}</span> <span v-else> {{ ['可订', '已满', '闭馆'][itemObject.forestate] }}</span>
</view> </view>
</view> </view>
<view class="antemeridian"> <view class="antemeridian">
...@@ -89,13 +89,13 @@ ...@@ -89,13 +89,13 @@
</view> </view>
</view> </view>
<view <view
:class="['content-header-content-footer-footer-rightItem','content-header-content-footer-footer-rightItem2'][itemObject.aftestate]" :class="['content-header-content-footer-footer-rightItem','content-header-content-footer-footer-rightItem2','content-header-content-footer-footer-rightItem2'][itemObject.aftestate]"
@click="lastAndAfternoonStatusFun(itemObject,2)"> @click="lastAndAfternoonStatusFun(itemObject,2)">
<view class="antemeridian-top"> <view class="antemeridian-top">
<view class="antemeridian-item"> <view class="antemeridian-item">
<u-icon v-if="lastAndAfternoonStatus === 4" color="#ffffff" <u-icon v-if="lastAndAfternoonStatus === 4" color="#ffffff"
name="checkbox-mark"></u-icon> name="checkbox-mark"></u-icon>
<span v-else>{{ ['可订', '已满'][itemObject.aftestate] }}</span> <span v-else>{{ ['可订', '已满', '闭馆'][itemObject.aftestate] }}</span>
</view> </view>
</view> </view>
<view class="pm"> <view class="pm">
...@@ -560,7 +560,7 @@ ...@@ -560,7 +560,7 @@
day.bottomInfo = '可订' day.bottomInfo = '可订'
day.disabled = false; day.disabled = false;
console.log("🚀🚀🚀,",day) console.log("🚀🚀🚀,",day)
} else if (cur.date === dayjs(day.date).format('MM月DD日') && cur.state === 1) { } else if (cur.date === dayjs(day.date).format('MM月DD日') && (cur.state === 1 || cur.state === 2)) {
day.disabled = true day.disabled = true
} else if (!this.dateList.map(cur => cur.date).includes(dayjs(day.date).format('MM月DD日'))) { } else if (!this.dateList.map(cur => cur.date).includes(dayjs(day.date).format('MM月DD日'))) {
//日期数据不包含也移除 //日期数据不包含也移除
...@@ -597,7 +597,9 @@ ...@@ -597,7 +597,9 @@
} }
}, },
selectAppointmentDate(item, index) { selectAppointmentDate(item, index) {
if (item.state == 2 || item.state == '周一') {
return
}
if (item.state !== 1) { if (item.state !== 1) {
// 选择日期时遍历数组去除打勾状态 避免打勾多个日期 // 选择日期时遍历数组去除打勾状态 避免打勾多个日期
this.dateList.map((cur, index) => { this.dateList.map((cur, index) => {
...@@ -632,7 +634,7 @@ ...@@ -632,7 +634,7 @@
cur.date = dayjs(cur.date).format('MM月DD日') cur.date = dayjs(cur.date).format('MM月DD日')
}) })
this.dateList = res.response this.dateList = res.response
console.log("🚀🚀🚀,", this.dateList) console.log(",", this.dateList)
}) })
}, },
...@@ -644,11 +646,11 @@ ...@@ -644,11 +646,11 @@
<style> <style>
@import url(index.css); @import url(index.css);
/deep/.u-calendar-month__days__day__select__info[data-v-b6727082] { ::v-deep.u-calendar-month__days__day__select__info[data-v-b6727082] {
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
} }
/deep/.u-calendar-month__days__day__select__buttom-info[data-v-b6727082] { ::v-deep.u-calendar-month__days__day__select__buttom-info[data-v-b6727082] {
color: #606266; color: #606266;
text-align: center; text-align: center;
position: absolute; position: absolute;
...@@ -658,7 +660,7 @@ ...@@ -658,7 +660,7 @@
right: 0; right: 0;
font-size: 14px; font-size: 14px;
} }
/deep/.u-calendar-header__weekdays[data-v-64baae44] { ::v-deep.u-calendar-header__weekdays[data-v-64baae44] {
display: none; display: none;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<view class="content-header-content-header-footer"> <view class="content-header-content-header-footer">
<view ref="selectAppointmentDate" v-for="(item,index) in dateList" :key="index" v-if="index < 3" <view ref="selectAppointmentDate" v-for="(item,index) in dateList" :key="index" v-if="index < 3"
@click="selectAppointmentDate(item,index)" @click="selectAppointmentDate(item,index)"
:class="['content-header-content-header-footer-leftItem','content-header-content-header-footer-leftItem1'][item.state]"> :class="['content-header-content-header-footer-leftItem','content-header-content-header-footer-leftItem1','content-header-content-header-footer-leftItem1'][item.state]">
<view class="content-header-content-header-footer-leftItem-top"> <view class="content-header-content-header-footer-leftItem-top">
<view class="content-header-content-header-footer-leftItem-top-left"> <view class="content-header-content-header-footer-leftItem-top-left">
<span class="dataText" v-if="index === 0">今天</span> <span class="dataText" v-if="index === 0">今天</span>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<view class="content-header-content-header-footer-leftItem-top-right"> <view class="content-header-content-header-footer-leftItem-top-right">
<view class="content-header-content-header-footer-leftItem-top-right-item"> <view class="content-header-content-header-footer-leftItem-top-right-item">
<u-icon v-if="item.OkState === 3" color="#ffffff" name="checkbox-mark"></u-icon> <u-icon v-if="item.OkState === 3" color="#ffffff" name="checkbox-mark"></u-icon>
<span v-else>{{ ['可订', '已满'][item.state] }}</span> <span v-else>{{ ['可订', '已满', '闭馆'][item.state] }}</span>
</view> </view>
</view> </view>
</view> </view>
...@@ -69,11 +69,11 @@ ...@@ -69,11 +69,11 @@
</view> </view>
<view class="content-header-content-footer-content"> <view class="content-header-content-footer-content">
<view @click="lastAndAfternoonStatusFun(itemObject,1)" <view @click="lastAndAfternoonStatusFun(itemObject,1)"
:class="['content-header-content-footer-footer-leftItem','content-header-content-footer-footer-leftItem2'][itemObject.forestate]"> :class="['content-header-content-footer-footer-leftItem','content-header-content-footer-footer-leftItem2','content-header-content-footer-footer-leftItem2'][itemObject.forestate]">
<view class="antemeridian-top"> <view class="antemeridian-top">
<view class="antemeridian-item"> <view class="antemeridian-item">
<u-icon v-if="lastAndAfternoonStatus === 3" color="#ffffff" name="checkbox-mark"></u-icon> <u-icon v-if="lastAndAfternoonStatus === 3" color="#ffffff" name="checkbox-mark"></u-icon>
<span v-else> {{ ['可订', '已满'][itemObject.forestate] }}</span> <span v-else> {{ ['可订', '已满', '闭馆'][itemObject.forestate] }}</span>
</view> </view>
</view> </view>
<view class="antemeridian"> <view class="antemeridian">
...@@ -81,11 +81,11 @@ ...@@ -81,11 +81,11 @@
</view> </view>
</view> </view>
<view @click="lastAndAfternoonStatusFun(itemObject,2)" <view @click="lastAndAfternoonStatusFun(itemObject,2)"
:class="['content-header-content-footer-footer-rightItem','content-header-content-footer-footer-rightItem2'][itemObject.aftestate]"> :class="['content-header-content-footer-footer-rightItem','content-header-content-footer-footer-rightItem2','content-header-content-footer-footer-rightItem2'][itemObject.aftestate]">
<view class="antemeridian-top"> <view class="antemeridian-top">
<view class="antemeridian-item"> <view class="antemeridian-item">
<u-icon v-if="lastAndAfternoonStatus === 4" color="#ffffff" name="checkbox-mark"></u-icon> <u-icon v-if="lastAndAfternoonStatus === 4" color="#ffffff" name="checkbox-mark"></u-icon>
<span v-else>{{ ['可订', '已满'][itemObject.aftestate] }}</span> <span v-else>{{ ['可订', '已满', '闭馆'][itemObject.aftestate] }}</span>
</view> </view>
</view> </view>
<view class="pm"> <view class="pm">
...@@ -342,7 +342,7 @@ export default { ...@@ -342,7 +342,7 @@ export default {
day.bottomInfo = '可订' day.bottomInfo = '可订'
day.disabled = false day.disabled = false
console.log("🚀🚀🚀,", day) console.log("🚀🚀🚀,", day)
} else if (cur.date === dayjs(day.date).format('MM月DD日') && cur.state === 1) { } else if (cur.date === dayjs(day.date).format('MM月DD日') && (cur.state === 1 || cur.state === 2)) {
day.disabled = true day.disabled = true
} else if (!this.dateList.map(cur => cur.date).includes(dayjs(day.date).format('MM月DD日'))) { } else if (!this.dateList.map(cur => cur.date).includes(dayjs(day.date).format('MM月DD日'))) {
//日期数据不包含也移除 //日期数据不包含也移除
...@@ -380,6 +380,9 @@ export default { ...@@ -380,6 +380,9 @@ export default {
}, },
selectAppointmentDate(item, index) { selectAppointmentDate(item, index) {
console.log(item, 11); console.log(item, 11);
if (item.state == 2 || item.state == '周一') {
return
}
if (item.state !== 1) { if (item.state !== 1) {
// 选择日期时遍历数组去除打勾状态 避免打勾多个日期 // 选择日期时遍历数组去除打勾状态 避免打勾多个日期
this.dateList.map((cur, index) => { this.dateList.map((cur, index) => {
...@@ -434,12 +437,12 @@ export default { ...@@ -434,12 +437,12 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import url(index.css); @import url(index.css);
/deep/ .u-calendar-month__days__day__select__info[data-v-b6727082] { ::v-deep .u-calendar-month__days__day__select__info[data-v-b6727082] {
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
} }
/deep/ .u-calendar-month__days__day__select__buttom-info[data-v-b6727082] { ::v-deep .u-calendar-month__days__day__select__buttom-info[data-v-b6727082] {
color: #606266; color: #606266;
text-align: center; text-align: center;
position: absolute; position: absolute;
...@@ -450,7 +453,7 @@ export default { ...@@ -450,7 +453,7 @@ export default {
font-size: 14px; font-size: 14px;
} }
/deep/ .u-calendar-header__weekdays[data-v-64baae44] { ::v-deep .u-calendar-header__weekdays[data-v-64baae44] {
display: none; display: none;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或