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 | 177 ++++++++++++++++++++++++++---------------------------------
1 files changed, 78 insertions(+), 99 deletions(-)
diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
index af5d68b..b8725ae 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
@@ -1,107 +1,86 @@
<!--pages/zhgh/zhgh.wxml-->
<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="{{4}}" wx:key bindtap="tabSelect" data-id="{{index}}">
- {{list[index]}}
- </view>
- </view>
- </scroll-view>
+ <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}}">
+ {{list[index]}}
+ </view>
+ </view>
+ </scroll-view>
- <view class="zhgh-list" wx:if='{{TabCur==0}}' wx:for="{{infoList}}" wx:key>
- <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
- <view class="zhgh-list-img">
- <image src="{{item.img}}"></image>
- </view>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <view class="zhgh-list-b-left-div font-lg">{{item.name}}</view>
- <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
- </view>
- <view class="zhgh-list-b-right">{{item.status}}</view>
- </view>
- </view>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==0}}' 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">{{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>
- <view wx:if='{{TabCur==1}}'>
- <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
- <view class="zhgh-list-img">
- <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577344816&di=7e4576e47e6cbbce2e4e4c80ce501c85&imgtype=jpg&er=1&src=http%3A%2F%2Fhz.wenming.cn%2Fwm_jy%2Ffocus%2F201809%2FW020180917332975135768.jpg"></image>
- </view>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <view class="zhgh-list-b-left-div font-lg">帮教未成年人</view>
- <view class="zhgh-list-b-left-div">2019.11.23 12:00</view>
- </view>
- <view class="zhgh-list-b-right">待完成</view>
- </view>
- </view>
- <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
- <view class="zhgh-list-img">
- <image src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3881324343,2281839731&fm=15&gp=0.jpg"></image>
- </view>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <view class="zhgh-list-b-left-div font-lg">学习辅导</view>
- <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
- </view>
- <view class="zhgh-list-b-right">待完成</view>
- </view>
- </view>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==1}}' 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">{{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>
+ <view class="zhgh-list" wx:if='{{TabCur==2}}' 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">{{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>
- <view wx:if='{{TabCur==2}}'>
- <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
- <view class="zhgh-list-img">
- <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576750458167&di=f36e82a737b6ffe14a638c3e9a1afd6c&imgtype=0&src=http%3A%2F%2Fimg.cjyun.org%2Fa%2F10064%2F201701%2Fd5fd012d0f7be1c0ee68738178595a4c.jpeg"></image>
- </view>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <view class="zhgh-list-b-left-div font-lg">社会环境调查</view>
- <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
- </view>
- <view class="zhgh-list-b-right">待完成</view>
- </view>
- </view>
- <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
- <view class="zhgh-list-img">
- <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576750537170&di=d7533f2546f856da44eb44d5acb33f90&imgtype=0&src=http%3A%2F%2Fimage.codes51.com%2FArticle%2Fimage%2F20160530%2F20160530024642_5901.jpg"></image>
- </view>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <view class="zhgh-list-b-left-div font-lg">环境数据调查</view>
- <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
- </view>
- <view class="zhgh-list-b-right">待完成</view>
- </view>
- </view>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==3}}' 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">{{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>
- <view wx:if='{{TabCur==3}}'>
- <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
- <view class="zhgh-list-img">
- <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577345685&di=556a32729fa812cc81c060243816111d&imgtype=jpg&er=1&src=http%3A%2F%2Fwww.zhanjiang.gov.cn%2Ffileserver%2FNews%2Fb8bfdf37-7242-4d16-bbc0-1244d78aeca4.jpg"></image>
- </view>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <view class="zhgh-list-b-left-div font-lg">未成年人心理辅导</view>
- <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
- </view>
- <view class="zhgh-list-b-right">待完成</view>
- </view>
- </view>
- <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
- <view class="zhgh-list-img">
- <image src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1146387832,2824320615&fm=15&gp=0.jpg"></image>
- </view>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <view class="zhgh-list-b-left-div font-lg">教育疏导</view>
- <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
- </view>
- <view class="zhgh-list-b-right">待完成</view>
- </view>
- </view>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==4}}' 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">{{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>
+
</view>
\ No newline at end of file
--
Gitblit v1.8.0