From 86baa8ff948d2e79588e0dd7efa16f6b8ac3b157 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 06 十二月 2024 15:29:15 +0800
Subject: [PATCH] ll
---
h5/pages/staff/meetingCalendar.vue | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index cf2c33b..46d1239 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -131,7 +131,11 @@
<view class="status" v-if="item.meetingStatus == '5'"
>宸叉挙閿�</view
>
- </view>
+ </view>
+ <view class="line">
+ <view class="label">浼氳鏃ユ湡锛�</view>
+ <view class="value">{{ item.meetingDate }}</view>
+ </view>
<view class="line">
<view class="label">浼氳鏃堕棿锛�</view>
<view class="value">{{ item.meetingTime }}</view>
@@ -144,10 +148,10 @@
<view class="label">棰勭害浜猴細</view>
<view class="value">{{ item.bookingUser }}</view>
</view>
- <view class="line">
+<!-- <view class="line">
<view class="label">澶囨敞锛�</view>
<view class="value">{{ item.remark || item.meetingRemark }}</view>
- </view>
+ </view> -->
</view>
<view v-if="recordList.length === 0" style="text-align: center">
<image
@@ -204,7 +208,8 @@
data() {
return {
activeTab: '0',
- recordList: [],
+ recordList: [],
+ total: 0,
recordPage: 1,
myPage: 1,
myMeetingList: [],
@@ -225,18 +230,23 @@
onLoad() {
this.currentDate = dayja().format('YYYY-MM-DD')
this.initData()
- this.getRoomList()
+ this.getRoomList()
+ this.tabClick('0')
},
onShow() {
// this.tabClick('0')
- this.getRecordList()
+
},
onReachBottom() {
- const { activeTab } = this
- if (activeTab == '0') {
+ const { activeTab, total, myMeetingList, recordList } = this
+ console.log(total);
+ console.log(recordList);
+ if (activeTab == '0') {
+ // if(total <= myMeetingList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
this.myPage = this.myPage + 1
this.getDayMeeting()
- } else {
+ } else {
+ // if(total <= recordList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
this.recordPage = this.recordPage + 1
this.getRecordList()
}
@@ -336,7 +346,8 @@
queryType: 2
}
}).then(res => {
- this.recordList = [...this.recordList, ...res.data.records]
+ this.recordList = [...this.recordList, ...res.data.records]
+ this.total = res.data.total
})
},
getDayMeeting() {
@@ -351,7 +362,8 @@
page: myPage,
capacity: 10
}).then(res => {
- this.myMeetingList = [...this.myMeetingList, ...res.data.records]
+ this.myMeetingList = [...this.myMeetingList, ...res.data.records]
+ this.total = res.data.total
})
},
}
--
Gitblit v1.9.3