From 8fc9e2cb7c40ff840ca40e0491124bc1d166a15e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 六月 2025 10:20:23 +0800
Subject: [PATCH] 最新版本541200007

---
 h5/pages/staff/meetingCalendar.vue |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index dab5dd0..d516073 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -89,7 +89,7 @@
               <view class="value">{{ item.bookingUser }}</view>
             </view>
             <view class="line">
-              <view class="label">澶囨敞锛�</view>
+              <view class="label">浼氳闇�姹傦細</view>
               <view class="value">{{ item.remark || item.meetingRemark }}</view>
             </view>
           </view>
@@ -229,18 +229,15 @@
   },
   onLoad() {
     this.currentDate = dayja().format('YYYY-MM-DD')
-    this.initData()
-    this.getRoomList()
-		this.tabClick('0')
+		this.getRoomList()	
   },
   onShow() {
     // this.tabClick('0')
-		
+		this.initData()
+		this.tabClick(this.activeTab)
   },
   onReachBottom() {
-    const { activeTab, total, myMeetingList, recordList } = this
-		console.log(total);
-		console.log(recordList);
+    const { activeTab, total, myMeetingList, recordList } = this
     if (activeTab == '0') {
 			if(total <= myMeetingList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
       this.myPage = this.myPage + 1
@@ -255,7 +252,8 @@
     initData() {
       // 褰撴湀鏁版嵁
       monthMeetingPage({
-        yearMonth: this.currentDate.slice(0, 7)
+        yearMonth: this.currentDate.slice(0, 7),
+				queryType: 1
       }).then(res => {
         this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {
           return {

--
Gitblit v1.9.3