From fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 17:57:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 346a6b3..d290617 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -234,7 +234,7 @@
           return {
             time: j.monthDate,
             pointText: j.meetingNum,
-            pointTextColor: 'red'
+            pointTextColor: '#fff'
           }
         })
       })
@@ -264,6 +264,7 @@
 			this.myMeetingList = []
       this.activeRoom = { ...e.value[0] }
       this.isShowStatus = false
+      this.myPage = 1
       this.getDayMeeting()
     },
     handleDetail(id) {

--
Gitblit v1.9.3