Merge branch 'dev_wy' into dev2.0

wangyu
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
pages/main/smartchat/chat.js
pages/main/smartchat/chat.wxml
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @a928e4a
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @a928e4a
@@ -158,21 +158,29 @@
         <text class='text_left'>出租方名称</text>
         <text class='text_right_333'>{{datas.owner_name}}</text>
       </view>
-      <view style='height:90rpx;width:100%;clear:both;'>
+      <!-- <view style='height:90rpx;width:100%;clear:both;'>
         <view style='height:90rpx;float:left;display:flex;flex-direction:column'>
           <text style='font-size: 15px;color: #777777;line-height:90rpx;'>出租方纳税人识别号：</text>
-          <!-- <text style='line-height:24rpx;font-size:24rpx;color:#AEAEAE;'>统一社会信用代码</text> -->
         </view>
         <text class='text_right_333'>{{datas.owner_credit_no}}</text>
+      </view> -->
+      <view wx:if="{{datas.owner_type=='个人'}}">
+        <view style='height:90rpx;width:100%;clear:both;'>
+          <text class='text_left'>证照类型</text>
+          <text class='text_right_333'>{{datas.owner_id_cartd_type=='1'?"居民身份证":datas.owner_id_cartd_type}}</text>
+        </view>
+        <view style='height:90rpx;width:100%;clear:both;'>
+          <text class='text_left'>证照号码</text>
+          <text class='text_right_333'>{{datas.owner_id_cartd_no}}</text>
+        </view>
       </view>
-      <view style='height:90rpx;width:100%;clear:both;'>
-        <text class='text_left'>证书类型</text>
-        <text class='text_right_333'>{{datas.owner_id_cartd_type=='1'?"居民身份证":datas.owner_id_cartd_type}}</text>
-      </view>
-      <view style='height:90rpx;width:100%;clear:both;'>
-        <text class='text_left'>证书号码</text>
-        <text class='text_right_333'>{{datas.owner_id_cartd_no}}</text>
+      <view wx:if="{{datas.owner_type=='企业'}}">
+        <view style='height:90rpx;width:100%;clear:both;'>
+          <text class='text_left'>统一社会信用代码</text>
+          <text class='text_right_333'>{{datas.owner_id_cartd_no}}</text>
+        </view>
       </view>
+
       <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
       <view style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>租赁房屋坐落地址</text>
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @a928e4a
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @a928e4a
@@ -182,18 +182,22 @@
                 <text class='text_999_28 ' style='line-height:70rpx'>被赡养人姓名：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.supported_name}}</text>
               </view>
+              <view style='height:70rpx'>
+                <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.relationship}}</text>
+              </view>
               <!-- <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>分摊比例：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
-              </view> -->
-              <view style='height:70rpx'>
+              </view> 
+               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
                 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
-              </view>
+              </view> -->
               <view class='divide_line_f5f5f5'></view>
               <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
               <view class='float_right' wx:if="{{item.status=='failed'}}">
--- a/pages/main/smartchat/chat.js
查看文件 @a928e4a
+++ b/pages/main/smartchat/chat.js
查看文件 @a928e4a
@@ -54,6 +54,7 @@ Page({
           if (res.data.items && res.data.items.length > 0) {
             that.setData({
               showModal: true,
+              com_id: res.data.items[0].id,
               comlist: res.data.items
             })
           }
--- a/pages/main/smartchat/chat.wxml
查看文件 @a928e4a
+++ b/pages/main/smartchat/chat.wxml
查看文件 @a928e4a
@@ -7,12 +7,12 @@
       <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>
         <view class='receive_bg'>
-          <text class='text_receive_wrap'>{{item.text}}</text>
+          <text class='text_receive_wrap'>{{item.text}}的刷卡缴费卡是否快速发卡上阿打发货撒拉科技付款后萨福克商量好疯狂拉升的刷卡缴费卡是否快速发卡上阿打发货撒拉科技付款后萨福克商量好疯狂拉升</text>
         </view>
       </view>
       <view style='margin:50rpx 36rpx 0 60rpx;display:flex;justify-content:flex-end;' wx:if="{{item.type=='1'}}">
         <view class='send_bg'>
-          <text class='text_send_wrap'>{{item.text}}</text>
+          <text class='text_send_wrap'>{{item.text}}的刷卡缴费卡是否快速发卡上阿打发货撒拉科技付款后萨福克商量好疯狂拉升的刷卡缴费卡是否快速发卡上阿打发货撒拉科技付款后萨福克商量好疯狂拉升</text>
         </view>
         <view style='width:92rpx;height:92rpx;'>
           <open-data type="userAvatarUrl"></open-data>
@@ -21,7 +21,7 @@
     </view>
   </scroll-view>
   <view class='bottom_wrap'>
-    <input class='input_wrap' placeholder-class='input_placeholder_wrap' confirm-type="send" bindinput="bindKeyInput" placeholder='请输入您要咨询的问题' value='{{inputValue}}'></input>
+    <input class='input_wrap' placeholder-class='input_placeholder_wrap' bindinput="bindKeyInput" placeholder='请输入您要咨询的问题' value='{{inputValue}}'></input>
     <view class='btn_send_wrap' bindtap='sendMsg'>发送</view>
   </view>
 </view>