From e661ea6782bf6e7283689224506eef0869a27e6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十二月 2024 14:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingCalendar.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index dab5dd0..d4edeaf 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -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
--
Gitblit v1.9.3