From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingCalendar.vue | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 4a58c6d..1a6b653 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -93,8 +93,12 @@
<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: 60rpx auto 0" mode="widthFix" />
+ <view v-if="myMeetingList.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 60rpx auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -145,8 +149,12 @@
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
- <view v-if="recordList.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view v-if="recordList.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>
@@ -219,9 +227,9 @@
this.initData()
this.getRoomList()
},
- onShow() {
- this.tabClick('0')
- },
+ onShow() {
+ this.tabClick('0')
+ },
onReachBottom() {
const { activeTab } = this
if (activeTab == '0') {
@@ -247,16 +255,17 @@
})
})
},
- getRoomList() {
+ getRoomList() {
roomsListPost({}).then(res => {
this.meetingList = [[{ id: '', name: '鍏ㄩ儴浼氳瀹�' }, ...res.data]]
- console.log('meetingList', this.meetingList);
+ console.log('meetingList', this.meetingList)
})
},
tabClick(val) {
this.activeTab = val
if (val === '1') {
this.recordPage = 1
+ this.recordList = []
this.getRecordList()
} else {
this.myMeetingList = []
@@ -269,7 +278,7 @@
}
},
seletedStatus(e) {
- this.myMeetingList = []
+ this.myMeetingList = []
this.activeRoom = { ...e.value[0] }
this.isShowStatus = false
this.myPage = 1
@@ -341,7 +350,7 @@
page: myPage,
capacity: 10
}).then(res => {
- this.myMeetingList = [ ...this.myMeetingList, ...res.data.records ]
+ this.myMeetingList = [...this.myMeetingList, ...res.data.records]
})
},
}
@@ -391,7 +400,7 @@
}
}
.active {
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
color: #222222;
.line {
--
Gitblit v1.9.3