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 | 96 ++++++++++++++++++++++++++++++------------------
1 files changed, 60 insertions(+), 36 deletions(-)
diff --git a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
index 53df3f2..67c0dd0 100644
--- a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
+++ b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
@@ -1,43 +1,67 @@
<!--pages/zhghInfo/zhghInfo.wxml-->
<view class="zhghInfo-bg">
- <view class="zhghInfo-main">
- <view class="zhghInfo-main-b">
- <view class="zhghInfo-main-b-left">
- <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">{{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-main">
+ <view class="zhghInfo-main-b">
+ <view class="zhghInfo-main-b-left">
+ <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">{{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">
- <view class="zhghInfo-center-title">任务分派时间：
- <text>{{data.createTime}}</text>
- </view>
- <view class="zhghInfo-center-title">任务描述</view>
- <view class="zhghInfo-center-txt">{{data.taskRequire}}</view>
- </view>
+ <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-accessory">
- <view class="zhghInfo-center-title">附件</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-center">
+ <view class="zhghInfo-center-title">任务分派时间：
+ <text>{{data.createTime}}</text>
+ </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-text">
- <view class="zhghInfo-center-title">任务汇报</view>
- <view class="zhghInfo-center-textarea">
- <textarea data-name="taskReport" bindinput="inputChange" disabled="{{disabled}}" placeholder="学会与老人沟通，耐心积极，心态良好" placeholder-style="color:#9B9B9B;"></textarea>
- </view>
- <view class="button-submit" bindtap='linkFunction'>提交</view>
- </view>
+ <!-- <view class="zhghInfo-accessory">
+ <view class="zhghInfo-center-title">附件</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-center-title">任务汇报</view>
+ <view class="zhghInfo-center-textarea">
+ <textarea data-name="taskReport" value='{{data.socialTaskObject.taskReport}}' bindinput="inputChange" disabled="{{disabled}}" placeholder="学会与老人沟通，耐心积极，心态良好" placeholder-style="color:#9B9B9B;"></textarea>
+ </view>
+ <view class="{{disabled? 'displayNone':'button-submit'}}" disabled="{{disabled}}" bindtap='linkFunction'>提交</view>
+ </view> -->
</view>
\ No newline at end of file
--
Gitblit v1.8.0