字段又变

@@ -466,7 +466,7 @@ Page({
     this.legal_entity = frontPage.data.legal_entity
     this.legal_entity = frontPage.data.legal_entity
 
 
     var reduce_typeData = this.data.reducetypeData
     var reduce_typeData = this.data.reducetypeData
-    var deduction_amount
+    var deduction_amount, house_type=''
     if (options.reducetype == '月度') {
     if (options.reducetype == '月度') {
       reduce_typeData.selected = '月度'
       reduce_typeData.selected = '月度'
       deduction_amount = Deduce_amounts_month[nameKey]? Deduce_amounts_month[nameKey]:0
       deduction_amount = Deduce_amounts_month[nameKey]? Deduce_amounts_month[nameKey]:0
@@ -496,8 +496,9 @@ Page({
         cardtypeData: cardtype_data,
         cardtypeData: cardtype_data,
         commonbirthDate: commonbirth_date
         commonbirthDate: commonbirth_date
       })
       })
-    } else if (frontPage.data.house_type == "rent") { 
+    } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
       this.getbanklist()
       this.getbanklist()
+      house_type = "house_fund_rent"
       if (options.reducetype == '月度') {
       if (options.reducetype == '月度') {
         reduce_typeData.selected = '月度'
         reduce_typeData.selected = '月度'
         deduction_amount = Deduce_amounts_month["house_fund_rent"]
         deduction_amount = Deduce_amounts_month["house_fund_rent"]
@@ -507,6 +508,7 @@ Page({
       }
       }
     } else if (frontPage.data.house_type == "house_fund_loan") {
     } else if (frontPage.data.house_type == "house_fund_loan") {
       this.getbanklist()
       this.getbanklist()
+      house_type = "house_fund_loan"
       if (options.reducetype == '月度') {
       if (options.reducetype == '月度') {
         reduce_typeData.selected = '月度'
         reduce_typeData.selected = '月度'
         deduction_amount = Deduce_amounts_month["house_fund_loan"]
         deduction_amount = Deduce_amounts_month["house_fund_loan"]
@@ -520,7 +522,7 @@ Page({
     this.setData({
     this.setData({
       title: title,
       title: title,
       cur_index: nameKey,
       cur_index: nameKey,
-      house_type: frontPage.data.house_type,
+      house_type: house_type,
       reducetypeData: reduce_typeData,
       reducetypeData: reduce_typeData,
       deduction_amount: deduction_amount
       deduction_amount: deduction_amount
     })
     })
@@ -775,7 +777,7 @@ Page({
           houseLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
           houseLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
           setData.houseLocateInfo = houseLocateInfo
           setData.houseLocateInfo = houseLocateInfo
         }
         }
-        if (this.data.house_type == 'rent' && data.house_address && data.house_address.province) {
+        if (this.data.house_type == 'house_fund_rent' && data.house_address && data.house_address.province) {
           var rentLocateInfo = this.data.rentLocateInfo
           var rentLocateInfo = this.data.rentLocateInfo
           rentLocateInfo.requestdata = data.house_address
           rentLocateInfo.requestdata = data.house_address
           rentLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
           rentLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
@@ -1190,7 +1192,7 @@ Page({
           var request_loan_address = this.getLoanAddressRequest()
           var request_loan_address = this.getLoanAddressRequest()
           newdata.house_address = request_loan_address
           newdata.house_address = request_loan_address
 
 
-        } else if (this.data.house_type == "rent") {
+        } else if (this.data.house_type == "house_fund_rent") {
           newdata.type = 'rent'
           newdata.type = 'rent'
           console.log('workingcityInfo', this.data.workingcityInfo.address_value)
           console.log('workingcityInfo', this.data.workingcityInfo.address_value)
           if (this.data.workingcityInfo.address_value[0].length < 1) {
           if (this.data.workingcityInfo.address_value[0].length < 1) {
@@ -1520,10 +1522,8 @@ Page({
         var reduce_typeData = this.data.reducetypeData
         var reduce_typeData = this.data.reducetypeData
         var deduction_amount
         var deduction_amount
         var key = this.data.cur_index
         var key = this.data.cur_index
-        if (this.data.house_type == 'rent') {
-          key = 'house_fund_rent'
-        } else if (this.data.house_type == "house_fund_loan") {
-          key = 'house_fund_loan'
+        if (this.data.house_type.length) {
+          key = this.data.house_type
         }
         }
         if (e.detail.value == '0') {
         if (e.detail.value == '0') {
           deduction_amount = Deduce_amounts_month[key]
           deduction_amount = Deduce_amounts_month[key]

@@ -242,7 +242,7 @@
     </view>
     </view>
 
 
   </view>
   </view>
-  <view wx:if="{{house_type=='rent'}}">
+  <view wx:if="{{house_type=='house_fund_rent'}}">
 
 
     <view style='padding:0 30rpx;'>
     <view style='padding:0 30rpx;'>
       <template is="picker_cell_normal" data="{{...workingcityInfo}}" />
       <template is="picker_cell_normal" data="{{...workingcityInfo}}" />