From 04bf59bbc3fad774c57a2ee5ebf07db24b476bf2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 17 十二月 2024 17:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
h5/pages/staff/task/index.vue | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index cad451d..ba83dc6 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -70,7 +70,7 @@
>
<view class="box_list_item_head">
<view class="df_ac">
- <text v-if="item.readed == 0" class="readed"></text>
+ <text v-if="item.readed == 0 && search.queryType === 3" class="readed"></text>
<text class="tt">{{ item.title }}</text>
</view>
<view class="info" :class="{ loading: search.queryType === 0 }">{{ item.info }}</view>
@@ -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(()=>{
@@ -289,6 +293,9 @@
},
modalReset() {
this.modelParam = {}
+ this.search = {
+ queryType: 0
+ }
this.pagination.page = 0
this.dataList = []
this.showFilter = false
@@ -315,12 +322,16 @@
...search
}
}).then(res => {
+ if(res.data && res.data.records){
+ res.data.records.forEach(i => {
+ if (i.param1) {
+ i.param1 = JSON.parse(i.param1)
+ }
+ })
+ }
this.dataList = [...this.dataList, ...res.data.records]
- this.dataList.forEach(i => {
- if (i.param1) {
- i.param1 = JSON.parse(i.param1)
- }
- })
+ this.total = res.data.total
+
})
},
getHeadList() {
@@ -530,6 +541,7 @@
font-size: 26rpx;
font-weight: 400;
color: #999999;
+ width: 120rpx;
}
.loading {
color: $uni-color-primary;
--
Gitblit v1.9.3