Merge branch 'dev_py' into dev2.0

@@ -342,7 +342,7 @@ Page({
       selected: '',
       isrequre: true,
       isblack: 'true',
-      values: ["组织", "自然人"],
+      values: ["企业", "个人"],
       placeholder: '请选择出租方类型',
       onChange: 'onPickerSelect'
     },
@@ -1278,24 +1278,24 @@ Page({
           } else if (!formdata.owner_name || formdata.owner_name.length < 1) {
             this.showToast('请填写出租方名称')
             return
-          } else if (!formdata.owner_credit_no || formdata.owner_credit_no.length < 1) {
-            this.showToast('请填写纳税人识别号')
-            return
+          } 
+          if (this.data.leasetypeData.selected=='企业'){
+            if (!formdata.owner_credit_no || formdata.owner_credit_no.length < 1) {
+              this.showToast('请填写统一社会信用代码')
+              return
+            }
+            newdata.owner_id_card_no = ''
+          } else{
+            if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
+              this.showToast('请填写证照号码')
+              return
+            } else if (!format.isIDCardNum(formdata.owner_id_card_no)) {
+              this.showToast('身份证格式有误')
+              return
+            } 
+            newdata.owner_id_card_type = '1'//this.data.cardtypeData.selected
           }
-          //  else if (!formdata.identify_no || formdata.identify_no.length < 1) {
-          //   this.showToast('请填写出租方号码')
-          //   return
-          // } 
-          else if (this.data.cardtypeData.selected.length < 1) {
-            this.showToast('请选择证照类型')
-            return
-          } else if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
-            this.showToast('请填写证照号码')
-            return
-          } else if (!format.isIDCardNum(formdata.owner_id_card_no)) {
-            this.showToast('身份证格式有误')
-            return
-          } else if (this.data.rentLocateInfo.address_value[0].length < 1) {
+          if (this.data.rentLocateInfo.address_value[0].length < 1) {
             this.showToast('请选择房屋地址')
             return
           } else if (!formdata.house_detail_address || formdata.house_detail_address.length < 1) {
@@ -1312,7 +1312,6 @@ Page({
             return
           }
           newdata.owner_type = this.data.leasetypeData.selected
-          newdata.owner_id_card_type = '1'//this.data.cardtypeData.selected
           newdata.rent_start = this.data.leasestartDate.datelong
           newdata.rent_end = this.data.leaseendDate.datelong
 
@@ -1343,7 +1342,7 @@ Page({
           }
         }
         newdata.has_spouse = this.data.hasLover ? 'y' : 'n'
-        newdata.id_card_no =  newdata.spouse_id_card_no
+        newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no:''
         newdata.id_card_type = '1' //this.data.lovercardtypeData.selected
         newdata.birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0
         break;
@@ -1431,7 +1430,7 @@ Page({
   dealIdInfo: function (idCardNum, idcard_belong) {
     var info = format.analyzeIDCard(idCardNum)
     console.log('info', info.age, info.sex, info.birthDay, (Date.parse(new Date(info.birthDay)) / 1000))
-    var data
+    var data = {}
     if (idcard_belong == 'children_id_card_no_input') {
       this.data.commonbirthDate.selected = info.birthDay
       this.data.commonbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
@@ -1724,8 +1723,10 @@ Page({
       case 'lease_type':
         var leasetype_Data = this.data.leasetypeData
         leasetype_Data.selected = leasetype_Data.values[e.detail.value]
+        this.data.cardtypeData.hidden = leasetype_Data.selected == "企业"
         this.setData({
-          leasetypeData: leasetype_Data
+          leasetypeData: leasetype_Data,
+          cardtypeData: this.data.cardtypeData
         })
         break;
       case 'lease_start_date':

@@ -252,16 +252,16 @@
         <text class='text_777_30 float_left'>出租方名称</text>
         <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入出租方名称' name='owner_name'></input>
       </view>
-      <view class='divide_line_30'></view>
-      <view style='height:90rpx'>
+      <view class='divide_line_30' hidden="{{leasetypeData.selected == '个人'}}"></view>
+      <view style='height:90rpx' hidden="{{leasetypeData.selected == '个人'}}">
         <text class='red_star_right_10'>*</text>
-        <text class='text_777_30 float_left'>出租方纳税人识别号</text>
-        <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:350rpx;color:#000;' placeholder='统一社会信用代码' name='owner_credit_no'></input>
+        <text class='text_777_30 float_left'>统一社会信用代码</text>
+        <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:350rpx;color:#000;' placeholder='请输入统一社会信用代码' name='owner_credit_no'></input>
       </view>
-      <view class='divide_line_30'></view>
-      <template is="picker_cell_normal" data="{{...cardtypeData}}" />
-      <view class='divide_line_30'></view>
-      <view style='height:90rpx'>
+      <view class='divide_line_30'  hidden="{{leasetypeData.selected == '企业'}}"></view>
+      <template is="picker_cell_normal" data="{{...cardtypeData}}"/>
+      <view class='divide_line_30'  hidden="{{leasetypeData.selected == '企业'}}"></view>
+      <view style='height:90rpx'  hidden="{{leasetypeData.selected == '企业'}}">
         <text class='red_star_right_10'>*</text>
         <text class='text_777_30 float_left'>证照号码</text>
         <view wx:if="{{isIdCard}}">
@@ -281,7 +281,7 @@
       <view style='height:90rpx'>
         <text class='red_star_right_10'>*</text>
         <text class='text_777_30 float_left'>租赁合同编号</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: rightcolor:#000;' placeholder='请输合同编号' name='rent_contract_no'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: rightcolor:#000;' placeholder='请输入合同编号' name='rent_contract_no'></input>
       </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...leasestartDate}}" />