From 0ec802e93557b2b1422ddbd68aafa994fa68f455 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 10:04:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineLnsMinApp/pages/zhgh/zhgh.wxml | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
index cf8674a..7e9a25d 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">
@@ -31,10 +31,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">
@@ -49,10 +49,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">
@@ -67,10 +67,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">
@@ -85,10 +85,28 @@
<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">
+ <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 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">
--
Gitblit v1.8.0