扣除金额逻辑修改

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @be06c71
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @be06c71
@@ -17,7 +17,7 @@ const Deduce_amounts_month = {
   'support_duty': 2000,
   'medical_fund': 0,
   'house_fund_rent': 1000,
-  "house_fund_loan":1200
+  "house_fund_loan":1000
 }
 const Deduce_amounts_year = {
   'children_education': 12000,
@@ -26,7 +26,7 @@ const Deduce_amounts_year = {
   'support_duty': 24000,
   'medical_fund': 0,
   'house_fund_rent': 12000,
-  "house_fund_loan":14400
+  "house_fund_loan": 12000
 }
 Page({
@@ -268,6 +268,7 @@ Page({
     reducetypeData: {
       label: '扣除方式',
       isrequre: false,
+      disabled: true,
       bindtype: 'reduce_type',
       selected: '',
       values: ["月度", "年度"],
@@ -484,10 +485,10 @@ Page({
     var deduction_amount, house_type=''
     if (options.reducetype == '月度') {
       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
     } else {
-      deduction_amount = Deduce_amounts_year[nameKey]? Deduce_amounts_year[nameKey]:0
       reduce_typeData.selected = '年度'
+      //   deduction_amount = Deduce_amounts_year[nameKey] ? Deduce_amounts_year[nameKey] : 0
     }
     if ("children_education" == options.status) {
       this.loadCountry()
@@ -517,15 +518,18 @@ Page({
       this.supporttype = frontPage.data.issinglechildData.selected == '是' ? 'D' : 'S',//是否独生
       this.is_single = frontPage.data.issinglechildData.selected == '是' ? 'y' : 'n',//是否独生
       this.share_method = frontPage.data.shareMethodData.selected
+      this.setData({
+        deduction_amount: deduction_amount
+      })
     } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
       this.getbanklist()
       house_type = "house_fund_rent"
       title = '住房租金'
       if (options.reducetype == '月度') {
         reduce_typeData.selected = '月度'
-        deduction_amount = Deduce_amounts_month["house_fund_rent"]
+        // deduction_amount = Deduce_amounts_month["house_fund_rent"]
       } else {
-        deduction_amount = Deduce_amounts_year["house_fund_rent"]
+        // deduction_amount = Deduce_amounts_year["house_fund_rent"]
         reduce_typeData.selected = '年度'
       }
     } else if (frontPage.data.house_type == "house_fund_loan") {
@@ -540,6 +544,9 @@ Page({
         deduction_amount = Deduce_amounts_year["house_fund_loan"]
         reduce_typeData.selected = '年度'
       }
+      this.setData({
+        deduction_amount: deduction_amount
+      })
     }
     this.setData({
@@ -547,7 +554,6 @@ Page({
       cur_index: nameKey,
       house_type: house_type,
       reducetypeData: reduce_typeData,
-      deduction_amount: deduction_amount
     })
     wx.setNavigationBarTitle({
       title: title,
@@ -1527,8 +1533,17 @@ Page({
       case 'child_percent':
         var childrenpercent_data = this.data.childrenpercentData
         childrenpercent_data.selected = childrenpercent_data.values[e.detail.value]
+        var deduction_amount = 0
+        if (e.detail.value == '0') {
+          deduction_amount = 0
+        } else if (e.detail.value == '1') {
+          deduction_amount = 500
+        }else {
+          deduction_amount = 1000
+        }
         this.setData({
-          childrenpercentData: childrenpercent_data
+          childrenpercentData: childrenpercent_data,
+          deduction_amount: deduction_amount
         })
         break;
       break;
@@ -1635,10 +1650,10 @@ Page({
         var deduction_amount
         if (e.detail.value == '1') {//非学历教育
           reducetypeData.selected = '年度'
-          reducetypeData.disabled = true 
+          // reducetypeData.disabled = true 
           deduction_amount = Deduce_amounts_year['continuing_education_non']
         }else {
-          reducetypeData.disabled = false 
+          // reducetypeData.disabled = false 
           reducetypeData.selected = '月度'
           deduction_amount = Deduce_amounts_month['continuing_education']
         }
@@ -1800,6 +1815,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.setData({
           rentAddress_haschanged: true,
           rentLocateInfo: rent_address
@@ -1811,6 +1834,31 @@ Page({
     //   edu_name: educate_name
     // })
   },
+  getCityLevel:function(loc){
+    var that = this;
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/house-rent-deductions',
+      header: {
+        'content-type': 'application/json',
+        "Authorization": Authorization
+      },
+      data: { 'address_codes': loc},
+      success(res) {
+        if (res && res.statusCode < 300) {
+          that.setData({
+            deduction_amount: res.data.amount
+          })
+        } else {
+          wx.showToast({
+            title: res.data.message ? res.data.message : '请求出错',
+            icon: 'none'
+          })
+        }
+      }
+    })
+  },
+
   // goupload: function(e) {
   //   console.log(e)