Merge remote-tracking branch 'origin/master'

jiangping

2024-06-11 fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7

 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) {