赡养人

@@ -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': 400, 'support_duty': '', 'medical_fund': '','house_fund':''}
-const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': 4800, 'support_duty': '', 'medical_fund': '', 'house_fund': '' }
+const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': 400, 'support_duty': 2000, 'medical_fund': 0,'house_fund':0}
+const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': 4800, 'support_duty': 24000, 'medical_fund': 0, 'house_fund': 0 }
 
 Page({
   idcard_belong:null,//照片信息获取返回时判断所属
@@ -43,6 +43,16 @@ Page({
       end: '2018-01-01',
       onChange: 'onPickerSelect',
     },
+    older_relativeData: {
+      label: '与纳税人的关系',
+      isrequre: true,
+      bindtype: 'older_relative',
+      selected: '',
+      isblack: 'true',
+      placeholder: '请选择与纳税人的关系',
+      values: ["父母", "祖父母", "外祖父母"],
+      onChange: 'onPickerSelect'
+    },
     taxperson_relativeData: {
       label: '与纳税人的关系',
       isrequre: true,
@@ -649,7 +659,7 @@ Page({
         }
         break;
       case 'support_duty':
-        // subUrl = 'persontax/v1/continuing-educations'
+        subUrl = 'persontax/v1/support-duties'
         if (this.data.supporttypeData.selected.length < 1) {
           this.showToast('请选择赡养类型')
           return
@@ -668,12 +678,12 @@ Page({
             this.showToast('请选择赡养人出生日期')
             return
           }
-          if (this.data.taxperson_relativeData.selected.length < 1) {
+          if (this.data.older_relativeData.selected.length < 1) {
             this.showToast('请选择与纳税人关系')
             return
           }
           newdata.older_birthday = this.data.olderbirthDate.selected
-          newdata.older_relative = this.data.taxperson_relativeData.selected
+          newdata.older_relative = this.data.older_relativeData.selected
         }
 
         newdata.support_type = this.data.supporttypeData.selected
@@ -865,6 +875,13 @@ Page({
           loverbirthDate: lover_birthDate
         })
         break;
+      case 'older_relative':
+        var older_relativeData = this.data.older_relativeData
+        older_relativeData.selected = older_relativeData.values[e.detail.value]
+        this.setData({
+          older_relativeData: older_relativeData
+        })
+        break;
       case 'taxperson_relative':
         var taxperson_relativedata = this.data.taxperson_relativeData
         taxperson_relativedata.selected = taxperson_relativedata.values[e.detail.value]

@@ -125,11 +125,11 @@
         <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>
-          <text class='text_333_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text>
+          <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text>
         </view>
         <view class='divide_line_f5f5f5'></view>
 
-        <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
+        <template is="picker_cell_normal" data="{{...older_relativeData}}" />
 
         <!-- <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>