From 97e1b9d6c8d7da0891aa7a1e00116b4b14e1b942 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 18:22:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingSub.vue | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/h5/pages/staff/meetingSub.vue b/h5/pages/staff/meetingSub.vue
index 34a81db..f4f8d62 100644
--- a/h5/pages/staff/meetingSub.vue
+++ b/h5/pages/staff/meetingSub.vue
@@ -57,7 +57,7 @@
<view class="">{{ item.name }}</view>
</view>
</view>
- <view class="sub" @click="onSubmit">纭棰勭害</view>
+ <view class="sub" :class="{disable: !selDatetime}" @click="onSubmit">纭棰勭害</view>
</view>
</view>
<!-- -->
@@ -134,7 +134,8 @@
this.getRoomTime()
},
onSubmit() {
- const { activeRoom } = this
+ const { activeRoom, selDatetime } = this
+ if(!selDatetime) return
const selTimeList = this.timeList.filter(i => i.checked == '1')
if (selTimeList.length == -1) {
return uni.showToast({
@@ -146,11 +147,16 @@
startTime: selTimeList[0].startTime,
endTime: selTimeList[selTimeList.length - 1].endTime,
bookingTimeList: selTimeList.map(i => i.id).join(','),
+ yudingDate: activeRoom.yudingDate,
+ roomName: activeRoom.roomName,
+ limitNum: activeRoom.limitNum,
+ roomId: activeRoom.roomId,
}
+ setTimeout(() => {
+ this.$eventBus.$emit('meetingSub', obj)
+ }, 500)
uni.navigateTo({
- url: `/pages/staff/meetingSubOrder?yudingDate=${activeRoom.yudingDate}&roomName=${activeRoom.roomName}
- &roomId=${activeRoom.roomId}&startTime=${obj.startTime}&endTime=${obj.endTime}
- &bookingTimeList=${obj.bookingTimeList}&limitNum=${activeRoom.limitNum}`
+ url: `/pages/staff/meetingSubOrder`
})
// this.$jump('/pages/staff/vehicle/apply')
},
@@ -327,12 +333,14 @@
font-size: 30rpx;
color: #ffffff;
}
+ .disable {
+ background-color: #cccccc;
+ }
}
}
.time_list {
display: flex;
- justify-content: space-between;
- padding: 30rpx;
+ padding: 30rpx 30rpx 240rpx;
flex-wrap: wrap;
.item {
width: 220rpx;
@@ -343,18 +351,22 @@
border-radius: 4rpx;
margin-bottom: 24rpx;
font-size: 30rpx;
+ margin-right: 15rpx;
+ &:nth-of-type(3n){
+ margin-right: 0;
+ }
}
.active {
background-color: $uni-color-primary;
color: #fff;
}
.disable {
- background-color: #cccccc;
- color: #999999;
+ background: #F7F7F7;
+ color: #CCCCCC;
}
.hasSub{
color: #fff;
- background-color: #2d5c65;
+ background: #CCCCCC;
}
}
.meeting_list {
--
Gitblit v1.9.3