From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingManager.vue | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index 513f25d..b7c7bef 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -74,6 +74,14 @@
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
+ <view v-if="myMeetingList.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120rpx auto 0"
+ mode="widthFix"
+ />
+ <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+ </view>
</view>
</view>
</template>
@@ -144,14 +152,14 @@
this.initData()
this.getRoomList()
},
- onShow() {
- this.myPage = 1
+ onShow() {
+ this.myPage = 1
this.myMeetingList = []
this.getDayMeeting()
- },
+ },
onReachBottom() {
this.myPage = this.myPage + 1
- this.getDayMeeting()
+ this.getDayMeeting()
},
methods: {
initData() {
@@ -168,14 +176,13 @@
})
})
},
- getRoomList() {
+ getRoomList() {
roomsListPost({}).then(res => {
this.meetingList = [[{ id: '', name: '鍏ㄩ儴浼氳瀹�' }, ...res.data]]
- console.log('meetingList', this.meetingList);
})
},
seletedStatus(e) {
- this.myMeetingList = []
+ this.myMeetingList = []
this.activeRoom = { ...e.value[0] }
this.recordPage = 1
this.isShowStatus = false
@@ -234,7 +241,7 @@
page: myPage,
capacity: 10
}).then(res => {
- this.myMeetingList = [ ...this.myMeetingList, ...res.data.records ]
+ this.myMeetingList = [...this.myMeetingList, ...res.data.records]
})
},
}
@@ -284,7 +291,7 @@
}
}
.active {
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
color: #222222;
.line {
@@ -347,9 +354,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