Merge branch 'dev_py' into dev2.0

@@ -339,7 +339,7 @@ Page({
       selected: '',
       isrequre: true,
       isblack: 'true',
-      values: ["公积金贷款", "商业贷款"],
+      values: ["公积金贷款", "商业贷款","组合贷款"],
       placeholder: '请选择贷款类型',
       onChange: 'onPickerSelect'
     },
@@ -409,6 +409,20 @@ Page({
       start: '1970-01-01',
       datelong: 0,
     },
+    firstpaybackDate_2: {
+      label: '首次还款日期',
+      bindtype: 'payback_date_2',
+      selected: '',
+      isrequre: true,
+      isblack: 'true',
+      values: ["是", "否"],
+      placeholder: '请选择日期',
+      onChange: 'onPickerSelect',
+      mode: "date",
+      fields: "day",
+      start: '1970-01-01',
+      datelong: 0,
+    },
     leasestartDate: {
       label: '租赁期起',
       bindtype: 'lease_start_date',
@@ -458,9 +472,19 @@ Page({
       onChange: 'onPickerSelect',
     },
     bankInfo: {
-      label: '贷款银行',
+      label: '公积金贷款银行',
       bindtype: 'bank',
-      maxWidth: 490,
+      maxWidth: 400,
+      isrequre: true,
+      placeholder: '请选择贷款银行',
+      selected: '',
+      values: [],
+      onChange: 'onPickerSelect'
+    },
+    bankInfo_2: {
+      label: '商业贷款银行',
+      bindtype: 'bank_2',
+      maxWidth: 430,
       isrequre: true,
       placeholder: '请选择贷款银行',
       selected: '',
@@ -982,6 +1006,7 @@ Page({
     var that = this
     var Authorization = app.globalData.Authorization;
     var bank_info = that.data.bankInfo
+    var bank_info_2 = that.data.bankInfo_2
     wx.request({
       url: baseUrl + 'walletmgm/v1/bankinfos',
       method: "GET",
@@ -992,9 +1017,10 @@ Page({
       success: function(res) {
         console.log(res)
         bank_info.values = that.handleBankinfo(res.data.items)
-
+        bank_info_2.values = that.handleBankinfo(res.data.items)
         that.setData({
-          bankInfo: bank_info
+          bankInfo: bank_info,
+          bankInfo_2: bank_info_2
         })
         console.log("bankInfo", that.data.bankInfo)
       },
@@ -1257,27 +1283,50 @@ Page({
           } else if (this.data.loantypeData.selected.length < 1) {
             this.showToast('请选择贷款类型')
             return
-          } else if (!formdata.loan_contract_no || formdata.loan_contract_no.length < 1) {
-            this.showToast('请填写贷款合同编号')
-            return
-          } else if (this.data.bankInfo.selected.length < 1) {
-            this.showToast('请选择贷款银行')
-            return
-          } else if (this.data.firstpaybackDate.selected.length < 1) {
-            this.showToast('请选择首次还款日期')
-            return
-          } else if (!formdata.loan_months || formdata.loan_months.length < 1) {
-            this.showToast('请选择贷款期限')
-            return
+          } 
+          var loanType = this.data.loantypeData.selected 
+          if (loanType == "公积金贷款" || loanType == "组合贷款"){
+            if (!formdata.loan_contract_no || formdata.loan_contract_no.length < 1) {
+              this.showToast('请填写公积金贷款合同编号')
+              return
+            } else if (this.data.bankInfo.selected.length < 1) {
+              this.showToast('请选择公积金贷款银行')
+              return
+            } else if (this.data.firstpaybackDate.selected.length < 1) {
+              this.showToast('请选择首次还款日期')
+              return
+            } else if (!formdata.loan_months || formdata.loan_months.length < 1) {
+              this.showToast('请选择公积金贷款期限')
+              return
+            }
+            newdata.loan_bank = this.data.bankInfo.selected
+            newdata.loan_start = this.data.firstpaybackDate.datelong
+            newdata.loan_months = parseInt(formdata.loan_months)
+          } 
+          if (loanType == "商业贷款" || loanType == "组合贷款") {
+            if (!formdata.sec_loan_contract_no || formdata.sec_loan_contract_no.length < 1) {
+              this.showToast('请填写商业贷款合同编号')
+              return
+            } else if (this.data.bankInfo_2.selected.length < 1) {
+              this.showToast('请选择商业贷款银行')
+              return
+            } else if (this.data.firstpaybackDate_2.selected.length < 1) {
+              this.showToast('请选择首次还款日期')
+              return
+            } else if (!formdata.sec_loan_months || formdata.sec_loan_months.length < 1) {
+              this.showToast('请选择商业贷款期限')
+              return
+            }
+            newdata.sec_loan_bank = this.data.bankInfo_2.selected
+            newdata.sec_loan_start = this.data.firstpaybackDate_2.datelong
+            newdata.sec_loan_months = parseInt(formdata.sec_loan_months)
           }
-          newdata.loan_months = parseInt(formdata.loan_months)
           newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n'
           newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
           newdata.certification_type = this.data.identifytypeData.selected
 
           newdata.loan_type = this.data.loantypeData.selected
-          newdata.loan_bank = this.data.bankInfo.selected
-          newdata.loan_start = this.data.firstpaybackDate.datelong
+          
           // newdata.loan_datelong = this.data.loandatelongData.selected
           var request_loan_address = this.getLoanAddressRequest()
           newdata.house_address = request_loan_address
@@ -1442,6 +1491,31 @@ Page({
       this.dealIdInfo(idCardNo, e.currentTarget.id)
     }
   },
+  loan_input: function (e) {
+    console.log('-------', e.detail.value)
+    switch (e.currentTarget.id) {
+      case 'loan_contract_no':
+        this.setData({
+          loan_contract_no: e.detail.value
+        })
+        break;
+      case 'loan_months':
+        this.setData({
+          loan_months: e.detail.value
+        })
+        break;
+      case 'sec_loan_contract_no':
+        this.setData({
+          sec_loan_contract_no: e.detail.value
+        })
+        break;
+      case 'sec_loan_months':
+        this.setData({
+          sec_loan_months: e.detail.value
+        })
+        break;
+    }
+  },
   //根据身份证号码，获取相关信息
   dealIdInfo: function (idCardNum, idcard_belong) {
     var info = format.analyzeIDCard(idCardNum)
@@ -1757,6 +1831,14 @@ Page({
           firstpaybackDate: firstpayback_Date
         })
         break;
+      case 'payback_date_2':
+        var firstpayback_Date = this.data.firstpaybackDate_2
+        firstpayback_Date.selected = e.detail.value
+        firstpayback_Date.datelong = Date.parse(new Date(e.detail.value)) / 1000,
+          this.setData({
+            firstpaybackDate_2: firstpayback_Date
+          })
+        break;
       case 'loan_datelong':
         var loandatelong_Data = this.data.loandatelongData
         loandatelong_Data.selected = loandatelong_Data.values[e.detail.value]
@@ -1796,6 +1878,13 @@ Page({
           bankInfo: bank_data
         })
         break;
+      case 'bank_2':
+        var bank_data_2 = this.data.bankInfo_2
+        bank_data_2.selected = bank_data_2.values[e.detail.value]
+        this.setData({
+          bankInfo_2: bank_data_2
+        })
+        break;
       case 'house_locate':
         console.log('house_locate', e)
         var house_address = this.data.houseLocateInfo;

@@ -220,11 +220,13 @@
     <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
     <view style='padding:0 30rpx;'>
       <template is="picker_cell_normal" data="{{...loantypeData}}" />
+    </view>
+    <view style='padding:0 30rpx;' wx:if="{{loantypeData.selected != '商业贷款'}}">
       <view class='divide_line_30'></view>
       <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: right;color:#000;' placeholder='请输入贷款合同编号' name='loan_contract_no'></input>
+        <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='loan_contract_no' value='{{loan_contract_no}}' bindinput="loan_input"  id='loan_contract_no'></input>
       </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...bankInfo}}" />
@@ -234,11 +236,29 @@
       <!-- <template is="picker_cell_normal" data="{{...loandatelongData}}" /> -->
       <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: right;color:#000;' placeholder='请输入贷款月数' name='loan_months' type='number'></input>
+        <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='loan_months' value='{{loan_months}}' bindinput="loan_input"  id='loan_months' type='number'></input>
+      </view>
+    </view>
+    <view style='padding:0 30rpx;' wx:if="{{loantypeData.selected == '商业贷款' || loantypeData.selected == '组合贷款' }}">
+      <view class='divide_line_30'></view>
+      <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: right;color:#000;width:400rpx;' placeholder='请输入贷款合同编号' name='sec_loan_contract_no' value='{{sec_loan_contract_no}}' bindinput="loan_input"  id='sec_loan_contract_no' ></input>
+      </view>
+      <view class='divide_line_30'></view>
+      <template is="picker_cell_normal" data="{{...bankInfo_2}}" />
+      <view class='divide_line_30'></view>
+      <template is="picker_cell_normal" data="{{...firstpaybackDate_2}}" />
+      <view class='divide_line_30'></view>
+      <!-- <template is="picker_cell_normal" data="{{...loandatelongData}}" /> -->
+      <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: right;color:#000;' placeholder='请输入贷款月数' name='sec_loan_months' value='{{sec_loan_months}}' bindinput="loan_input"  id='sec_loan_months' type='number'></input>
       </view>
     </view>
-
   </view>
   <view wx:if="{{house_type=='house_fund_rent'}}">
 

@@ -10,7 +10,7 @@
 }
 
 .input_wrap {
-  width: 460rpx;
+  /* width: 460rpx; */
   height: 90rpx;
   font-size: 30rpx;
   color: #333;

@@ -67,7 +67,7 @@ page{
 }
 
 .input_wrap {
-  width: 480rpx;
+  /* width: 480rpx; */
   height: 90rpx;
   font-size: 28rpx;
   color: #000;