From 01a9bdffee1f04561b3b59406cbb7a76474c55f3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 10:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
h5/pages/staff/meetingCalendar.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index d4edeaf..d516073 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -89,7 +89,7 @@
<view class="value">{{ item.bookingUser }}</view>
</view>
<view class="line">
- <view class="label">澶囨敞锛�</view>
+ <view class="label">浼氳闇�姹傦細</view>
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
@@ -252,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