Merge branch 'bug6548' into debug

pages-approve/activity/list.vue

@@ -75,13 +75,13 @@
 								<view class="info" v-if="item.MatterContent">事项内容：{{item.MatterContent}} </view>
 								
 								<view class="info">添加时间：{{item.CreateTime|formatTime}}</view>
-								<view class="info" v-if="item.EditReason" style="display: flex;">
+								<!-- <view class="info" v-if="item.EditReason" style="display: flex;">
 									<view>最近修改记录：</view> 
 									<view>
 										<view>{{item.EditReason}}</view>
 										<view style="color: #999;">{{item.ModifyTime|formatTime}}</view>
 									</view>	
-								</view>
+								</view> -->
 								
 								<view class="bot-btns">
 										<van-button type="primary" plain color="#3385FF" class="btn" size="small" block round 

pages-roadshow/addMatter/index.vue

@@ -33,7 +33,7 @@
 				placeholder="请输入事项内容" 
 				@change="bindInputHandle('matterContent',$event)"
 			/>
-			<van-field
+			<!-- <van-field
 				v-if="edit_matter_id"
 				:value="formData.EditReason"
 				clickable
@@ -43,7 +43,7 @@
 				autosize 
 				placeholder="请输入修改原因" 
 				@change="bindInputHandle('EditReason',$event)"
-			/>
+			/> -->
 		</van-form>
 
 		<div class="submit-bot">