merge

@@ -7,9 +7,9 @@ var baseUrl = app.globalData.baseUrl;
 const AddTypeNames = {
   'children_education': '子女教育',
   'continuing_education': '继续教育',
-  'support_duty': '赡养老人',
-  'medical_fund': '大病医疗',
-  'house_fund': '住房'
+  'support_duty': '被赡养老人',
+  'medical_fund': '大病医疗支出',
+  'house_fund': '住房租金'
 }
 const Deduce_amounts_month = {
   'children_education': 1000,
@@ -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({
@@ -82,12 +82,12 @@ Page({
       onChange: 'onPickerSelect',
     },
     older_relativeData: {
-      label: '与纳税人的关系',
+      label: '与纳税人关系',
       isrequre: true,
       bindtype: 'older_relative',
       selected: '',
       isblack: 'true',
-      placeholder: '请选择与纳税人的关系',
+      placeholder: '请选择与纳税人关系',
       values: ["父母", "祖父母、外祖父母"],
       onChange: 'onPickerSelect'
     },
@@ -268,6 +268,7 @@ Page({
     reducetypeData: {
       label: '扣除方式',
       isrequre: false,
+      disabled: true,
       bindtype: 'reduce_type',
       selected: '',
       values: ["月度", "年度"],
@@ -475,6 +476,7 @@ Page({
     console.log('---------frontPage', frontPage.data)
     console.log("options", options);
     const nameKey = options.status
+    var title = AddTypeNames[nameKey]
 
     this.legal_entity_id = frontPage.data.legal_entity_id
     this.legal_entity = frontPage.data.legal_entity
@@ -483,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()
@@ -516,20 +518,25 @@ 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") {
       this.getbanklist()
       this.getTaxList()
       house_type = "house_fund_loan"
+      title = '住房贷款利息'
       if (options.reducetype == '月度') {
         reduce_typeData.selected = '月度'
         deduction_amount = Deduce_amounts_month["house_fund_loan"]
@@ -537,15 +544,16 @@ Page({
         deduction_amount = Deduce_amounts_year["house_fund_loan"]
         reduce_typeData.selected = '年度'
       }
+      this.setData({
+        deduction_amount: deduction_amount
+      })
     }
-    var title = AddTypeNames[nameKey]
 
     this.setData({
       title: title,
       cur_index: nameKey,
       house_type: house_type,
       reducetypeData: reduce_typeData,
-      deduction_amount: deduction_amount
     })
     wx.setNavigationBarTitle({
       title: title,
@@ -1525,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;
@@ -1633,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']
         }
@@ -1798,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
@@ -1809,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)

@@ -292,7 +292,7 @@
   </view>
 </view>
 
-<view style='padding:0 30rpx;' wx:if="{{cur_index!='medical_fund'}}">
+<view style='padding:0 30rpx;' wx:if="{{cur_index!='medical_fund' && cur_index!='support_duty'}}">
   <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...reducetypeData}}" />
   <view class='divide_line_30'></view>

@@ -35,6 +35,7 @@ Page({
     },
     cardtypeData: {
       isrequre: true,
+      disabled: true,
       label: '证照类型',
       bindtype: 'cardtype',
       selected: '居民身份证',

@@ -44,6 +44,7 @@ Page({
     },
     cardtypeData: {
       isrequre: true,
+      disabled: true,
       label: '证照类型',
       bindtype: 'cardtype',
       placeholder: '居民身份证',
@@ -838,6 +839,13 @@ Page({
     var formdata = e.detail.value;
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
+    if (this.data.card_number.length < 1) {
+      this.showtoast('请输入身份证号码');
+      return
+    } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
+      this.showtoast('证照号码有误');
+      return
+    }
     if (this.data.name.length < 1) {
       this.showtoast('请输入姓名');
       return
@@ -849,16 +857,10 @@ Page({
     //   this.showtoast('有必填项未填写');
     //   return
     // } 
-    else if (this.data.cardtypeData.selected.length < 1) {
-      this.showtoast('有必填项未填写');
-      return
-    } else if (this.data.card_number.length < 1) {
-      this.showtoast('请输入身份证号码');
-      return
-    } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
-      this.showtoast('证照号码有误');
-      return
-    }
+    // else if (this.data.cardtypeData.selected.length < 1) {
+    //   this.showtoast('有必填项未填写');
+    //   return
+    // } else 
     // else if (!this.data.isIdCard && (this.data.card_number.length < 1 &&  formdata.id_card_no.length < 1)) {
     //   this.showtoast('有必填项未填写');
     //   return

 {
-  "navigationBarTitleText": "纳税人基本信息",
+  "navigationBarTitleText": "自然人基础信息",
   "navigationBarTextStyle": "black",
   "navigationBarBackgroundColor": "#FFFFFF"
 }
\ No newline at end of file

@@ -6,7 +6,7 @@
     <view class="divide_line"></view>
     <!-- 基本信息 -->
     <view class='head_wrap' bindtap='span' id='1'>
-      <text class='head_text_wrap1'>基本信息</text>
+      <text class='head_text_wrap1'>基础信息</text>
       <text class='head_text_wrap2' hidden='{{!isshow01}}'>（点击收起非必填选项）</text>
       <text class='head_text_wrap2' hidden='{{isshow01}}'>（点击展开非必填选项）</text>
       <view style='float:right' wx:if='{{isshow01}}'>
@@ -21,6 +21,19 @@
     </view>
     <view class='data_list'>
       <view class='data_item'>
+        <template is="picker_cell_normal" data="{{...cardtypeData}}" />
+        <view class="divide_line_30"></view>
+
+        <view class='item_body'>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
+          <view>
+            <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
+            <input class='input_wrap float_right' disabled="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
+            <!-- <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
+            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
+          </view>
+        </view>
         <view class='item_body' hidden="{{!isself}}">
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
@@ -32,7 +45,7 @@
 
         <view class='item_body'>
           <text class='red_star_right_10'>*</text>
-          <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍（地区）</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx'>中国</text>
         </view>
         <view class="divide_line_30"></view>
@@ -48,19 +61,7 @@
           <text class='text_black_30 float_right' style='line-height: 90rpx'>否</text>
         </view>
         <view class="divide_line_30"></view>
-        <template is="picker_cell_normal" data="{{...cardtypeData}}" />
-        <view class="divide_line_30"></view>
-
-        <view class='item_body'>
-          <text class='red_star_right_10'>*</text>
-          <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
-          <view>
-            <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
-            <input class='input_wrap float_right' disabled="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
-            <!-- <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
-            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
-          </view>
-        </view>
+        
         <view hidden='{{!isshow01}}'>
           <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...genderData}}" />