Merge branch 'dev2.0' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev2.0

@@ -4,8 +4,8 @@ var OSSInit;
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund': '住房' }
-const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '','house_fund':''}
-const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '', 'house_fund': '' }
+const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': 400, 'support_duty': '', 'medical_fund': '','house_fund':''}
+const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': 4800, 'support_duty': '', 'medical_fund': '', 'house_fund': '' }
 
 Page({
   idcard_belong:null,//照片信息获取返回时判断所属
@@ -181,6 +181,7 @@ Page({
     },
     reducetypeData: {
       label: '扣除方式',
+      isrequre: true,
       bindtype: 'reduce_type',
       selected: '',
       isblack: 'true',
@@ -599,8 +600,6 @@ Page({
           return
         } else if (this.data.edu_lable == 'school') {
           // newdata.edu_type_lable = '0'
-          newdata.study_startdate = this.data.studystartdate.selected
-          newdata.study_enddate = this.data.studyenddate.selected
           if (this.data.edulevelData.selected.length < 1) {
             this.showToast('请选择学历教育阶段')
             return
@@ -613,6 +612,8 @@ Page({
             this.showToast('请选择受教育日期')
             return
           }
+          newdata.education_start = this.data.studystartdate.datelong
+          newdata.education_end = this.data.studyenddate.datelong
           newdata.education_type = 'title'//学历
           newdata.education_period = this.data.edulevelData.selected
         } else if (this.data.edu_lable == 'tech') {
@@ -636,8 +637,6 @@ Page({
           // newdata.edu_type_lable = '1'
           newdata.education_type = this.data.edustyleData.selected == '职业能力' ? 'profession' : 'major'
         }
-        newdata.education_end = this.data.studystartdate.datelong
-        newdata.education_start = this.data.studyenddate.datelong
         break;
       case 'support_duty':
         if (this.data.supporttypeData.selected.length < 1) {

@@ -83,16 +83,19 @@
           <template is="picker_cell_normal" data="{{...edustyleData}}" />
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>证书名称</text>
             <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书名称' name='occupational_qualifiy_name'></input>
           </view>
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>证书编号</text>
             <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书编号' name='certification_no'></input>
           </view>
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>发证机关</text>
             <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入发证机关' name='certification_autority'></input>
           </view>