提交 54c8b834dcf8db998182091be2b81700935b9deb

作者 pangy
2 个父辈 f962c13b e954e929

Merge branch 'dev_py' into dev2.0

@@ -827,82 +827,135 @@ Page({ @@ -827,82 +827,135 @@ Page({
827 // break; 827 // break;
828 case "house_fund": 828 case "house_fund":
829 var setData = {} 829 var setData = {}
830 - if (data.spouse_name && data.spouse_name.length) {  
831 - setData.spouse_name = data.spouse_name  
832 - }  
833 - if (data.spouse_id_card_no && data.spouse_id_card_no.length) {  
834 - setData.spouse_id_card_no = data.spouse_id_card_no  
835 - this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')  
836 - }  
837 - if (this.data.loverbirthDate.selected.length) {  
838 - var loverbirthDate = this.data.loverbirthDate  
839 - loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)  
840 - loverbirthDate.datelong = data.spouse_birthday  
841 - setData.loverbirthDate = loverbirthDate  
842 - }  
843 - if (data.loan_type && data.loan_type.length) {  
844 - var loantypeData = this.data.loantypeData  
845 - loantypeData.selected = data.loan_type  
846 - setData.loantypeData = loantypeData  
847 - }  
848 - if (data.house_detail_address && data.house_detail_address.length) { 830 +
  831 + if (this.data.house_type == 'house_fund_rent'){
  832 + var workingcityInfo = this.data.workingcityInfo
  833 + workingcityInfo.requestdata = data.work_city
  834 + workingcityInfo.selected = data.work_city.province + data.work_city.city
  835 + workingcityInfo.address_value = [data.work_city.province, data.work_city.city, data.work_city.district]
  836 + workingcityInfo.address_code = [data.work_city.province_code, data.work_city.city_code, data.work_city.district_code]
  837 + setData.workingcityInfo = workingcityInfo
  838 + this.getCityLevel({
  839 + 'province_code': workingcityInfo.address_code[0],
  840 + 'province': workingcityInfo.address_value[0],
  841 + 'city_code': workingcityInfo.address_code[1],
  842 + 'city': workingcityInfo.address_value[1],
  843 + 'district_code': workingcityInfo.address_code[2],
  844 + 'district': workingcityInfo.address_value[2]
  845 + })
  846 + var leasetype_Data = this.data.leasetypeData
  847 + leasetype_Data.selected = data.owner_type
  848 + this.data.cardtypeData.hidden = data.owner_type == "企业"
  849 + setData.leasetypeData = leasetype_Data,
  850 + setData.cardtypeData = this.data.cardtypeData
  851 + setData.owner_name = data.owner_name
  852 + setData.owner_credit_no = data.owner_credit_no
  853 +
  854 + if (data.house_address && data.house_address.province) {
  855 + var rentLocateInfo = this.data.rentLocateInfo
  856 + rentLocateInfo.requestdata = data.house_address
  857 + rentLocateInfo.selected = data.house_address.province + data.house_address.city + data.house_address.district
  858 + rentLocateInfo.address_value = [data.house_address.province, data.house_address.city, data.house_address.district]
  859 + rentLocateInfo.address_code = [data.house_address.province_code, data.house_address.city_code, data.house_address.district_code]
  860 + setData.rentLocateInfo = rentLocateInfo
  861 + }
849 setData.house_detail_address = data.house_detail_address 862 setData.house_detail_address = data.house_detail_address
850 - }  
851 - if (data.certification_no && data.certification_no.length) {  
852 - setData.certification_no = data.certification_no  
853 - }  
854 - if (data.certification_type && data.certification_type.length) {  
855 - var identifytypeData = this.data.identifytypeData  
856 - identifytypeData.selected = data.certification_type  
857 - setData.identifytypeData = identifytypeData  
858 - }  
859 - if (data.loan_before_marry && data.loan_before_marry.length) {  
860 - var beforemarryData = this.data.beforemarryData  
861 - beforemarryData.selected = data.loan_before_marry  
862 - setData.beforemarryData = beforemarryData  
863 - }  
864 - if (data.loan_by_self && data.loan_by_self.length) {  
865 - var isselfData = this.data.isselfData  
866 - isselfData.selected = data.loan_by_self  
867 - setData.isselfData = isselfData  
868 - }  
869 - if (data.loan_contract_no && data.loan_contract_no.length) {  
870 - setData.loan_contract_no = data.loan_contract_no  
871 - }  
872 - if (data.rent_contract_no && data.rent_contract_no.length) {  
873 setData.rent_contract_no = data.rent_contract_no 863 setData.rent_contract_no = data.rent_contract_no
874 - }  
875 - if (data.rent_start && data.rent_start.length) { 864 +
876 var leasestartDate = this.data.leasestartDate 865 var leasestartDate = this.data.leasestartDate
877 leasestartDate.selected = format.formatTime_date(data.rent_start) 866 leasestartDate.selected = format.formatTime_date(data.rent_start)
878 leasestartDate.datelong = data.rent_start 867 leasestartDate.datelong = data.rent_start
879 setData.leasestartDate = leasestartDate 868 setData.leasestartDate = leasestartDate
880 - }  
881 - if (data.rent_end && data.rent_end.length) {  
882 var leaseendDate = this.data.leaseendDate 869 var leaseendDate = this.data.leaseendDate
883 leaseendDate.selected = format.formatTime_date(data.rent_end) 870 leaseendDate.selected = format.formatTime_date(data.rent_end)
884 leaseendDate.datelong = data.rent_end 871 leaseendDate.datelong = data.rent_end
885 setData.leaseendDate = leaseendDate 872 setData.leaseendDate = leaseendDate
886 - }  
887 - if (data.work_city && data.work_city.province) {  
888 - var workingcityInfo = this.data.workingcityInfo  
889 - workingcityInfo.requestdata = data.work_city  
890 - workingcityInfo.selected = data.work_city.province + data.work_city.city  
891 - setData.workingcityInfo = workingcityInfo  
892 - }  
893 - if (this.data.house_type == 'house_fund_loan' && data.house_address && data.house_address.province) {  
894 - var houseLocateInfo = this.data.houseLocateInfo  
895 - houseLocateInfo.requestdata = data.house_address  
896 - houseLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district  
897 - setData.houseLocateInfo = houseLocateInfo  
898 - }  
899 - if (this.data.house_type == 'house_fund_rent' && data.house_address && data.house_address.province) {  
900 - var rentLocateInfo = this.data.rentLocateInfo  
901 - rentLocateInfo.requestdata = data.house_address  
902 - rentLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district  
903 - setData.rentLocateInfo = rentLocateInfo  
904 - } 873 + setData.owner_id_card_no = data.owner_id_card_no
905 874
  875 + } else if (this.data.house_type == 'house_fund_loan'){
  876 +
  877 + // if (data.spouse_name && data.spouse_name.length) {
  878 + // setData.spouse_name = data.spouse_name
  879 + // }
  880 + // if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
  881 + // setData.spouse_id_card_no = data.spouse_id_card_no
  882 + // this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
  883 + // }
  884 + // if (this.data.loverbirthDate.selected.length) {
  885 + // var loverbirthDate = this.data.loverbirthDate
  886 + // loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
  887 + // loverbirthDate.datelong = data.spouse_birthday
  888 + // setData.loverbirthDate = loverbirthDate
  889 + // }
  890 + if (data.house_address && data.house_address.province) {
  891 + var houseLocateInfo = this.data.houseLocateInfo
  892 + houseLocateInfo.requestdata = data.house_address
  893 + houseLocateInfo.selected = data.house_address.province + data.house_address.city + data.house_address.district
  894 + houseLocateInfo.address_value = [data.house_address.province, data.house_address.city, data.house_address.district]
  895 + houseLocateInfo.address_code = [data.house_address.province_code, data.house_address.city_code, data.house_address.district_code]
  896 + setData.houseLocateInfo = houseLocateInfo
  897 + }
  898 + if (data.house_detail_address && data.house_detail_address.length) {
  899 + setData.house_detail_address = data.house_detail_address
  900 + }
  901 + if (data.certification_type && data.certification_type.length) {
  902 + var identifytypeData = this.data.identifytypeData
  903 + identifytypeData.selected = data.certification_type
  904 + setData.identifytypeData = identifytypeData
  905 + }
  906 + if (data.certification_no && data.certification_no.length) {
  907 + setData.certification_no = data.certification_no
  908 + }
  909 + if (data.loan_before_marry && data.loan_before_marry.length) {
  910 + var beforemarryData = this.data.beforemarryData
  911 + beforemarryData.selected = data.loan_before_marry=='y'?'是':'否'
  912 + setData.beforemarryData = beforemarryData
  913 + }
  914 + if (data.loan_by_self && data.loan_by_self.length) {
  915 + var isselfData = this.data.isselfData
  916 + isselfData.selected = data.loan_by_self == 'y' ? '是' : '否'
  917 + setData.isselfData = isselfData
  918 + }
  919 +
  920 + if (data.loan_type && data.loan_type.length) {
  921 + var loantypeData = this.data.loantypeData
  922 + loantypeData.selected = data.loan_type
  923 + setData.loantypeData = loantypeData
  924 + }
  925 + if (data.loan_contract_no && data.loan_contract_no.length) {
  926 + setData.loan_contract_no = data.loan_contract_no
  927 + }
  928 + if (data.loan_bank && data.loan_bank.length) {
  929 + var bank_data = this.data.bankInfo
  930 + bank_data.selected = data.loan_bank
  931 + setData.bankInfo = bank_data
  932 + }
  933 + var firstpayback_Date = this.data.firstpaybackDate
  934 + firstpayback_Date.selected = format.formatTime_date(data.loan_start)
  935 + firstpayback_Date.datelong = data.loan_start
  936 + setData.firstpaybackDate = firstpayback_Date
  937 + if (data.loan_months>0){
  938 + setData.loan_months = data.loan_months
  939 + }
  940 + if (data.sec_loan_contract_no && data.sec_loan_contract_no.length) {
  941 + setData.sec_loan_contract_no = data.sec_loan_contract_no
  942 + }
  943 + if (data.sec_loan_bank && data.sec_loan_bank.length) {
  944 + var bank_data = this.data.bankInfo_2
  945 + bank_data.selected = data.sec_loan_bank
  946 + setData.bankInfo_2 = bank_data
  947 + }
  948 + var firstpaybackDate_2 = this.data.firstpaybackDate_2
  949 + firstpaybackDate_2.selected = format.formatTime_date(data.sec_loan_start)
  950 + firstpaybackDate_2.datelong = data.sec_loan_start
  951 + setData.firstpaybackDate_2 = firstpaybackDate_2
  952 + if (data.sec_loan_months > 0) {
  953 + setData.sec_loan_months = data.sec_loan_months
  954 + }
  955 + if (data.rent_contract_no && data.rent_contract_no.length) {
  956 + setData.rent_contract_no = data.rent_contract_no
  957 + }
  958 + }
906 this.setData(setData) 959 this.setData(setData)
907 break; 960 break;
908 } 961 }
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 <template is="picker_cell_normal" data="{{...houseLocateInfo}}" /> 203 <template is="picker_cell_normal" data="{{...houseLocateInfo}}" />
204 <view class='divide_line_30'></view> 204 <view class='divide_line_30'></view>
205 <view style='height:90rpx'> 205 <view style='height:90rpx'>
206 - <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> 206 + <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>
207 </view> 207 </view>
208 <view class='divide_line_30'></view> 208 <view class='divide_line_30'></view>
209 <template is="picker_cell_normal" data="{{...identifytypeData}}" /> 209 <template is="picker_cell_normal" data="{{...identifytypeData}}" />
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
211 <view style='height:90rpx'> 211 <view style='height:90rpx'>
212 <text class='red_star_right_10'>*</text> 212 <text class='red_star_right_10'>*</text>
213 <text class='text_777_30 float_left'>证书号码</text> 213 <text class='text_777_30 float_left'>证书号码</text>
214 - <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> 214 + <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>
215 </view> 215 </view>
216 <view class='divide_line_30'></view> 216 <view class='divide_line_30'></view>
217 217
@@ -274,13 +274,13 @@ @@ -274,13 +274,13 @@
274 <view style='height:90rpx'> 274 <view style='height:90rpx'>
275 <text class='red_star_right_10'>*</text> 275 <text class='red_star_right_10'>*</text>
276 <text class='text_777_30 float_left'>出租方名称</text> 276 <text class='text_777_30 float_left'>出租方名称</text>
277 - <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> 277 + <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>
278 </view> 278 </view>
279 <view class='divide_line_30' hidden="{{leasetypeData.selected == '个人'}}"></view> 279 <view class='divide_line_30' hidden="{{leasetypeData.selected == '个人'}}"></view>
280 <view style='height:90rpx' hidden="{{leasetypeData.selected == '个人'}}"> 280 <view style='height:90rpx' hidden="{{leasetypeData.selected == '个人'}}">
281 <text class='red_star_right_10'>*</text> 281 <text class='red_star_right_10'>*</text>
282 <text class='text_777_30 float_left'>统一社会信用代码</text> 282 <text class='text_777_30 float_left'>统一社会信用代码</text>
283 - <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> 283 + <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>
284 </view> 284 </view>
285 <view class='divide_line_30' hidden="{{leasetypeData.selected == '企业'}}"></view> 285 <view class='divide_line_30' hidden="{{leasetypeData.selected == '企业'}}"></view>
286 <template is="picker_cell_normal" data="{{...cardtypeData}}"/> 286 <template is="picker_cell_normal" data="{{...cardtypeData}}"/>
@@ -299,13 +299,13 @@ @@ -299,13 +299,13 @@
299 <template is="picker_cell_normal" data="{{...rentLocateInfo}}" /> 299 <template is="picker_cell_normal" data="{{...rentLocateInfo}}" />
300 <view class='divide_line_30'></view> 300 <view class='divide_line_30'></view>
301 <view style='height:90rpx'> 301 <view style='height:90rpx'>
302 - <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> 302 + <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>
303 </view> 303 </view>
304 <view class='divide_line_30'></view> 304 <view class='divide_line_30'></view>
305 <view style='height:90rpx'> 305 <view style='height:90rpx'>
306 <!-- <text class='red_star_right_10'>*</text> --> 306 <!-- <text class='red_star_right_10'>*</text> -->
307 <text class='text_777_30 float_left head_in'>租赁合同编号</text> 307 <text class='text_777_30 float_left head_in'>租赁合同编号</text>
308 - <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> 308 + <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>
309 </view> 309 </view>
310 <view class='divide_line_30'></view> 310 <view class='divide_line_30'></view>
311 <template is="picker_cell_normal" data="{{...leasestartDate}}" /> 311 <template is="picker_cell_normal" data="{{...leasestartDate}}" />
注册登录 后发表评论