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/meetingManager.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index 8772ad0..0c68958 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -165,7 +165,8 @@
initData() {
// 褰撴湀鏁版嵁
monthMeetingPage({
- yearMonth: this.currentDate.slice(0, 7)
+ yearMonth: this.currentDate.slice(0, 7),
+ queryType: 3
}).then(res => {
this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {
return {
@@ -179,7 +180,6 @@
getRoomList() {
roomsListPost({}).then(res => {
this.meetingList = [[{ id: '', name: '鍏ㄩ儴浼氳瀹�' }, ...res.data]]
- console.log('meetingList', this.meetingList)
})
},
seletedStatus(e) {
@@ -235,7 +235,7 @@
// 褰撳ぉ鎴戝弬涓庣殑浼氳
myMeetingPage({
model: {
- queryType: '1',
+ queryType: '3',
roomsId: activeRoom.id,
queryDate: currentDate
},
@@ -355,9 +355,14 @@
font-weight: 600;
font-size: 32rpx;
color: #222222;
+ flex: 1;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.status {
height: 38rpx;
+ margin-left: 20rpx;
line-height: 38rpx;
padding: 0 16rpx;
border-radius: 4rpx;
--
Gitblit v1.9.3