Merge branch 'dev_py' into dev2.0

@@ -1295,6 +1295,12 @@ Page({
               id_card_no: id_info.id_card_number,
               id_card_no: id_info.id_card_number,
               commonbirthDate: that.data.commonbirthDate
               commonbirthDate: that.data.commonbirthDate
             }
             }
+          } else if (that.idcard_belong == 'owner_id_card_no') {
+            console.log('id_info.id_card_number', id_info.id_card_number)
+            data = {
+              owner_id_card_no: id_info.id_card_number,
+              owner_name: id_info.name
+            }
           }
           }
           that.setData(data)
           that.setData(data)
           console.log('-cardtypeData--', that.data.cardtypeData)
           console.log('-cardtypeData--', that.data.cardtypeData)
@@ -1709,10 +1715,11 @@ Page({
           // if (this.data.rentLocateInfo.address_value[0].length < 1) {
           // if (this.data.rentLocateInfo.address_value[0].length < 1) {
           //   this.showToast('请选择房屋地址')
           //   this.showToast('请选择房屋地址')
           //   return
           //   return
-          // } else if (!formdata.house_detail_address || formdata.house_detail_address.length < 1) {
-          //   this.showToast('请填写房屋详细地址')
-          //   return
-          // }
+          // } else 
+          if (!formdata.house_detail_address || formdata.house_detail_address.length < 1) {
+            this.showToast('请填写房屋详细地址')
+            return
+          }
           // else if (!formdata.rent_contract_no || formdata.rent_contract_no.length < 1) {
           // else if (!formdata.rent_contract_no || formdata.rent_contract_no.length < 1) {
           //   this.showToast('请填写租赁合同编号')
           //   this.showToast('请填写租赁合同编号')
           //   return
           //   return

@@ -348,7 +348,7 @@
     <view style='height:90rpx'>
     <view style='height:90rpx'>
       <text class='text_777_30 float_left head_in'>配偶证照号码</text>
       <text class='text_777_30 float_left head_in'>配偶证照号码</text>
       <view wx:if="{{isIdCard}}">
       <view wx:if="{{isIdCard}}">
-        <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="spouse_id_card_no"></image>
+        <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden='{{hasLover}}' id="spouse_id_card_no"></image>
         <input class='input_wrap' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input' disabled='{{hasLover}}'></input>
         <input class='input_wrap' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input' disabled='{{hasLover}}'></input>
       </view>
       </view>
     </view>
     </view>

@@ -887,6 +887,19 @@ Page({
       this.showtoast('手机号码有误');
       this.showtoast('手机号码有误');
       return
       return
     }
     }
+    if (this.data.curAddress_haschanged || this.data.taxInfo.current_address.province_code) {//选择了地址
+      if (formdata.current_address_detail.length < 1) {
+        this.showtoast('请填写详细居住地址');
+        return
+      }
+    }
+    if (this.data.birthAddress_haschanged || this.data.taxInfo.huji_address.province_code) {//选择了地址
+      if (formdata.huji_address_detail.length < 1) {
+        this.showtoast('请填写详细户籍地址');
+        return
+      }
+    }
+    
     // if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
     // if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
     //   this.showtoast('邮箱格式有误');
     //   this.showtoast('邮箱格式有误');
     //   return
     //   return