新增改动

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @d367af1
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @d367af1
@@ -252,7 +252,7 @@ Page({
       onChange: 'onPickerSelect',
     },
     beforemarryData: {
-      label: '是否首套婚前贷款且婚后各自扣除',
+      label: '是否首套婚前贷款且婚后分别扣除50%',
       bindtype: 'before_marry',
       selected: '',
       isrequre: true,
@@ -377,9 +377,9 @@ Page({
       label: '房屋坐落地址',
       mode: 'region',
       maxWidth: 430,
-      isrequre: true,
+      // isrequre: true,
       bindtype: 'house_locate',
-      isblack: 'true',
+      // isblack: 'true',
       address_code: ['', '', ''],
       address_value: ['', '', ''],
       selected: '',
@@ -390,10 +390,10 @@ Page({
     rentLocateInfo: {
       label: '租赁房屋坐落地址',
       mode: 'region',
-      isrequre: true,
+      // isrequre: true,
       maxWidth: 375,
       bindtype: 'rent_house_locate',
-      isblack: 'true',
+      // isblack: 'true',
       address_code: ['', '', ''],
       address_value: ['', '', ''],
       selected: '',
@@ -1301,10 +1301,11 @@ Page({
         if (this.data.house_type == "house_fund_loan") {
           newdata.type = 'loan'
-          if (this.data.houseLocateInfo.address_value[0].length < 1) {
-            this.showToast('请选择住房地址')
-            return
-          } else if (!formdata.house_detail_address || formdata.house_detail_address.length < 1) {
+          // if (this.data.houseLocateInfo.address_value[0].length < 1) {
+          //   this.showToast('请选择住房地址')
+          //   return
+          // } else 
+          if (!formdata.house_detail_address || formdata.house_detail_address.length < 1) {
             this.showToast('请填写房屋详细地址')
             return
           }if (this.data.identifytypeData.selected.length < 1) {
@@ -1399,16 +1400,18 @@ Page({
             } 
             newdata.owner_id_card_type = '1'//this.data.cardtypeData.selected
           }
-          if (this.data.rentLocateInfo.address_value[0].length < 1) {
-            this.showToast('请选择房屋地址')
-            return
-          } 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) {
+          // if (this.data.rentLocateInfo.address_value[0].length < 1) {
+          //   this.showToast('请选择房屋地址')
+          //   return
+          // } 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) {
             this.showToast('请选择租赁起始日期')
             return
           }
@@ -2007,6 +2010,14 @@ Page({
         }
         work_address.address_value = e.detail.value
         work_address.address_code = e.detail.code
+        this.getCityLevel({
+          'province_code': e.detail.code[0],
+          'province': e.detail.value[0],
+          'city_code': e.detail.code[1],
+          'city': e.detail.value[1],
+          'district_code': e.detail.code[2],
+          'district': e.detail.value[2]
+        })
         this.setData({
           workAddress_haschanged: true,
           workingcityInfo: work_address
@@ -2023,14 +2034,14 @@ Page({
         }
         rent_address.address_value = e.detail.value
         rent_address.address_code = e.detail.code
-        this.getCityLevel({
-          'province_code': e.detail.code[0] ,
-          'province': e.detail.value[0],
-          'city_code': e.detail.code[1] ,
-          'city': e.detail.value[1],
-          'district_code': e.detail.code[2] ,
-          'district': e.detail.value[2]
-        })
+        // this.getCityLevel({
+        //   'province_code': e.detail.code[0] ,
+        //   'province': e.detail.value[0],
+        //   'city_code': e.detail.code[1] ,
+        //   'city': e.detail.value[1],
+        //   'district_code': e.detail.code[2] ,
+        //   'district': e.detail.value[2]
+        // })
         this.setData({
           rentAddress_haschanged: true,
           rentLocateInfo: rent_address
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @d367af1
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @d367af1
@@ -303,8 +303,8 @@
       </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'>租赁合同编号</text>
+        <!-- <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>
       </view>
       <view class='divide_line_30'></view>