From d99603fa4c5188d19991de978c185b2b9247c5af Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Sat, 09 May 2020 09:22:02 +0800
Subject: [PATCH] Merge branch 'master' of http://git.hugeinfo.com.cn/r/nsjcy/frontEnd/nsjcy

---
 SunshineLnsMinApp/pages/pfyy/pfyy.wxml |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.wxml b/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
index aa06cf0..0dd5e25 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
@@ -23,12 +23,12 @@
 	<div class="publicSnapshot-main">
 		<span class="red-title">*</span>
 		<span>联系方式</span>
-		<input data-name="contactPhone" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.contactPhone}}'></input>
+		<input type="number" data-name="contactPhone" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.contactPhone}}'></input>
 	</div>
 	<div class="publicSnapshot-main">
 		<span class="red-title">*</span>
 		<span>活动时间</span>
-		<picker mode="date" value="{{picturesInfo.activitiesTime}}" data-name="activitiesTime" disabled="{{disabled}}" bindchange="inputChange">
+		<picker mode="date" value="{{picturesInfo.activitiesTime}}" class='picker-margin' data-name="activitiesTime" disabled="{{disabled}}" bindchange="inputChange">
 			<view class="picker">
 				{{picturesInfo.activitiesTime}}
 			</view>
@@ -51,11 +51,11 @@
 	<div class="publicSnapshot-main">
 		<span class="red-title">*</span>
 		<span>活动场地</span>
-		<input type="number" data-name="activitiesAddress" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.activitiesAddress}}'></input>
+		<input type="text" data-name="activitiesAddress" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.activitiesAddress}}'></input>
 	</div>
   	<div class="publicSnapshot-main" style='display:block'>
 		<view class="zhghInfo-center-title">
-			<span class="red-title">*</span>
+			<span class="red-title"></span>
 			<span>备注</span>
 		</view>
 		<textarea data-name="remake" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.remake}}' placeholder="请输入备注内容" />
@@ -63,6 +63,39 @@
 </div>
 <div class="index-gray"></div>
 
+<div class="{{ReplyLogs.length > 0 ? '':'displayNone'}}">
+  <div class="reply-div">注:如有疑问,可在下方继续咨询</div>
+  <div class="publicSnapshot-message">
+    <span></span>
+    <span>回复内容记录</span>
+  </div>
+  <div class="publicSnapshot-textarea">
+
+    <div class='msg-reply-view-content' wx:for="{{ReplyLogs}}" wx:key="id">
+
+      <div class='msg-reply-view-time-user' wx:if="{{item.userType ==2}}">检察官:{{item.createTime}}</div>
+      <div class='msg-reply-view-time-admin' wx:if="{{item.userType ==1}}">我:{{item.createTime}}</div>
+      <div class='msg-reply-view-user' wx:if="{{item.userType ==2}}">{{item.content}}</div>
+      <div class='msg-reply-view-admin' wx:if="{{item.userType ==1}}">{{item.content}}</div>
+    </div>
+  </div>
+  <div class="index-gray"></div>
+</div>
+
 <div class="{{disabled? 'displayNone':'submitButton'}}">
   <div style='width:90%' class="mini-submit" bindtap="submit">提交申请</div>
+</div>
+<div wx:if="{{ReplyLogs.length > 0}}" class="">
+  <div class="index-gray"></div>
+  <div class="publicSnapshot-message">
+    <span></span>
+    <span>继续回复</span>
+  </div>
+  <div class="publicSnapshot-textarea">
+    <textarea data-name="replyContent" bindinput="inputChange" placeholder="请输入回复内容" />
+  </div>
+</div>
+<div wx:if="{{ReplyLogs.length > 0}}" class="submitButton">
+  <div class="mini-submit" bindtap="reply">提交回复</div>
+  <div class="drafts" bindtap="goback">返回</div>
 </div>
\ No newline at end of file

--
Gitblit v1.8.0