From 86005dc980106809704a7df9ecf201c8ef3db9f7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 03 六月 2024 18:17:34 +0800
Subject: [PATCH] ‘’

---
 h5/pages/staff/meetingSub.vue |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/h5/pages/staff/meetingSub.vue b/h5/pages/staff/meetingSub.vue
index fd13806..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,6 +101,7 @@
       },
 			selDatetime: '',
       isShowDetail: false,
+      activeInfo: {},
       meetingList: [],
       timeList: [],
 
@@ -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
+      })
 		},
   }
 }

--
Gitblit v1.9.3