From a2d1b9886b00b5f4d4722c3379d3bd4f2f94b421 Mon Sep 17 00:00:00 2001
From: LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
Date: Mon, 09 Mar 2020 17:02:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

---
 SunshineLnsMinApp/pages/zhgh/zhgh.wxml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
index d9af5a8..b8725ae 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
@@ -31,6 +31,9 @@
 					<view class="zhgh-list-b-left-div">{{item.taskRequire}}</view>
 					<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
 				</view>
+				<view class="zhgh-list-b-right">
+					<view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -43,6 +46,9 @@
 					<view class="zhgh-list-b-left-div">{{item.taskRequire}}</view>
 					<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
 				</view>
+				<view class="zhgh-list-b-right">
+					<view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -54,6 +60,9 @@
 					<view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
 					<view class="zhgh-list-b-left-div">{{item.taskRequire}}</view>
 					<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
+				</view>
+				<view class="zhgh-list-b-right">
+					<view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
 				</view>
 			</view>
 		</view>
@@ -68,7 +77,7 @@
 					<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
 				</view>
 				<view class="zhgh-list-b-right">
-					<view class="cu-btn bg-red margin-tb-sm lg">{{item.status}}</view>
+					<view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
 				</view>
 			</view>
 		</view>

--
Gitblit v1.8.0