From a8c03746e6bd8ac1d46dc48c1b10bceff543664f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 10 十二月 2024 20:16:12 +0800
Subject: [PATCH] ll

---
 h5/pages/staff/meetingCalendar.vue |   74 +++++++++++++++++++++++++++---------
 1 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 326a824..dab5dd0 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -93,7 +93,14 @@
               <view class="value">{{ item.remark || item.meetingRemark }}</view>
             </view>
           </view>
-          <image v-if="myMeetingList.length === 0" src="@/static/empty.png" style="width: 320rpx;margin: 60rpx auto;" mode="widthFix" />
+          <view v-if="myMeetingList.length === 0" style="text-align: center">
+            <image
+              src="@/static/empty.png"
+              style="width: 320rpx; margin: 60rpx auto 0"
+              mode="widthFix"
+            />
+            <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+          </view>
         </view>
       </view>
     </template>
@@ -124,7 +131,11 @@
               <view class="status" v-if="item.meetingStatus == '5'"
                 >宸叉挙閿�</view
               >
-            </view>
+            </view>
+						<view class="line">
+						  <view class="label">浼氳鏃ユ湡锛�</view>
+						  <view class="value">{{ item.meetingDate }}</view>
+						</view>
             <view class="line">
               <view class="label">浼氳鏃堕棿锛�</view>
               <view class="value">{{ item.meetingTime }}</view>
@@ -137,12 +148,19 @@
               <view class="label">棰勭害浜猴細</view>
               <view class="value">{{ item.bookingUser }}</view>
             </view>
-            <view class="line">
+<!--            <view class="line">
               <view class="label">澶囨敞锛�</view>
               <view class="value">{{ item.remark || item.meetingRemark }}</view>
-            </view>
+            </view> -->
           </view>
-          <image v-if="recordList.length === 0" src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto;" mode="widthFix" />
+          <view v-if="recordList.length === 0" style="text-align: center">
+            <image
+              src="@/static/empty.png"
+              style="width: 320rpx; margin: 120rpx auto 0"
+              mode="widthFix"
+            />
+            <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+          </view>
         </view>
       </view>
     </template>
@@ -190,7 +208,8 @@
   data() {
     return {
       activeTab: '0',
-      recordList: [],
+      recordList: [],
+			total: 0,
       recordPage: 1,
       myPage: 1,
       myMeetingList: [],
@@ -211,17 +230,23 @@
   onLoad() {
     this.currentDate = dayja().format('YYYY-MM-DD')
     this.initData()
-    this.getRoomList()
-  },
-	onShow() {
+    this.getRoomList()
 		this.tabClick('0')
-	},
+  },
+  onShow() {
+    // this.tabClick('0')
+		
+  },
   onReachBottom() {
-    const { activeTab } = this
-    if (activeTab == '0') {
+    const { activeTab, total, myMeetingList, recordList } = this
+		console.log(total);
+		console.log(recordList);
+    if (activeTab == '0') {
+			if(total <= myMeetingList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
       this.myPage = this.myPage + 1
       this.getDayMeeting()
-    } else {
+    } else {
+			if(total <= recordList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
       this.recordPage = this.recordPage + 1
       this.getRecordList()
     }
@@ -241,16 +266,17 @@
         })
       })
     },
-		getRoomList() {
+    getRoomList() {
       roomsListPost({}).then(res => {
         this.meetingList = [[{ id: '', name: '鍏ㄩ儴浼氳瀹�' }, ...res.data]]
-				console.log('meetingList', this.meetingList);
+        console.log('meetingList', this.meetingList)
       })
     },
     tabClick(val) {
       this.activeTab = val
       if (val === '1') {
         this.recordPage = 1
+        this.recordList = []
         this.getRecordList()
       } else {
         this.myMeetingList = []
@@ -263,7 +289,7 @@
       }
     },
     seletedStatus(e) {
-			this.myMeetingList = []
+      this.myMeetingList = []
       this.activeRoom = { ...e.value[0] }
       this.isShowStatus = false
       this.myPage = 1
@@ -320,7 +346,8 @@
           queryType: 2
         }
       }).then(res => {
-        this.recordList = [...this.recordList, ...res.data.records]
+        this.recordList = [...this.recordList, ...res.data.records]
+        this.total = res.data.total
       })
     },
     getDayMeeting() {
@@ -335,7 +362,8 @@
         page: myPage,
         capacity: 10
       }).then(res => {
-        this.myMeetingList = [ ...this.myMeetingList, ...res.data.records ]
+        this.myMeetingList = [...this.myMeetingList, ...res.data.records]
+				this.total = res.data.total
       })
     },
   }
@@ -385,7 +413,7 @@
       }
     }
     .active {
-      font-weight: 500;
+      font-weight: 600;
       font-size: 30rpx;
       color: #222222;
       .line {
@@ -448,6 +476,10 @@
             font-weight: 600;
             font-size: 32rpx;
             color: #222222;
+            flex: 1;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
           }
           .status {
             height: 38rpx;
@@ -457,6 +489,10 @@
             border: 1rpx solid #999999;
             font-size: 22rpx;
             color: #999999;
+            margin-left: 20rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
           }
           .padding {
             color: $uni-color-primary;

--
Gitblit v1.9.3