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/zhghInfo/zhghInfo.wxml | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
index bdcdeb2..67c0dd0 100644
--- a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
+++ b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
@@ -2,40 +2,66 @@
<view class="zhghInfo-bg">
<view class="zhghInfo-main">
- <view class="zhghInfo-main-img">
- <image src="http://www.gzns.gov.cn/nsjcy/njxw/201911/W020191101471253416700.jpg"></image>
- </view>
<view class="zhghInfo-main-b">
<view class="zhghInfo-main-b-left">
- <view class="zhghInfo-main-b-left-div font-lg">街镇老人关护任务</view>
- <view class="zhghInfo-main-b-left-div">2019.12.12 20:00</view>
+ <view class="zhghInfo-main-b-left-div font-lg">{{data.taskTitle}}</view>
+ <view class="zhghInfo-main-b-left-div">{{data.startTime}}~{{data.endTime}}</view>
</view>
- <view class="zhghInfo-main-b-right">待完成</view>
+ <!-- <view class="zhghInfo-main-b-right">{{data.status}}</view> -->
+ <view class="zhghInfo-main-b-right round cu-tag margin-tb-sm lg {{data.status=='未开始'?bg-grey:data.status=='进行中'?bg-red:bg-blue}}">{{data.status}}</view>
</view>
</view>
- <view class="zhghInfo-center">
+ <div class="complain-message">
+ <span></span>
+ <span>子任务</span>
+ </div>
+ <view class="zhgh-list" wx:for="{{data.tasks}}" wx:key>
+ <view class="zhgh-list1" data-str="zhghchildrenInfo" data-id="{{item.id}}" bindtap='linkcFunction'>
+ <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="text-grey">任务地点：{{item.taskAddress}}</view>
+ </view>
+ <view class="zhgh-list-b-right">
+ <view class="round cu-tag margin-tb-sm lg {{item.status==0?'bg-green':item.status==1?'bg-orange':'bg-grey'}}">{{item.status==0?'未开始':item.status==1?"进行中":"已结束"}}</view>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- <view class="zhghInfo-center">
<view class="zhghInfo-center-title">任务分派时间：
- <text>2019/11/11</text>
+ <text>{{data.createTime}}</text>
</view>
- <view class="zhghInfo-center-title">任务描述</view>
- <view class="zhghInfo-center-txt">老人们读书讲故事 陪护聊天 积极有耐心</view>
- <view class="zhghInfo-center-txt">处理好老人周边环境，打扫卫生，制造良好环境</view>
- </view>
+ <view class="zhghInfo-center-title">任务要求</view>
+ <view class="zhghInfo-center-txt">
+ <rich-text nodes="{{data.taskRequire}}"></rich-text>
+ </view>
+ <view class="zhghInfo-center-title">任务流程</view>
+ <view class="zhghInfo-center-txt">
+ <rich-text nodes="{{data.taskProcess}}"></rich-text>
+ </view>
+ </view> -->
- <view class="zhghInfo-accessory">
+ <!-- <view class="zhghInfo-accessory">
<view class="zhghInfo-center-title">附件</view>
- <view class="zhghInfo-center-img">
- <image mode='widthFix' src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576751446711&di=9a51ccd14d7d6223f49cf72979e74ca0&imgtype=0&src=http%3A%2F%2F08imgmini.eastday.com%2Fmobile%2F20191208%2F20191208110046_ce457572d1c4ffd2702fb562caa4180e_1.jpeg"></image>
- <image mode='widthFix' src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576751446712&di=e0b0e646cc1dd468fafbc791182aeac6&imgtype=0&src=http%3A%2F%2Fcsgy.rmzxb.com.cn%2Fupload%2Fresources%2Fimage%2F2016%2F10%2F17%2F1180737_500x500.jpg"></image>
- </view>
- </view>
+ <div class="activity-uploadImage">
+ <view class="educt_hasupload_pic" wx:for="{{evalList.evalList1000}}" wx:key="index">
+ <image src="{{item.pic}}" class="upload" bindtap="previewImage" data-src="{{item.pic}}"></image>
+ <image src="{{del}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1000}}" class="{{disabled? 'displayNone':'activity-uploadImag-del'}}"></image>
+ </view>
+ <view bindtap="joinPicture" data-index="{{0}}" data-associatetypeid="{{1000}}" class="{{disabled? 'displayNone':'educt_upload_add'}}">
+ <image class="activity-uploadImag-icon" src="{{add}}"></image>
+ </view>
+ </div>
+ </view> -->
- <view class="zhghInfo-text">
+ <!-- <view class="zhghInfo-text">
<view class="zhghInfo-center-title">任务汇报</view>
<view class="zhghInfo-center-textarea">
- <textarea placeholder="学会与老人沟通，耐心积极，心态良好" placeholder-style="color:#9B9B9B;"></textarea>
+ <textarea data-name="taskReport" value='{{data.socialTaskObject.taskReport}}' bindinput="inputChange" disabled="{{disabled}}" placeholder="学会与老人沟通，耐心积极，心态良好" placeholder-style="color:#9B9B9B;"></textarea>
</view>
- <view class="button-submit" bindtap='linkFunction'>提交</view>
- </view>
+ <view class="{{disabled? 'displayNone':'button-submit'}}" disabled="{{disabled}}" bindtap='linkFunction'>提交</view>
+ </view> -->
</view>
\ No newline at end of file
--
Gitblit v1.8.0