Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

Mr Ke

2020-05-27 0ec802e93557b2b1422ddbd68aafa994fa68f455

 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,14 +13,14 @@
      <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-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
          <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>
@@ -31,14 +31,14 @@
      <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-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
          <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>
@@ -49,14 +49,14 @@
      <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-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
          <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>
@@ -67,14 +67,14 @@
      <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-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
          <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>
@@ -85,14 +85,32 @@
      <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-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
          <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">
          <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>