From 372871c9d42968a9caf69ca9a4e392f2d3eee865 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 十二月 2024 18:39:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingCalendar.vue | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 46d1239..d4edeaf 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -229,24 +229,21 @@
},
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('鏆傛棤鏇村鏁版嵁')
+ if(total <= myMeetingList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
this.myPage = this.myPage + 1
this.getDayMeeting()
} else {
- // if(total <= recordList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
+ if(total <= recordList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
this.recordPage = this.recordPage + 1
this.getRecordList()
}
--
Gitblit v1.9.3