From bb383098e5b87b67038b9cbcca5d081e3c699a75 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 10:08:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/staff/meetingCalendar.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 46d1239..dab5dd0 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -242,11 +242,11 @@
 		console.log(total);
 		console.log(recordList);
     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