From fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 17:57:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingSub.vue | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/h5/pages/staff/meetingSub.vue b/h5/pages/staff/meetingSub.vue
index c31b0cb..c33f1b5 100644
--- a/h5/pages/staff/meetingSub.vue
+++ b/h5/pages/staff/meetingSub.vue
@@ -67,18 +67,18 @@
>
<view class="detail_modal">
<view class="title">浼氳瀹ら绾︽儏鍐�</view>
- <view class="h1">璁ㄨxxxxx閫夊瀷</view>
+ <view class="h1">{{ activeInfo.meetingName }}</view>
<view class="line">
<view class="label">浼氳鏃堕棿</view>
- <view class="value">00000</view>
+ <view class="value">{{ activeInfo.meetingTime }}</view>
</view>
<view class="line">
<view class="label">浼氳瀹�</view>
- <view class="value">00000</view>
+ <view class="value">{{ activeInfo.roomName }}</view>
</view>
<view class="line">
<view class="label">棰勭害浜�</view>
- <view class="value">00000</view>
+ <view class="value">{{ activeInfo.bookingUserName }}</view>
</view>
<view class="btn" @click="isShowDetail = false">鍏抽棴</view>
</view>
@@ -101,11 +101,12 @@
},
selDatetime: '',
isShowDetail: false,
+ activeInfo: {},
meetingList: [],
timeList: [],
colorOptions: [
- { color: '#279BAA', name: '宸查�夋嫨' },
+ { color: this.$store.state.primaryColor, name: '宸查�夋嫨' },
{ color: '#F7F7F7', name: '鍙绾�' },
{ color: '#cccccc', name: '涓嶅彲棰勭害' },
]
@@ -140,9 +141,10 @@
const obj = {
startTime: selTimeList[0].startTime,
endTime: selTimeList[selTimeList.length - 1].endTime,
+ bookingTimeList: selTimeList.map(i=>i.id).join(',')
}
uni.navigateTo({
- url: `/pages/staff/meetingSubOrder?yudingDate=${activeRoom.yudingDate}&roomName=${activeRoom.roomName}&roomId=${activeRoom.roomId}&startTime=${obj.startTime}&endTime=${obj.endTime}`
+ url: `/pages/staff/meetingSubOrder?yudingDate=${activeRoom.yudingDate}&roomName=${activeRoom.roomName}&roomId=${activeRoom.roomId}&startTime=${obj.startTime}&endTime=${obj.endTime}&bookingTimeList=${obj.bookingTimeList}`
})
// this.$jump('/pages/staff/vehicle/apply')
},
@@ -169,11 +171,11 @@
})
},
datetimeClick(item, index) {
- if (item.isUse == '1') return
- if(item.isChoose){
- this.getDetail(item.id)
+ if(item.bookingTimeId){
+ this.getDetail(item.bookingTimeId)
return
}
+ if (item.isUse == '1') return
const { timeList } = this
const selTimeList = timeList.filter(i => i.checked == '1')
if (selTimeList.length === 0) {
@@ -229,7 +231,10 @@
getDetail(id) {
meetingDetail({
id
- })
+ }).then(res => {
+ this.activeInfo = res.data
+ this.isShowDetail = true
+ })
},
}
}
@@ -266,7 +271,7 @@
height: 88rpx;
line-height: 88rpx;
text-align: center;
- background: #279baa;
+ background: $uni-color-primary;
border-radius: 44rpx;
font-weight: 500;
font-size: 32rpx;
@@ -282,7 +287,7 @@
padding: 20rpx 30rpx 84rpx;
box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
.sel_time {
- color: #279baa;
+ color: $uni-color-primary;
}
.btns {
margin-top: 10rpx;
@@ -307,7 +312,7 @@
height: 72rpx;
line-height: 72rpx;
text-align: center;
- background: #279baa;
+ background: $uni-color-primary;
box-shadow: 0rpx -1rpx 0rpx 0rpx #eeeeee;
border-radius: 36rpx;
font-size: 30rpx;
@@ -331,7 +336,7 @@
font-size: 30rpx;
}
.active {
- background-color: #279baa;
+ background-color: $uni-color-primary;
color: #fff;
}
.disable {
@@ -357,13 +362,13 @@
}
}
.active {
- color: #279baa;
+ color: $uni-color-primary;
font-weight: 600;
font-size: 30rpx;
.line {
width: 60rpx;
height: 4rpx;
- background-color: #279baa;
+ background-color: $uni-color-primary;
margin: 26rpx auto 0;
}
}
--
Gitblit v1.9.3