From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingCalendar.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index dab5dd0..5646185 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
@@ -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