From a8c03746e6bd8ac1d46dc48c1b10bceff543664f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 10 十二月 2024 20:16:12 +0800
Subject: [PATCH] ll
---
h5/pages/staff/meetingCalendar.vue | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index b39ca85..dab5dd0 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,17 +230,23 @@
onLoad() {
this.currentDate = dayja().format('YYYY-MM-DD')
this.initData()
- this.getRoomList()
+ this.getRoomList()
+ this.tabClick('0')
},
onShow() {
- this.tabClick('0')
+ // this.tabClick('0')
+
},
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()
}
@@ -265,6 +276,7 @@
this.activeTab = val
if (val === '1') {
this.recordPage = 1
+ this.recordList = []
this.getRecordList()
} else {
this.myMeetingList = []
@@ -334,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() {
@@ -349,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
})
},
}
@@ -462,6 +476,10 @@
font-weight: 600;
font-size: 32rpx;
color: #222222;
+ flex: 1;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.status {
height: 38rpx;
@@ -471,6 +489,10 @@
border: 1rpx solid #999999;
font-size: 22rpx;
color: #999999;
+ margin-left: 20rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.padding {
color: $uni-color-primary;
--
Gitblit v1.9.3