From 8fafe168ceb438d295f702c30d3f6f92caf8ba26 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 九月 2024 10:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/vDangetAppr.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index 3a13b23..6a3b311 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -28,7 +28,8 @@
</view>
<!-- -->
<view class="emyty"></view>
- <view v-if="info.status == 1 || info.status == 2" class="module_list">
+ <view v-if="info.status == 1 || info.status == 2" class="module_list">
+ <view class="flow_title">澶勭悊缁撴灉</view>
<view class="item">
<view class="label">澶勭悊缁撴灉</view>
<view class="value primaryColor" :class="{ red: info.status == 2 }">{{ statusMap[info.status] }}</view>
@@ -52,7 +53,7 @@
</view>
</view>
<view class="item">
- <view class="label">鏁存敼璇存槑</view>
+ <view class="label">{{info.status == '1' ? '鏁存敼璇存槑' : '閫�鍥炶鏄�'}}</view>
<view class="value">{{ info.checkInfo }}</view>
</view>
</view>
@@ -756,16 +757,14 @@
.main_app {
background-color: #fff;
padding-bottom: 0;
-
+ .flow_title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ margin-bottom: 24rpx;
+ }
.flow_wrap {
padding: 30rpx 0;
-
- .flow_title {
- font-weight: 600;
- font-size: 32rpx;
- color: #222222;
- margin-bottom: 24rpx;
- }
.list {
.item {
@@ -921,7 +920,10 @@
}
}
- .module_list {
+ .module_list {
+ .title{
+
+ }
.item {
padding: 30rpx 0;
border-bottom: 1rpx solid #e5e5e5;
--
Gitblit v1.9.3