Merge branch 'dev_py' into dev2.0

@@ -21,6 +21,7 @@ const Deduce_amounts_month = {
 const Deduce_amounts_year = {
 const Deduce_amounts_year = {
   'children_education': 12000,
   'children_education': 12000,
   'continuing_education': 4800,
   'continuing_education': 4800,
+  'continuing_education_non': 3600,
   'support_duty': 24000,
   'support_duty': 24000,
   'medical_fund': 0,
   'medical_fund': 0,
   'house_fund': 0
   'house_fund': 0
@@ -1465,7 +1466,7 @@ Page({
         if (e.detail.value == '0') {
         if (e.detail.value == '0') {
           deduction_amount = Deduce_amounts_month[this.data.cur_index]
           deduction_amount = Deduce_amounts_month[this.data.cur_index]
         } else {
         } else {
-          deduction_amount = Deduce_amounts_year[this.data.cur_indexfan]
+          deduction_amount = Deduce_amounts_year[this.data.cur_index]
         }
         }
         reduce_typeData.selected = reduce_typeData.values[e.detail.value]
         reduce_typeData.selected = reduce_typeData.values[e.detail.value]
         this.setData({
         this.setData({
@@ -1476,9 +1477,22 @@ Page({
       case 'edu_type':
       case 'edu_type':
         var edutypee_data = this.data.edutypeData
         var edutypee_data = this.data.edutypeData
         edutypee_data.selected = edutypee_data.values[e.detail.value]
         edutypee_data.selected = edutypee_data.values[e.detail.value]
+        var reducetypeData = this.data.reducetypeData
+        var deduction_amount
+        if (e.detail.value == '1') {//非学历教育
+          reducetypeData.selected = '年度'
+          reducetypeData.disabled = true 
+          deduction_amount = Deduce_amounts_year['continuing_education_non']
+        }else {
+          reducetypeData.disabled = false 
+          reducetypeData.selected = '月度'
+          deduction_amount = Deduce_amounts_month['continuing_education']
+        }
         this.setData({
         this.setData({
           edu_lable: e.detail.value == 0 ? 'school' : 'tech',
           edu_lable: e.detail.value == 0 ? 'school' : 'tech',
-          edutypeData: edutypee_data
+          edutypeData: edutypee_data,
+          reducetypeData: reducetypeData,
+          deduction_amount: deduction_amount
         })
         })
         break;
         break;
       case 'edu_style':
       case 'edu_style':