Merge branch 'dev_py' into dev2.0

@@ -16,7 +16,8 @@ const Deduce_amounts_month = {
   'continuing_education': 400,
   'support_duty': 2000,
   'medical_fund': 0,
-  'house_fund': 0
+  'house_fund_rent': 1000,
+  "house_fund_loan":1200
 }
 const Deduce_amounts_year = {
   'children_education': 12000,
@@ -24,13 +25,15 @@ const Deduce_amounts_year = {
   'continuing_education_non': 3600,
   'support_duty': 24000,
   'medical_fund': 0,
-  'house_fund': 0
+  'house_fund_rent': 12000,
+  "house_fund_loan":14400
 }
 
 Page({
   idcard_belong: null, //照片信息获取返回时判断所属
   legal_entity_id: "",
   legal_entity: "",
+  fund_type:"",
   data: {
     house_type: "",
     deduction_amount: '',
@@ -484,8 +487,26 @@ Page({
         cardtypeData: cardtype_data,
         commonbirthDate: commonbirth_date
       })
-    } else if (frontPage.data.house_type == "house_fund_rent" || frontPage.data.house_type == "house_fund_loan") {
+    } else if (frontPage.data.house_type == "rent") { 
       this.getbanklist()
+      this.fund_type = "rent"
+      if (options.reducetype == '月度') {
+        reduce_typeData.selected = '月度'
+        deduction_amount = Deduce_amounts_month["house_fund_rent"]
+      } else {
+        deduction_amount = Deduce_amounts_year["house_fund_rent"]
+        reduce_typeData.selected = '年度'
+      }
+    } else if (frontPage.data.house_type == "house_fund_loan") {
+      this.getbanklist()
+      this.fund_type = "loan"
+      if (options.reducetype == '月度') {
+        reduce_typeData.selected = '月度'
+        deduction_amount = Deduce_amounts_month["house_fund_loan"]
+      } else {
+        deduction_amount = Deduce_amounts_year["house_fund_loan"]
+        reduce_typeData.selected = '年度'
+      }
     }
     var title = '添加' + AddTypeNames[nameKey]
 
@@ -1470,10 +1491,16 @@ Page({
       case 'reduce_type':
         var reduce_typeData = this.data.reducetypeData
         var deduction_amount
+        var key = this.data.cur_index
+        if (this.fund_type == 'rent') {
+          key = 'house_fund_rent'
+        } else if (this.fund_type == 'loan') {
+          key = 'house_fund_loan'
+        }
         if (e.detail.value == '0') {
-          deduction_amount = Deduce_amounts_month[this.data.cur_index]
+          deduction_amount = Deduce_amounts_month[key]
         } else {
-          deduction_amount = Deduce_amounts_year[this.data.cur_index]
+          deduction_amount = Deduce_amounts_year[key]
         }
         reduce_typeData.selected = reduce_typeData.values[e.detail.value]
         this.setData({