Merge branch 'dev_py' into dev2.0

@@ -827,82 +827,135 @@ Page({
       //   break;
       case "house_fund":
         var setData = {}
-        if (data.spouse_name && data.spouse_name.length) {
-          setData.spouse_name = data.spouse_name
-        }
-        if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
-          setData.spouse_id_card_no = data.spouse_id_card_no
-          this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
-        }
-        if (this.data.loverbirthDate.selected.length) {
-          var loverbirthDate = this.data.loverbirthDate
-          loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
-          loverbirthDate.datelong = data.spouse_birthday
-          setData.loverbirthDate = loverbirthDate
-        }
-        if (data.loan_type && data.loan_type.length) {
-          var loantypeData = this.data.loantypeData
-          loantypeData.selected = data.loan_type
-          setData.loantypeData = loantypeData
-        }
-        if (data.house_detail_address && data.house_detail_address.length) {
+
+        if (this.data.house_type == 'house_fund_rent'){
+          var workingcityInfo = this.data.workingcityInfo
+          workingcityInfo.requestdata = data.work_city
+          workingcityInfo.selected = data.work_city.province + data.work_city.city
+          workingcityInfo.address_value = [data.work_city.province, data.work_city.city, data.work_city.district]
+          workingcityInfo.address_code = [data.work_city.province_code, data.work_city.city_code, data.work_city.district_code]
+          setData.workingcityInfo = workingcityInfo
+          this.getCityLevel({
+            'province_code': workingcityInfo.address_code[0],
+            'province': workingcityInfo.address_value[0],
+            'city_code': workingcityInfo.address_code[1],
+            'city': workingcityInfo.address_value[1],
+            'district_code': workingcityInfo.address_code[2],
+            'district': workingcityInfo.address_value[2]
+          })
+          var leasetype_Data = this.data.leasetypeData
+          leasetype_Data.selected = data.owner_type
+          this.data.cardtypeData.hidden = data.owner_type == "企业"
+          setData.leasetypeData = leasetype_Data,
+          setData.cardtypeData = this.data.cardtypeData
+          setData.owner_name = data.owner_name
+          setData.owner_credit_no = data.owner_credit_no
+
+          if (data.house_address && data.house_address.province) {
+            var rentLocateInfo = this.data.rentLocateInfo
+            rentLocateInfo.requestdata = data.house_address
+            rentLocateInfo.selected = data.house_address.province + data.house_address.city + data.house_address.district
+            rentLocateInfo.address_value = [data.house_address.province, data.house_address.city, data.house_address.district]
+            rentLocateInfo.address_code = [data.house_address.province_code, data.house_address.city_code, data.house_address.district_code]
+            setData.rentLocateInfo = rentLocateInfo
+          }
           setData.house_detail_address = data.house_detail_address
-        }
-        if (data.certification_no && data.certification_no.length) {
-          setData.certification_no = data.certification_no
-        }
-        if (data.certification_type && data.certification_type.length) {
-          var identifytypeData = this.data.identifytypeData
-          identifytypeData.selected = data.certification_type
-          setData.identifytypeData = identifytypeData
-        }
-        if (data.loan_before_marry && data.loan_before_marry.length) {
-          var beforemarryData = this.data.beforemarryData
-          beforemarryData.selected = data.loan_before_marry
-          setData.beforemarryData = beforemarryData
-        }
-        if (data.loan_by_self && data.loan_by_self.length) {
-          var isselfData = this.data.isselfData
-          isselfData.selected = data.loan_by_self
-          setData.isselfData = isselfData
-        }
-        if (data.loan_contract_no && data.loan_contract_no.length) {
-          setData.loan_contract_no = data.loan_contract_no
-        }
-        if (data.rent_contract_no && data.rent_contract_no.length) {
           setData.rent_contract_no = data.rent_contract_no
-        }
-        if (data.rent_start && data.rent_start.length) {
+
           var leasestartDate = this.data.leasestartDate
           leasestartDate.selected = format.formatTime_date(data.rent_start)
           leasestartDate.datelong = data.rent_start
           setData.leasestartDate = leasestartDate
-        }
-        if (data.rent_end && data.rent_end.length) {
           var leaseendDate = this.data.leaseendDate
           leaseendDate.selected = format.formatTime_date(data.rent_end)
           leaseendDate.datelong = data.rent_end
           setData.leaseendDate = leaseendDate
-        }
-        if (data.work_city && data.work_city.province) {
-          var workingcityInfo = this.data.workingcityInfo
-          workingcityInfo.requestdata = data.work_city
-          workingcityInfo.selected = data.work_city.province + data.work_city.city
-          setData.workingcityInfo = workingcityInfo
-        }
-        if (this.data.house_type == 'house_fund_loan' && data.house_address && data.house_address.province) {
-          var houseLocateInfo = this.data.houseLocateInfo
-          houseLocateInfo.requestdata = data.house_address
-          houseLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
-          setData.houseLocateInfo = houseLocateInfo
-        }
-        if (this.data.house_type == 'house_fund_rent' && data.house_address && data.house_address.province) {
-          var rentLocateInfo = this.data.rentLocateInfo
-          rentLocateInfo.requestdata = data.house_address
-          rentLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
-          setData.rentLocateInfo = rentLocateInfo
-        }
+          setData.owner_id_card_no = data.owner_id_card_no
 
+        } else if (this.data.house_type == 'house_fund_loan'){
+          
+          // if (data.spouse_name && data.spouse_name.length) {
+          //   setData.spouse_name = data.spouse_name
+          // }
+          // if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
+          //   setData.spouse_id_card_no = data.spouse_id_card_no
+          //   this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
+          // }
+          // if (this.data.loverbirthDate.selected.length) {
+          //   var loverbirthDate = this.data.loverbirthDate
+          //   loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
+          //   loverbirthDate.datelong = data.spouse_birthday
+          //   setData.loverbirthDate = loverbirthDate
+          // }
+          if (data.house_address && data.house_address.province) {
+            var houseLocateInfo = this.data.houseLocateInfo
+            houseLocateInfo.requestdata = data.house_address
+            houseLocateInfo.selected = data.house_address.province + data.house_address.city + data.house_address.district
+            houseLocateInfo.address_value = [data.house_address.province, data.house_address.city, data.house_address.district]
+            houseLocateInfo.address_code = [data.house_address.province_code, data.house_address.city_code, data.house_address.district_code]
+            setData.houseLocateInfo = houseLocateInfo
+          }
+          if (data.house_detail_address && data.house_detail_address.length) {
+            setData.house_detail_address = data.house_detail_address
+          }
+          if (data.certification_type && data.certification_type.length) {
+            var identifytypeData = this.data.identifytypeData
+            identifytypeData.selected = data.certification_type
+            setData.identifytypeData = identifytypeData
+          }
+          if (data.certification_no && data.certification_no.length) {
+            setData.certification_no = data.certification_no
+          }
+          if (data.loan_before_marry && data.loan_before_marry.length) {
+            var beforemarryData = this.data.beforemarryData
+            beforemarryData.selected = data.loan_before_marry=='y'?'是':'否'
+            setData.beforemarryData = beforemarryData
+          }
+          if (data.loan_by_self && data.loan_by_self.length) {
+            var isselfData = this.data.isselfData
+            isselfData.selected = data.loan_by_self == 'y' ? '是' : '否'
+            setData.isselfData = isselfData
+          }
+
+          if (data.loan_type && data.loan_type.length) {
+            var loantypeData = this.data.loantypeData
+            loantypeData.selected = data.loan_type
+            setData.loantypeData = loantypeData
+          }
+          if (data.loan_contract_no && data.loan_contract_no.length) {
+            setData.loan_contract_no = data.loan_contract_no
+          }
+          if (data.loan_bank && data.loan_bank.length) {
+            var bank_data = this.data.bankInfo
+            bank_data.selected = data.loan_bank
+            setData.bankInfo = bank_data
+          }
+          var firstpayback_Date = this.data.firstpaybackDate
+          firstpayback_Date.selected = format.formatTime_date(data.loan_start)
+            firstpayback_Date.datelong = data.loan_start 
+          setData.firstpaybackDate = firstpayback_Date
+          if (data.loan_months>0){
+            setData.loan_months = data.loan_months
+          }
+          if (data.sec_loan_contract_no && data.sec_loan_contract_no.length) {
+            setData.sec_loan_contract_no = data.sec_loan_contract_no
+          }
+          if (data.sec_loan_bank && data.sec_loan_bank.length) {
+            var bank_data = this.data.bankInfo_2
+            bank_data.selected = data.sec_loan_bank
+            setData.bankInfo_2 = bank_data
+          }
+          var firstpaybackDate_2 = this.data.firstpaybackDate_2
+          firstpaybackDate_2.selected = format.formatTime_date(data.sec_loan_start)
+          firstpaybackDate_2.datelong = data.sec_loan_start
+          setData.firstpaybackDate_2 = firstpaybackDate_2
+          if (data.sec_loan_months > 0) {
+            setData.sec_loan_months = data.sec_loan_months
+          }
+          if (data.rent_contract_no && data.rent_contract_no.length) {
+            setData.rent_contract_no = data.rent_contract_no
+          }
+        }
         this.setData(setData)
         break;
     }

@@ -203,7 +203,7 @@
       <template is="picker_cell_normal" data="{{...houseLocateInfo}}" />
       <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <input class='input_wrap02 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入详细地址，精确到楼牌号' name='house_detail_address'></input>
+        <input class='input_wrap02 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入详细地址，精确到楼牌号' name='house_detail_address' value='{{house_detail_address}}'></input>
       </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...identifytypeData}}" />
@@ -211,7 +211,7 @@
       <view style='height:90rpx'>
         <text class='red_star_right_10'>*</text>
         <text class='text_777_30 float_left'>证书号码</text>
-        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证书号码' name='certification_no'></input>
+        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证书号码' name='certification_no' value='{{certification_no}}'></input>
       </view>
       <view class='divide_line_30'></view>
 
@@ -274,13 +274,13 @@
       <view style='height:90rpx'>
         <text class='red_star_right_10'>*</text>
         <text class='text_777_30 float_left'>出租方名称</text>
-        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入出租方名称' name='owner_name'></input>
+        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入出租方名称' name='owner_name' value='{{owner_name}}'></input>
       </view>
       <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>
+        <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' value='{{owner_credit_no}}'></input>
       </view>
       <view class='divide_line_30'  hidden="{{leasetypeData.selected == '企业'}}"></view>
       <template is="picker_cell_normal" data="{{...cardtypeData}}"/>
@@ -299,13 +299,13 @@
       <template is="picker_cell_normal" data="{{...rentLocateInfo}}" />
       <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <input class='input_wrap02 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: rightcolor:#000;' placeholder='请输入详细地址，精确到楼牌号' name='house_detail_address'></input>
+        <input class='input_wrap02 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: rightcolor:#000;' placeholder='请输入详细地址，精确到楼牌号' name='house_detail_address' value='{{house_detail_address}}'></input>
       </view>
       <view class='divide_line_30'></view>
       <view style='height:90rpx'>
         <!-- <text class='red_star_right_10'>*</text> -->
         <text class='text_777_30 float_left head_in'>租赁合同编号</text>
-        <input class='input_wrap' 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' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: rightcolor:#000;' placeholder='请输入合同编号' name='rent_contract_no' value='{{rent_contract_no}}'></input>
       </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...leasestartDate}}" />