Merge branch 'dev_wy' into dev2.0

wangyu
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
pages/main/smartchat/chat.js
pages/main/smartchat/chat.wxml
pages/main/smartchat/chat.wxss
pages/main/taxperson/home.js
pages/main/taxperson/home.wxss
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @60c5cf9
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @60c5cf9
@@ -178,7 +178,7 @@
         <text class='text_left'>租赁房屋坐落地址</text>
         <text class='text_right_333'>{{datas.house_address_new}}</text>
       </view>
-      <view style='height:90rpx;clear:both;'>
+      <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>
         <text class='text_right_333'>{{datas.house_detail_address}}</text>
       </view>
       <view style='height:90rpx;width:100%;clear:both;'>
@@ -200,7 +200,7 @@
         <text class='text_left'>房屋坐落地址</text>
         <text class='text_right_333'>{{datas.house_address_new}}</text>
       </view>
-      <view style='height:90rpx;clear:both;'>
+      <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>
         <text class='text_right_333'>{{datas.house_detail_address}}</text>
       </view>
       <view style='height:90rpx;width:100%;clear:both;'>
--- a/pages/main/smartchat/chat.js
查看文件 @60c5cf9
+++ b/pages/main/smartchat/chat.js
查看文件 @60c5cf9
@@ -8,10 +8,10 @@ Page({
    */
   data: {
     showModal: false,
-    inputValue:"",
-    comlist:"",
-    com_id:"",
-    choosed_index:0,
+    inputValue: "",
+    comlist: "",
+    com_id: "",
+    choosed_index: 0,
     chatlist: []
   },
@@ -36,22 +36,22 @@ Page({
   },
-  getComList:function(){
+  getComList: function() {
     var that = this;
     var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'uaa/v1/tenants',
       data: {
-        all:"true"
+        all: "true"
       },
       header: {
         'content-type': 'application/json',
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         if (res && res.data) {
           console.log("res", res)
-          if (res.data.items && res.data.items.length > 0){
+          if (res.data.items && res.data.items.length > 0) {
             that.setData({
               showModal: true,
               comlist: res.data.items
@@ -63,7 +63,7 @@ Page({
   },
   bindKeyInput(e) {
-    console.log("bindKeyInput",e)
+    console.log("bindKeyInput", e)
     this.setData({
       inputValue: e.detail.value
     })
@@ -71,7 +71,7 @@ Page({
   sendMsg: function() {
     var that = this;
-    if (this.data.inputValue == "" || this.data.inputValue.replace(/(^\s*)|(\s*$)/g, "")==""){
+    if (this.data.inputValue == "" || this.data.inputValue.replace(/(^\s*)|(\s*$)/g, "") == "") {
       wx.showToast({
         title: '请输入内容',
       })
@@ -83,57 +83,31 @@ Page({
       data: {
         text: that.data.inputValue
       },
-      method:"POST",
+      method: "POST",
       header: {
         'content-type': 'application/json',
         "Authorization": Authorization
       },
       success: function(res) {
         if (res && res.data) {
-          console.log("res", res) 
+          console.log("res", res)
           var databean = {}
           databean.type = "1"
           databean.text = that.data.inputValue
           that.data.chatlist.push(databean)
           that.data.chatlist.push(res.data)
           that.setData({
-            inputValue:"",
+            inputValue: "",
             chatlist: that.data.chatlist
           })
-          console.log("chatlist",that.data.chatlist)
+          console.log("chatlist", that.data.chatlist)
           // that.getChatinfo()
         }
       }
     })
   },
-  cancelhandle: function(e) {
-    console.log("cancelhandle", e)
-    this.setData({
-      showModal: false
-    })
-    wx.navigateBack({
-      delta:1
-    })
-  },
-
-  confirmhandle: function(e) {
-    console.log("confirmhandle", e)
-    this.setData({
-      showModal: false,
-    })
-    this.refreshToken();
-  },
-
-  goselect:function(e){
-    console.log("goselect",e)
-      this.setData({
-        com_id: this.data.comlist[e.currentTarget.id].id,
-        choosed_index: e.currentTarget.id
-      })
-  },
-
-  refreshToken:function(){
+  refreshToken: function() {
     var that = this;
     wx.request({
       url: baseUrl + 'uaa/v1/auth/tokens',
@@ -146,9 +120,9 @@ Page({
       header: {
         'content-type': 'application/json'
       },
-      success:function(res){
+      success: function(res) {
         console.log("refreshToken", res.data)
-        
+
         var user = res.data.user;
         var tenant = res.data.tenant;
         if (tenant) {
@@ -165,7 +139,7 @@ Page({
     })
   },
-  getChatinfo:function(){
+  getChatinfo: function() {
     var that = this;
     var Authorization = app.globalData.Authorization;
     wx.request({
@@ -176,7 +150,7 @@ Page({
         'content-type': 'application/json',
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         if (res && res.data) {
           console.log("getChatinfo", res)
           that.setData({
@@ -187,6 +161,38 @@ Page({
     })
   },
+
+  cancel: function(e) {
+    console.log("cancelhandle", e)
+    this.setData({
+      showModal: false
+    })
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+
+  confirm: function(e) {
+    console.log("confirmhandle", e)
+    this.setData({
+      showModal: false,
+    })
+    this.refreshToken();
+  },
+
+  bindChange: function(e) {
+    console.log("goselect", e)
+    this.setData({
+      com_id: this.data.comlist[e.detail.value].id,
+      choosed_index: e.detail.value
+    })
+  },
+
+  bindChange:function(e){
+    console.log("bindChange", e.detail.value)
+
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */
--- a/pages/main/smartchat/chat.wxml
查看文件 @60c5cf9
+++ b/pages/main/smartchat/chat.wxml
查看文件 @60c5cf9
 <!--pages/main/smartchat/chat.wxml-->
-<view hidden='{{showModal}}'>
+<import src="../../../common/picker_cell" />
+
+<view >
   <scroll-view style='background:#fff;margin-bottom:150rpx'>
     <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'}}">
@@ -25,23 +27,10 @@
 </view>
 <!-- 自定义弹窗 -->
-<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
+<!-- <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
 <view class='modal_lg' hidden="{{!showModal}}">
   <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
   <view class='divide_line_f5f5f5'></view>
-  <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;max-height:450rpx'>
-    <block wx:for="{{comlist}}" wx:for-index="idx">
-      <view wx:if="{{idx==choosed_index}}" bindtap='goselect' id="{{idx}}">
-        <text class='text_item_blue float_left'>{{item.name}}</text>
-        <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
-      </view>
-      <view wx:else bindtap='goselect' id="{{idx}}">
-        <text class='text_item_black float_left'>{{item.name}}</text>
-      </view>
-      <view class='divide_line_f5f5f5'></view>
-    </block>
-  </view> -->
-
   <view style='width:100%;display:flex;flex-direction:column;max-height:486rpx;'>
     <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
       <view wx:if="{{idx==choosed_index}}" style='padding:30rpx;display:flex;flex-direction:row;' >
@@ -61,4 +50,16 @@
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
     <text class='text_confirm' bindtap='confirmhandle'>确定</text>
   </view>
+</view> -->
+
+<view hidden="{{!showModal}}">
+  <picker-view indicator-style="height: 50px;" style="width: 100%; height: 300px;" value="{{value}}" bindchange="bindChange" class="picker_wrap">
+    <view style=' position: absolute;top:10rpx;width: 100%;z-index: 10;'>
+      <view bindtap="cancel" style='float: left;margin: 20rpx;color: #818181;'>取消</view>
+      <view bindtap="confirm" style='float: right;  margin: 20rpx; color: #2FB42E'>确定</view>
+    </view>
+    <picker-view-column>
+      <view wx:for="{{comlist}}" style="line-height: 50px;padding: 0 30rpx;text-align:center;">{{item.name}}</view>
+    </picker-view-column>
+  </picker-view>
 </view>
--- a/pages/main/smartchat/chat.wxss
查看文件 @60c5cf9
+++ b/pages/main/smartchat/chat.wxss
查看文件 @60c5cf9
@@ -94,6 +94,12 @@ white-space:nowrap;
   flex: 1;
 }
+.picker_wrap{
+position: fixed;
+  bottom: 0rpx;
+  background:#fff;
+}
+
 /* 聊天页面 */
 .bottom_wrap {
--- a/pages/main/taxperson/home.js
查看文件 @60c5cf9
+++ b/pages/main/taxperson/home.js
查看文件 @60c5cf9
@@ -103,19 +103,17 @@ Page({
         data.items[i].relative = data.items[i].family_ties
         if (data.items[i].family_ties=="本人"){
           this.self_id = data.items[i].id
+          if (data.items[i].status=='1'){//0已完善 1未完善
+            this.setData({
+              text_tip: '自然人信息不完善，立即完善'
+            })
+          }
         }
-        // if (i == 0) {
-        //   data.items[i].relative = "本人"
-        //   this.self_id = data.items[i].id
-        // }else{
-        //   data.items[i].relative = data.items[i].family_ties
-        // }
         datalist.push(data.items[i])
       }
       this.setData({
         taxlist: datalist
       })
-      this.getStatus(datalist)
     }
     console.log('handleData', this.data.taxlist)
   },
@@ -138,15 +136,6 @@ Page({
     }
   },
-  getStatus: function (data) {
-    console.log('data', data)
-    if (data[0].family_ties.length < 1 || data[0].name.length < 1 || data[0].id_card_type.length < 1 || data[0].id_card_no.length <1 || data[0].mobile.length < 1) {
-      this.setData({
-        text_tip: '自然人信息不完善，立即完善'
-      })
-    }
-  },
-
   goadd: function (e) {
     console.log(e)
     wx.navigateTo({
--- a/pages/main/taxperson/home.wxss
查看文件 @60c5cf9
+++ b/pages/main/taxperson/home.wxss
查看文件 @60c5cf9
@@ -105,6 +105,8 @@
   height: 40rpx;
   float: right;
   vertical-align: center;
+  margin-top:20rpx;
+
 }
 .phone_image_wrap {