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/task/index.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 84cd0a7..f3545ba 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -21,7 +21,7 @@
@click="statusClick(0)"
:class="{ active: search.queryType === 0 }"
class="box_head_item"
- >寰呭鐞� {{ headData.noticeWaitNum }}</view
+ >寰呭鐞� {{ headData.noticeWaitNum || '' }}</view
>
<view
@click="statusClick(1)"
@@ -39,7 +39,7 @@
@click="statusClick(3)"
:class="{ active: search.queryType === 3 }"
class="box_head_item"
- >鎶勯�佹垜鐨� {{ headData.noticeCopyNum }}</view
+ >鎶勯�佹垜鐨� {{ headData.noticeCopyNum || '' }}</view
>
</view>
</scroll-view>
@@ -65,6 +65,7 @@
<view
class="box_list_item"
v-for="(item, index) in dataList"
+ @click="handleAppr(item)"
:key="index"
>
<view class="box_list_item_head">
@@ -114,12 +115,20 @@
<view class="box_list_item_nr_x"></view>
<view class="box_list_item_nr_text">
<text class="time">{{ item.createDate }}鎻愪氦</text>
- <text v-if="item.status == '0'" class="btn" @click="handleAppr(item)">鍘诲鐞�</text>
+ <text
+ v-if="item.param2 == '0'"
+ class="btn"
+ >鍘诲鐞�</text
+ >
</view>
</view>
</view>
- <view v-if="dataList.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 120px auto 0" mode="widthFix" />
+ <view v-if="dataList.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120px auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -231,11 +240,11 @@
]
}
},
- onLoad() {
- this.getHeadList()
- this.pagination.page = 0
- this.getList()
- },
+ // onLoad() {
+ // this.getHeadList()
+ // this.pagination.page = 0
+ // this.getList()
+ // },
onReachBottom() {
// this.pagination.page = 0
// this.dataList = []
@@ -283,7 +292,7 @@
}).then(res => {
this.dataList = [...this.dataList, ...res.data.records]
this.dataList.forEach(i => {
- if(i.param1){
+ if (i.param1) {
i.param1 = JSON.parse(i.param1)
}
})
@@ -482,7 +491,7 @@
}
.tt {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.info {
@@ -552,7 +561,7 @@
width: 100%;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.search_list {
--
Gitblit v1.9.3