From 535a3629e76496db46c6db11968c87f8d41f3d25 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 27 六月 2024 18:23:24 +0800
Subject: [PATCH] ''

---
 h5/pages/staff/meetingSub.vue |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/h5/pages/staff/meetingSub.vue b/h5/pages/staff/meetingSub.vue
index 5134f06..34a81db 100644
--- a/h5/pages/staff/meetingSub.vue
+++ b/h5/pages/staff/meetingSub.vue
@@ -3,14 +3,14 @@
     <view class="heade_title">
       <image
         class="icon"
-        src="../../static/staff/ar_left@2x.png"
+        src="@/static/staff/ar_left@2x.png"
         @click="changeDate(-1)"
         mode="widthFix"
       ></image>
       <text class="date">{{ activeDateCum }}</text>
       <image
         class="icon"
-        src="../../static/staff/ar_right@2x.png"
+        src="@/static/staff/ar_right@2x.png"
         @click="changeDate(1)"
         mode="widthFix"
       ></image>
@@ -33,7 +33,11 @@
       <view
         @click="datetimeClick(item, i)"
         class="item"
-        :class="{ disable: item.isUse, active: item.checked == '1' }"
+        :class="{
+          disable: item.isUse,
+          active: item.checked == '1',
+          hasSub: item.bookingTimeId,
+        }"
         v-for="(item, i) in timeList"
         :key="i"
       >
@@ -68,7 +72,7 @@
         <view class="h1">{{ activeInfo.meetingName }}</view>
         <view class="line">
           <view class="label">浼氳鏃堕棿</view>
-          <view class="value">{{ activeInfo.meetingTime }}</view>
+          <view class="value" v-if="activeInfo.meetingDate">{{ activeInfo.meetingDate.slice(5) }} {{ activeInfo.meetingTime }}</view>
         </view>
         <view class="line">
           <view class="label">浼氳瀹�</view>
@@ -126,6 +130,8 @@
     roomClick(item) {
       this.$set(this.activeRoom, 'roomId', item.id)
       this.$set(this.activeRoom, 'roomName', item.name)
+      this.$set(this.activeRoom, 'limitNum', item.limitNum)
+      this.getRoomTime()
     },
     onSubmit() {
       const { activeRoom } = this
@@ -139,10 +145,12 @@
       const obj = {
         startTime: selTimeList[0].startTime,
         endTime: selTimeList[selTimeList.length - 1].endTime,
-        bookingTimeList: selTimeList.map(i => i.id).join(',')
+        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}&bookingTimeList=${obj.bookingTimeList}`
+        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}`
       })
       // this.$jump('/pages/staff/vehicle/apply')
     },
@@ -152,6 +160,7 @@
         if (this.meetingList.length > 0) {
           this.$set(this.activeRoom, 'roomId', this.meetingList[0].id)
           this.$set(this.activeRoom, 'roomName', this.meetingList[0].name)
+          this.$set(this.activeRoom, 'limitNum', this.meetingList[0].limitNum)
           this.getRoomTime()
         }
       })
@@ -222,8 +231,10 @@
     },
     changeDate(num) {
       const yudingDate = this.activeRoom.yudingDate
+      if (num < 0 && yudingDate === dayjs().format('YYYY-MM-DD')) return
       let fn = num > 0 ? 'add' : 'subtract'
-      this.yudingDate = dayjs(yudingDate)[fn](1, 'days').format('YYYY-MM-DD')
+      this.activeRoom.yudingDate = dayjs(yudingDate)[fn](1, 'days').format('YYYY-MM-DD')
+      console.log('yudingDate', this.activeRoom.yudingDate)
       this.getRoomList()
     },
     getDetail(id) {
@@ -341,6 +352,10 @@
     background-color: #cccccc;
     color: #999999;
   }
+  .hasSub{
+    color: #fff;
+    background-color: #2d5c65;
+  }
 }
 .meeting_list {
   display: flex;

--
Gitblit v1.9.3