Merge branch 'dev_py' into dev2.0

@@ -1116,7 +1116,7 @@ Page({
         if (this.data.house_type == "house_fund_loan") {
         if (this.data.house_type == "house_fund_loan") {
           newdata.type = 'loan'
           newdata.type = 'loan'
 
 
-          if (this.data.houseLocateInfo.address_value.length < 1) {
+          if (this.data.houseLocateInfo.address_value[0].length < 1) {
             this.showToast('请选择住房地址')
             this.showToast('请选择住房地址')
             return
             return
           } else if (this.data.identifytypeData.selected.length < 1) {
           } else if (this.data.identifytypeData.selected.length < 1) {
@@ -1143,17 +1143,17 @@ Page({
           } else if (this.data.firstpaybackDate.selected.length < 1) {
           } else if (this.data.firstpaybackDate.selected.length < 1) {
             this.showToast('请选择首次还款日期')
             this.showToast('请选择首次还款日期')
             return
             return
-          } else if (!formdata.loan_datelong || formdata.loan_datelong.length < 1) {
+          } else if (!formdata.loan_months || formdata.loan_months.length < 1) {
             this.showToast('请选择贷款期限')
             this.showToast('请选择贷款期限')
             return
             return
           }
           }
           newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n'
           newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n'
           newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
           newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
-          newdata.identify_type = this.data.identifytypeData.selected
+          newdata.certification_type = this.data.identifytypeData.selected
 
 
           newdata.loan_type = this.data.loantypeData.selected
           newdata.loan_type = this.data.loantypeData.selected
           newdata.loan_bank = this.data.bankInfo.selected
           newdata.loan_bank = this.data.bankInfo.selected
-          newdata.payback_date = this.data.firstpaybackDate.selected
+          newdata.loan_start = this.data.firstpaybackDate.datelong
           // newdata.loan_datelong = this.data.loandatelongData.selected
           // newdata.loan_datelong = this.data.loandatelongData.selected
           var request_loan_address = this.getLoanAddressRequest()
           var request_loan_address = this.getLoanAddressRequest()
           newdata.house_address = request_loan_address
           newdata.house_address = request_loan_address
@@ -1565,7 +1565,7 @@ Page({
       case 'payback_date':
       case 'payback_date':
         var firstpayback_Date = this.data.firstpaybackDate
         var firstpayback_Date = this.data.firstpaybackDate
         firstpayback_Date.selected = e.detail.value
         firstpayback_Date.selected = e.detail.value
-        console.log('payback_date', Date.parse(new Date(e.detail.value)))
+        firstpayback_Date.datelong = Date.parse(new Date(e.detail.value)) / 1000,
         this.setData({
         this.setData({
           firstpaybackDate: firstpayback_Date
           firstpaybackDate: firstpayback_Date
         })
         })

@@ -238,7 +238,7 @@
       <view style='height:90rpx'>
       <view style='height:90rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
         <text class='text_black_30 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='loan_datelong' type='number'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款月数' name='loan_months' type='number'></input>
       </view>
       </view>
     </view>
     </view>