diff --git a/pages/meetingDetail/index.vue b/pages/meetingDetail/index.vue index a218747..6f02a58 100644 --- a/pages/meetingDetail/index.vue +++ b/pages/meetingDetail/index.vue @@ -93,10 +93,10 @@ - + - + @@ -335,12 +335,12 @@ reg: /^.+$/, errMsg: '结束时间不能空' }, - counter: { + num: { name: '申请场次', reg: /^[1-9]\d*$/, errMsg: '申请场次不能空且是正整数' }, - num: { + counter: { name: '申请人数', reg: /^[1-9]\d*$/, errMsg: '申请人数不能空且是正整数' diff --git a/pages/meetingList/index.vue b/pages/meetingList/index.vue index 0b0c574..d3e7181 100644 --- a/pages/meetingList/index.vue +++ b/pages/meetingList/index.vue @@ -173,7 +173,8 @@ ], currentTab: 0, meetingRoomList: [], - orderList: [] // 新增单独订单列表 + orderList: [], // 新增单独订单列表 + dialogList:[1,5,4,2] }; }, onLoad() { @@ -324,7 +325,32 @@ }); } }); - } else { + } else if(this.dialogList.includes(item.num)){ + uni.showModal({ + title: '温馨提示', + content: ' 可预约时段:工作日8:30—11:30,13:30—17:00', + confirmColor: '#007AFF', // 可根据uView主题色调整 + success: (res) => { + if (res.confirm) { + // 用户点击确定,执行跳转 + this.navigateToDetail(id, true); + } else if (res.cancel) { + // 用户点击取消,可选操作(如提示取消) + uni.showToast({ + title: '已取消', + icon: 'none' + }); + } + }, + fail: (err) => { + console.error('弹窗失败:', err); + uni.showToast({ + title: '操作失败', + icon: 'none' + }); + } + }); + }else { // 非自习室,直接跳转 this.navigateToDetail(id, false); }