Merge branch 'dev2.0' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev2.0

@@ -195,7 +195,7 @@ Page({
       onChange: 'onPickerSelect'
     },
     cardtypeData: {
-      label: '证照类型',
+      label: '证件类型',
       isrequre: true,
       bindtype: 'cardtype',
       selected: '居民身份证',
@@ -866,10 +866,10 @@ Page({
               supported_name: id_info.name,
               olderbirthDate: this.data.olderbirthDate
             }
-          } else if (this.idcard_belong == 'owner_id_cartd_no') {
+          } else if (this.idcard_belong == 'owner_id_card_no') {
             this.data.olderbirthDate.selected = birth_day
             data = {
-              owner_id_cartd_no: id_info.id_card_number,
+              owner_id_card_no: id_info.id_card_number,
             }
           }
           this.setData(data)
@@ -1114,6 +1114,8 @@ Page({
         console.log('TITLE', this.data.title)
 
         if (this.data.house_type == "house_fund_loan") {
+          newdata.type = 'loan'
+
           if (this.data.houseLocateInfo.address_value.length < 1) {
             this.showToast('请选择住房地址')
             return
@@ -1154,19 +1156,21 @@ Page({
           newdata.payback_date = this.data.firstpaybackDate.selected
           // newdata.loan_datelong = this.data.loandatelongData.selected
           var request_loan_address = this.getLoanAddressRequest()
-          newdata.house_location = request_loan_address
+          newdata.house_address = request_loan_address
 
         } else if (this.data.house_type == "house_fund_rent") {
-          if (this.data.workingcityInfo.address_value.length < 1) {
+          newdata.type = 'rent'
+          console.log('workingcityInfo', this.data.workingcityInfo.address_value)
+          if (this.data.workingcityInfo.address_value[0].length < 1) {
             this.showToast('请选择工作城市')
             return
           } else if (this.data.leasetypeData.selected.length < 1) {
             this.showToast('请选择出租方类型')
             return
-          } else if (!formdata.lease_name || formdata.lease_name.length < 1) {
+          } else if (!formdata.owner_name || formdata.owner_name.length < 1) {
             this.showToast('请填写出租方名称')
             return
-          } else if (!formdata.lease_idno || formdata.lease_idno.length < 1) {
+          } else if (!formdata.owner_credit_no || formdata.owner_credit_no.length < 1) {
             this.showToast('请填写纳税人识别号')
             return
           }
@@ -1174,17 +1178,19 @@ Page({
           //   this.showToast('请填写出租方号码')
           //   return
           // } 
-          else if (this.data.identifytypeData.selected.length < 1) {
+          else if (this.data.cardtypeData.selected.length < 1) {
             this.showToast('请选择证件类型')
             return
-          } else if (!formdata.owner_id_cartd_no || formdata.owner_id_cartd_no.length < 1) {
+          } else if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
             this.showToast('请填写证件号码')
             return
-          } else if (this.data.rentLocateInfo.address_value.length < 1) {
+          } else if (this.data.rentLocateInfo.address_value[0].length < 1) {
             this.showToast('请选择房屋地址')
             return
-          }  
-           else if (!formdata.rent_contract_no || formdata.rent_contract_no.length < 1) {
+          } 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) {
             this.showToast('请填写租赁合同编号')
             return
           } else if (this.data.leasestartDate.selected.length < 1) {
@@ -1194,8 +1200,8 @@ Page({
             this.showToast('请选择日期')
             return
           }
-          newdata.lease_type = this.data.leasetypeData.selected
-          newdata.certification_type = this.data.identifytypeData.selected
+          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
 
@@ -1218,8 +1224,9 @@ Page({
             return
           }
         }
-        newdata.lover_cardtype = this.data.lovercardtypeData.selected
-        newdata.lover_birthdate = this.data.loverbirthDate.selected
+        newdata.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;
     }
 
@@ -1328,11 +1335,11 @@ Page({
       data = {
         olderbirthDate: this.data.olderbirthDate
       }
-    } else if (idcard_belong == 'owner_id_cartd_no_input') {
+    } else if (idcard_belong == 'owner_id_card_no_input') {
       // this.data.olderbirthDate.selected = info.birthDay
       // this.data.olderbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
       // data = {
-      //   owner_id_cartd_no: idCardNum,
+      //   owner_id_card_no: idCardNum,
       // }
     }
     if (info.age) {
@@ -1580,7 +1587,7 @@ Page({
       case 'lease_start_date':
         var leasestart_Date = this.data.leasestartDate
         leasestart_Date.selected = e.detail.value
-        console.log('lease_start_date', Date.parse(new Date(e.detail.value)))
+        leasestart_Date.datelong = Date.parse(new Date(e.detail.value)) / 1000,
         this.setData({
           leasestartDate: leasestart_Date
         })
@@ -1588,7 +1595,7 @@ Page({
       case 'lease_end_date':
         var leaseend_Date = this.data.leaseendDate
         leaseend_Date.selected = e.detail.value
-        console.log('lease_end_date', Date.parse(new Date(e.detail.value)))
+        leaseend_Date.datelong = Date.parse(new Date(e.detail.value)) / 1000,
         this.setData({
           leaseendDate: leaseend_Date
         })

@@ -253,23 +253,23 @@
       <view style='height:90rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
         <text class='text_black_30 float_left'>出租方名称</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入出租方名称' name='lease_name'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入出租方名称' name='owner_name'></input>
       </view>
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
         <text class='text_black_30 float_left'>出租方纳税人识别号</text>
-        <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>
+        <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='owner_credit_no'></input>
       </view>
       <view class='divide_line_f5f5f5'></view>
-      <template is="picker_cell_normal" data="{{...identifytypeData}}" />
+      <template is="picker_cell_normal" data="{{...cardtypeData}}" />
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
         <text class='text_black_30 float_left'>证件号码</text>
         <view wx:if="{{isIdCard}}">
-          <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_cartd_no"></image>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证件号码' maxlength='18' type='idcard'  name='owner_id_cartd_no' value='{{owner_id_cartd_no}}' bindinput="idChange" id='owner_id_cartd_no_input'></input>
+          <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_card_no"></image>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证件号码' maxlength='18' type='idcard'  name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" id='owner_id_card_no_input'></input>
         </view>
       </view>
     </view>
@@ -278,7 +278,7 @@
       <template is="picker_cell_normal" data="{{...rentLocateInfo}}" />
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入详细地址，精确到楼牌号' name='detail_address'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入详细地址，精确到楼牌号' name='house_detail_address'></input>
       </view>
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
@@ -313,7 +313,7 @@
 
 <view style='padding:0 30rpx;'>
 
-  <view wx:if="{{cur_index=='children_education'}}">
+  <view wx:if="{{cur_index=='children_education' || cur_index=='house_fund'}}">
     <view style='height:90rpx'>
       <text class='text_black_30 float_left'>配偶姓名</text>
       <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
@@ -338,30 +338,6 @@
     </view>
   </view>
 
-  <view wx:if="{{cur_index=='house_fund'}}">
-    <view style='height:90rpx'>
-      <text class='text_black_30 float_left'>配偶姓名</text>
-      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
-    </view>
-    <view class='divide_line_f5f5f5'></view>
-
-    <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
-    <view class='divide_line_f5f5f5'></view>
-    <view style='height:90rpx'>
-      <text class='text_black_30 float_left'>配偶证件号码</text>
-      <view wx:if="{{isIdCard}}">
-        <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
-        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='18' type='idcard' value='{{lover_idno}}' bindinput="idChange" id='spouse_id_card_no_input'></input>
-      </view>
-    </view>
-    <view class='divide_line_f5f5f5'></view>
-    <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
-    <view class='divide_line_f5f5f5'></view>
-    <view style='height:90rpx'>
-      <text class='text_black_30 float_left'>国籍</text>
-      <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
-    </view>
-  </view>
 
 </view>
 <!-- <view class='divide_line_f5f5f5'></view>