From 6816393fbfa11ce67088832b45399a52a961586a Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 16:45:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineLnsMinApp/pages/rzcx/rzcx.wxml | 91 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 22 deletions(-)
diff --git a/SunshineLnsMinApp/pages/rzcx/rzcx.wxml b/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
index 11a3aba..c4a434b 100644
--- a/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
+++ b/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
@@ -1,33 +1,80 @@
<!--pages/rzcx/rzcx.wxml-->
<div class="boxshadow">
- <div class="publicSnapshot-message">
- <span></span>
- <span>照片上传</span>
- </div>
- <div class="border-bottom"></div>
- <div class="activity-uploadImage">
- <view class="educt_hasupload_pic" wx:for="{{evalList.evalList1019}}" wx:key="index">
- <image src="{{item.pic}}" class="upload" name="{{item.pic}}" bindtap="previewImage" data-src="{{item.pic}}"></image>
- <image src="{{del}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1019}}" class="{{disabled? 'displayNone':'activity-uploadImag-del'}}"></image>
- </view>
- <view bindtap="uploadFiles" class="{{disabled? 'displayNone':'educt_upload_add'}}">
- <image class="activity-uploadImag-icon" src="{{add}}"></image>
- </view>
- </div>
+ <div class="publicSnapshot-main">
+ <span class="red-title"></span>
+ <span>申请人姓名</span>
+ <input data-name="createrName" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.createrName}}'></input>
+ </div>
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>照片上传</span>
+ </div>
+ <div class="border-bottom"></div>
+ <div class="activity-uploadImage">
+ <view class="educt_hasupload_pic" wx:for="{{evalList.evalList1019}}" wx:key="index">
+ <image src="{{item.pic}}" class="upload" name="{{item.pic}}" bindtap="previewImage" data-src="{{item.pic}}"></image>
+ <image src="{{del}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1019}}" class="{{disabled? 'displayNone':'activity-uploadImag-del'}}"></image>
+ </view>
+ <view bindtap="uploadFiles" class="{{disabled? 'displayNone':'educt_upload_add'}}">
+ <image class="activity-uploadImag-icon" src="{{add}}"></image>
+ </view>
+ </div>
</div>
<div class="boxshadow">
- <div class="publicSnapshot-message">
- <span></span>
- <span>申请理由</span>
- </div>
- <div class="border-bottom"></div>
- <div class="publicSnapshot-main" style='display:block'>
- <textarea data-name="reason" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.reason}}' placeholder="请输入备注内容" />
- </div>
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>申请理由</span>
+ </div>
+ <div class="border-bottom"></div>
+ <div class="publicSnapshot-main" style='display:block'>
+ <textarea data-name="reason" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.reason}}' placeholder="请输入备注内容" />
+ </div>
</div>
<div class="index-gray"></div>
+<div wx:if="{{approveLogs.length == 1}}">
+ <div class="index-gray"></div>
+ <div class="boxshadow">
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>检察院审核</span>
+ </div>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">审核意见</view>
+ <view class="fzpxInfo-main-group-around">{{approveLogs[0].opinion}}</view>
+ </view>
+ </div>
+</div>
+
+<div wx:if="{{approveLogs.length == 2}}">
+ <div class="index-gray"></div>
+ <div class="boxshadow">
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>检察院审核</span>
+ </div>
+ <view class="fzpxInfo-main-group">
+ <!-- <view class="fzpxInfo-main-group-title">审核意见</view> -->
+ <view class="fzpxInfo-main-group-around">{{approveLogs[0].opinion}}</view>
+ </view>
+ </div>
+ <div class="index-gray"></div>
+ <div class="boxshadow">
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>公安审核</span>
+ </div>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-around">{{approveLogs[1].opinion}}</view>
+ </view>
+ </div>
+
+</div>
+
+
+
+
<div class="{{disabled? 'displayNone':'submitButton'}}">
<div style='width:90%' class="mini-submit" bindtap="submit">提交申请</div>
</div>
\ No newline at end of file
--
Gitblit v1.8.0