From f02fde734aba50a4d5b5f89d88c075e6e93cb499 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 09:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/index.vue | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 31d5d3c..cad451d 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -73,7 +73,7 @@
<text v-if="item.readed == 0" class="readed"></text>
<text class="tt">{{ item.title }}</text>
</view>
- <view class="info loading">{{ item.info }}</view>
+ <view class="info" :class="{ loading: search.queryType === 0 }">{{ item.info }}</view>
</view>
<view class="box_list_item_nr">
<view v-if="item.param1.arriveDate" class="box_list_item_nr_item">
@@ -132,7 +132,7 @@
<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.param2 == '0'" class="btn">鍘诲鐞�</text>
+ <text v-if="search.queryType === 0" class="btn">鍘诲鐞�</text>
</view>
</view>
</view>
@@ -338,8 +338,8 @@
})
},
handleAppr(item) {
- const { objType, objId } = item
- if (this.search.queryType === 3) {
+ const { objType, objId, info, readed } = item
+ if (readed === 0) {
signReadTask({
noticesId: item.id,
signType: 0
@@ -349,23 +349,23 @@
}
if (objType === 2) {
uni.navigateTo({
- url: `/pages/staff/vehicle/sendACarDetail?id=${objId}&appr=1`
+ url: `/pages/staff/vehicle/sendACarDetail?id=${objId}&appr=1&info=${info}`
})
} else if (objType === 1) {
uni.navigateTo({
- url: `/pages/staff/task/visitorReport?id=${objId}&objType=${objType}`
+ url: `/pages/staff/task/visitorReport?id=${objId}&objType=${objType}&info=${info}`
})
} else if (objType === 3) {
uni.navigateTo({
- url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}`
+ url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}&info=${info}`
})
} else if (objType === 6 || objType === 5) {
uni.navigateTo({
- url: `/pages/staff/task/driver?id=${objId}&objType=${objType}`
+ url: `/pages/staff/task/driver?id=${objId}&objType=${objType}&info=${info}`
})
}else {
uni.navigateTo({
- url: `/pages/staff/task/visitorApprove?id=${objId}&objType=${objType}`
+ url: `/pages/staff/task/visitorApprove?id=${objId}&objType=${objType}&info=${info}`
})
}
},
@@ -520,13 +520,19 @@
align-items: center;
justify-content: space-between;
.readed {
- width: 12rpx;
- height: 12rpx;
+ width: 16rpx;
+ height: 16rpx;
border-radius: 50%;
background-color: #e0312a;
+ margin-right: 16rpx;
}
+ .info {
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #999999;
+ }
.loading {
- color: #4c99a8;
+ color: $uni-color-primary;
}
.success {
color: #03c68f;
@@ -538,11 +544,6 @@
font-size: 32rpx;
font-weight: 600;
color: #222222;
- }
- .info {
- font-size: 26rpx;
- font-weight: 400;
- width: 110rpx;
}
}
.box_list_item_nr {
--
Gitblit v1.9.3