Merge branch 'dev_wy' into dev2.0

@@ -21,7 +21,6 @@
     </view> -->
     </view> -->
       <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
       <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
         <template is="picker_cell_normal" data="{{...issinglechildData}}" />
         <template is="picker_cell_normal" data="{{...issinglechildData}}" />
-
         <view wx:if="{{issinglechildData.selected=='否'}}">
         <view wx:if="{{issinglechildData.selected=='否'}}">
           <view class='divide_line_f5f5f5'></view>
           <view class='divide_line_f5f5f5'></view>
           <template is="picker_cell_normal" data="{{...shareMethodData}}" />
           <template is="picker_cell_normal" data="{{...shareMethodData}}" />
@@ -398,10 +397,10 @@
   <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view>
   <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view>
   <!-- 申报说明 -->
   <!-- 申报说明 -->
   <view style='top:250rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
   <view style='top:250rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
-    <image class='modal_img' src="{{modal_images[cur_status]}}"></image>
+    <image class='modal_img' src="{{modal_images[cur_status]}}" bindtap='closeModalImg'></image>
     <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
     <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
-    <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;'>
-      <image style='width:30rpx;height:30rpx;' src='/images/close.png' bindtap='closeModalImg'></image>
+    <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
+      <image style='width:30rpx;height:30rpx;' src='/images/close.png' ></image>
     </view>
     </view>
   </view>
   </view>
 
 

 <!--pages/main/smartchat/chat.wxml-->
 <!--pages/main/smartchat/chat.wxml-->
 <import src="../../../common/picker_cell" />
 <import src="../../../common/picker_cell" />
 
 
-<view class='page'>
-  <view style='background:#fff;margin-bottom:60px;width:100%;'>
+<view>
+  <view style='background:#fff;padding-bottom:65px;'>
     <view wx:for="{{chatlist}}" wx:for-item="item" style='display:flex;flex-direction:column'>
     <view wx:for="{{chatlist}}" wx:for-item="item" style='display:flex;flex-direction:column'>
       <view style='margin:50rpx 60rpx 0 36rpx;display:flex;flex-direction:row' wx:if="{{item.type=='0'}}">
       <view style='margin:50rpx 60rpx 0 36rpx;display:flex;flex-direction:row' wx:if="{{item.type=='0'}}">
         <image style='width:102rpx;height:92rpx' src="/images/icon_robot.png"></image>
         <image style='width:102rpx;height:92rpx' src="/images/icon_robot.png"></image>

 /* pages/main/smartchat/chat.wxss */
 /* pages/main/smartchat/chat.wxss */
 
 
-page{
-  width:100%;
-  height: 100%
-}
-
 /* 遮罩层 */
 /* 遮罩层 */
 
 
 .mask {
 .mask {