Merge branch 'dev2.0' into dev_wy

 <template name="picker_cell_normal">
-  <view class='item_body'>
+  <view class='item_body' hidden='{{hidden}}'>
     <text hidden='{{!isrequre}}' style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
     <view wx:if='{{isrequre||isblack}}'>
       <text class='text_black_30 float_left' style='line-height: 90rpx;'>{{label}}</text>

@@ -183,6 +183,16 @@ Page({
       placeholder: '请选择赡养类型',
       onChange: 'onPickerSelect'
     },
+    shareMethodData: {
+      label: '分摊方式',
+      isrequre: true,
+      bindtype: 'share_method',
+      selected: '',
+      isblack: 'true',
+      values: ["赡养人平均分摊", "赡养人约定分摊", "被赡养人指定分摊"],
+      placeholder: '请选择分摊方式',
+      onChange: 'onPickerSelect'
+    },
     oldercardtypeData: {
       label: '被赡养人证照类型',
       isrequre: true,
@@ -518,7 +528,7 @@ Page({
       title: title,
     })
     this.initOSS()
-    if (options.datas && options.datas.length>0) {
+    if (options.datas && options.datas.length > 0 && options.datas !="undefined") {
       this.handleTransData(JSON.parse(options.datas))
     }
   },
@@ -1066,7 +1076,15 @@ Page({
         if (this.data.supporttypeData.selected.length < 1) {
           this.showToast('请选择赡养类型')
           return
-        } else if (!formdata.supported_name || formdata.supported_name.length < 1) {
+        }
+        if (!this.data.shareMethodData.hidden) {
+          if (this.data.shareMethodData.selected.length < 1){
+            this.showToast('请选择分摊方式')
+            return
+          }
+          newdata.share_method = this.data.shareMethodData.selected
+        }
+        if (!formdata.supported_name || formdata.supported_name.length < 1) {
           this.showToast('请填写赡养人姓名')
           return
         } else if (this.data.oldercardtypeData.selected.length < 1) {
@@ -1084,16 +1102,17 @@ Page({
           this.showToast('请选择与纳税人关系')
           return
         }
-        if (!formdata.percentage || formdata.percentage.length < 1 || formdata.percentage > 100) {
-          this.showToast('请填写合理分摊比例')
-          return
-        } else {
-          newdata.percentage = parseFloat(formdata.percentage)
-        }
+        // if (!formdata.percentage || formdata.percentage.length < 1 || formdata.percentage > 100) {
+        //   this.showToast('请填写合理分摊比例')
+        //   return
+        // } else {
+        //   newdata.percentage = parseFloat(formdata.percentage)
+        // }
         newdata.birthday = this.data.olderbirthDate.datelong
         newdata.relationship = this.data.older_relativeData.selected
-        newdata.support_type = this.data.supporttypeData.selected
-        newdata.id_card_type = this.data.oldercardtypeData.selected
+        newdata.support_type = this.data.supporttypeData.selected =='独生子女'?'D':'S'
+        newdata.id_card_type = '1' //this.data.oldercardtypeData.selected
+        newdata.nation = "中国"
         break;
       case 'medical_fund':
         subUrl = 'persontax/v1/medical-funds'
@@ -1229,7 +1248,7 @@ Page({
           var request_rent_address = this.getRentAddressRequest()
           newdata.house_address = request_rent_address
           console.log('request_working_address', request_working_address)
-
+          newdata.nation = "中国"
         }
         if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
           if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
@@ -1467,9 +1486,19 @@ Page({
       case 'support_type':
         var support_typeData = this.data.supporttypeData
         support_typeData.selected = support_typeData.values[e.detail.value]
+        var share_methodData = this.data.shareMethodData
+        share_methodData.hidden = e.detail.value == 0
         this.setData({
           oldersupport_lable: e.detail.value == 0 ? 'single' : 'together',
-          supporttypeData: support_typeData
+          supporttypeData: support_typeData,
+          shareMethodData: share_methodData
+        })
+        break;
+      case 'share_method':
+        var share_methodData = this.data.shareMethodData
+        share_methodData.selected = share_methodData.values[e.detail.value]
+        this.setData({
+          shareMethodData: share_methodData
         })
         break;
       case 'oldercardtype':

@@ -117,6 +117,7 @@
 <!-- 赡养老人 -->
 <view wx:if="{{cur_index=='support_duty'}}" style='padding:0 30rpx;'>
   <template is="picker_cell_normal" data="{{...supporttypeData}}" />
+  <template is="picker_cell_normal" data="{{...shareMethodData}}" />
   <view class='divide_line_f5f5f5'></view>
   <view style='height:90rpx'>
     <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
@@ -147,17 +148,12 @@
   <template is="picker_cell_normal" data="{{...older_relativeData}}" />
 
   <view class='divide_line_f5f5f5'></view>
-  <view style='height:90rpx;'>
+  <!-- <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_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
     <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' type='number' name='percentage' value='{{percentage}}'></input>
-  </view>
-  <!-- <view class='divide_line_f5f5f5'></view>
-        <view style='height:90rpx'>
-          <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='allocation_ratio'></input>
-        </view> -->
+  </view> -->
 </view>
 <!-- 大病医疗 -->
 <view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'>