From 23ac7615c09cd6a1f9e6e91875f0b8448a749191 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 十二月 2024 10:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/index.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 8ee559c..00a8fb0 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -242,6 +242,7 @@
},
headData: {},
dataList: [],
+ total: 0,
cateList: [
{ name: '璁垮鐢宠', id: 0 },
{ name: '璁垮鎶ュ', id: 1 },
@@ -258,9 +259,12 @@
// this.getList()
// },
onReachBottom() {
- // this.pagination.page = 0
- // this.dataList = []
- this.getList()
+ const { total, dataList} = this
+ if(dataList.length < total){
+ this.getList()
+ } else {
+ this.showToast('鏆傛棤鏇村鏁版嵁')
+ }
},
onBackPress(options) {
setTimeout(()=>{
@@ -316,6 +320,7 @@
}
}).then(res => {
this.dataList = [...this.dataList, ...res.data.records]
+ this.total = res.data.total
this.dataList.forEach(i => {
if (i.param1) {
i.param1 = JSON.parse(i.param1)
@@ -530,6 +535,7 @@
font-size: 26rpx;
font-weight: 400;
color: #999999;
+ width: 120rpx;
}
.loading {
color: $uni-color-primary;
--
Gitblit v1.9.3