正在显示
2 个修改的文件
包含
10 行增加
和
10 行删除
| ... | ... | @@ -466,7 +466,7 @@ Page({ |
| 466 | 466 | this.legal_entity = frontPage.data.legal_entity |
| 467 | 467 | |
| 468 | 468 | var reduce_typeData = this.data.reducetypeData |
| 469 | - var deduction_amount | |
| 469 | + var deduction_amount, house_type='' | |
| 470 | 470 | if (options.reducetype == '月度') { |
| 471 | 471 | reduce_typeData.selected = '月度' |
| 472 | 472 | deduction_amount = Deduce_amounts_month[nameKey]? Deduce_amounts_month[nameKey]:0 |
| ... | ... | @@ -496,8 +496,9 @@ Page({ |
| 496 | 496 | cardtypeData: cardtype_data, |
| 497 | 497 | commonbirthDate: commonbirth_date |
| 498 | 498 | }) |
| 499 | - } else if (frontPage.data.house_type == "rent") { | |
| 499 | + } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { | |
| 500 | 500 | this.getbanklist() |
| 501 | + house_type = "house_fund_rent" | |
| 501 | 502 | if (options.reducetype == '月度') { |
| 502 | 503 | reduce_typeData.selected = '月度' |
| 503 | 504 | deduction_amount = Deduce_amounts_month["house_fund_rent"] |
| ... | ... | @@ -507,6 +508,7 @@ Page({ |
| 507 | 508 | } |
| 508 | 509 | } else if (frontPage.data.house_type == "house_fund_loan") { |
| 509 | 510 | this.getbanklist() |
| 511 | + house_type = "house_fund_loan" | |
| 510 | 512 | if (options.reducetype == '月度') { |
| 511 | 513 | reduce_typeData.selected = '月度' |
| 512 | 514 | deduction_amount = Deduce_amounts_month["house_fund_loan"] |
| ... | ... | @@ -520,7 +522,7 @@ Page({ |
| 520 | 522 | this.setData({ |
| 521 | 523 | title: title, |
| 522 | 524 | cur_index: nameKey, |
| 523 | - house_type: frontPage.data.house_type, | |
| 525 | + house_type: house_type, | |
| 524 | 526 | reducetypeData: reduce_typeData, |
| 525 | 527 | deduction_amount: deduction_amount |
| 526 | 528 | }) |
| ... | ... | @@ -775,7 +777,7 @@ Page({ |
| 775 | 777 | houseLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district |
| 776 | 778 | setData.houseLocateInfo = houseLocateInfo |
| 777 | 779 | } |
| 778 | - if (this.data.house_type == 'rent' && data.house_address && data.house_address.province) { | |
| 780 | + if (this.data.house_type == 'house_fund_rent' && data.house_address && data.house_address.province) { | |
| 779 | 781 | var rentLocateInfo = this.data.rentLocateInfo |
| 780 | 782 | rentLocateInfo.requestdata = data.house_address |
| 781 | 783 | rentLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district |
| ... | ... | @@ -1190,7 +1192,7 @@ Page({ |
| 1190 | 1192 | var request_loan_address = this.getLoanAddressRequest() |
| 1191 | 1193 | newdata.house_address = request_loan_address |
| 1192 | 1194 | |
| 1193 | - } else if (this.data.house_type == "rent") { | |
| 1195 | + } else if (this.data.house_type == "house_fund_rent") { | |
| 1194 | 1196 | newdata.type = 'rent' |
| 1195 | 1197 | console.log('workingcityInfo', this.data.workingcityInfo.address_value) |
| 1196 | 1198 | if (this.data.workingcityInfo.address_value[0].length < 1) { |
| ... | ... | @@ -1520,10 +1522,8 @@ Page({ |
| 1520 | 1522 | var reduce_typeData = this.data.reducetypeData |
| 1521 | 1523 | var deduction_amount |
| 1522 | 1524 | var key = this.data.cur_index |
| 1523 | - if (this.data.house_type == 'rent') { | |
| 1524 | - key = 'house_fund_rent' | |
| 1525 | - } else if (this.data.house_type == "house_fund_loan") { | |
| 1526 | - key = 'house_fund_loan' | |
| 1525 | + if (this.data.house_type.length) { | |
| 1526 | + key = this.data.house_type | |
| 1527 | 1527 | } |
| 1528 | 1528 | if (e.detail.value == '0') { |
| 1529 | 1529 | deduction_amount = Deduce_amounts_month[key] | ... | ... |
请
注册
或
登录
后发表评论