From bd09ddbe5eae5e780393d37b72b4da6d4e92fdb8 Mon Sep 17 00:00:00 2001
From: LiuWenHaoU <964324856@qq.com>
Date: Mon, 18 May 2020 00:15:17 +0800
Subject: [PATCH] 部分修改及新增功能

---
 SunshineLnsMinApp/pages/zhgh/zhgh.wxml |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
index cf8674a..bd758a3 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
@@ -2,7 +2,7 @@
 <view class='zhgh-bg'>
   <scroll-view scroll-x class="bg-white nav">
     <view class="flex text-center">
-      <view class="cu-item flex-sub {{index==TabCur?'text-blue cur':''}}" wx:for="{{5}}" wx:key bindtap="tabSelect" data-id="{{index}}">
+      <view class="cu-item flex-sub {{index==TabCur?'text-blue cur':''}}" wx:for="{{6}}" wx:key bindtap="tabSelect" data-id="{{index}}">
         {{list[index]}}
       </view>
     </view>
@@ -13,10 +13,10 @@
       <view class="zhgh-list-b">
         <view class="zhgh-list-b-left">
           <view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
-          <view class="zhgh-list-b-left-div">
-            <!-- <rich-text nodes="{{item.taskRequire}}"></rich-text> -->
+          <!-- <view class="zhgh-list-b-left-div">
+            <rich-text nodes="{{item.taskRequire}}"></rich-text>
             地址:{{item.taskAddress}}
-          </view>
+          </view> -->
           <view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
         </view>
         <view class="zhgh-list-b-right">
@@ -98,4 +98,22 @@
     </view>
   </view>
 
+  <view class="zhgh-list" wx:if='{{TabCur==5}}' wx:for="{{infoList}}" wx:key>
+    <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
+      <view class="zhgh-list-b">
+        <view class="zhgh-list-b-left">
+          <view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
+          <view class="zhgh-list-b-left-div">
+            <!-- <rich-text nodes="{{item.taskRequire}}"></rich-text> -->
+            地址:{{item.taskAddress}}
+          </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-green':item.status=='进行中'?'bg-orange':'bg-grey'}}">{{item.status}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+
 </view>
\ No newline at end of file

--
Gitblit v1.8.0