Merge branch 'dev_py' into dev2.0

@@ -33,6 +33,8 @@ Page({
   idcard_belong: null, //照片信息获取返回时判断所属
   legal_entity_id: "",
   legal_entity: "",
+  supporttype:"",
+  share_method:"",
   data: {
     hasLover:false,
     house_type: "",
@@ -185,16 +187,16 @@ Page({
       placeholder: '请选择学历教育阶段',
       onChange: 'onPickerSelect'
     },
-    supporttypeData: {
-      label: '赡养类型',
-      isrequre: true,
-      bindtype: 'support_type',
-      selected: '',
-      isblack: 'true',
-      values: ["独生子女", "非独生子女"],
-      placeholder: '请选择赡养类型',
-      onChange: 'onPickerSelect'
-    },
+    // supporttypeData: {
+    //   label: '赡养类型',
+    //   isrequre: true,
+    //   bindtype: 'support_type',
+    //   selected: '',
+    //   isblack: 'true',
+    //   values: ["独生子女", "非独生子女"],
+    //   placeholder: '请选择赡养类型',
+    //   onChange: 'onPickerSelect'
+    // },
     shareMethodData: {
       label: '分摊方式',
       isrequre: true,
@@ -509,6 +511,10 @@ Page({
         cardtypeData: cardtype_data,
         commonbirthDate: commonbirth_date
       })
+    } else if ("support_duty" == options.status) {
+      deduction_amount = frontPage.data.reduce_amount
+      this.supporttype = frontPage.data.issinglechildData.selected == '是' ? 'D' : 'S',//是否独生
+      this.share_method = frontPage.data.shareMethodData.selected
     } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
       this.getbanklist()
       house_type = "house_fund_rent"
@@ -1127,17 +1133,17 @@ Page({
         break;
       case 'support_duty':
         subUrl = 'persontax/v1/support-duties'
-        if (this.data.supporttypeData.selected.length < 1) {
-          this.showToast('请选择赡养类型')
-          return
-        }
-        if (!this.data.shareMethodData.hidden) {
-          if (this.data.shareMethodData.selected.length < 1){
-            this.showToast('请选择分摊方式')
-            return
-          }
-          newdata.share_method = this.data.shareMethodData.selected
-        }
+        // if (this.data.supporttypeData.selected.length < 1) {
+        //   this.showToast('请选择赡养类型')
+        //   return
+        // }
+        // 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
@@ -1165,9 +1171,12 @@ Page({
         // } else {
         //   newdata.percentage = parseFloat(formdata.percentage)
         // }
+        newdata.support_type = this.supporttype
+        if (this.supporttype == 'S' && this.share_method.length){
+          newdata.share_method = this.share_method
+        }
         newdata.birthday = this.data.olderbirthDate.datelong
         newdata.relationship = this.data.older_relativeData.selected
-        newdata.support_type = this.data.supporttypeData.selected =='独生子女'?'D':'S'
         newdata.id_card_type = '1' //this.data.oldercardtypeData.selected
         newdata.nation = "中国"
         break;
@@ -1352,6 +1361,7 @@ Page({
     }
     newdata.legal_entity_id = this.legal_entity_id
     newdata.legal_entity = this.legal_entity
+    console.log("newdata", newdata);
     this.addDatas(newdata, subUrl)
   },
 
@@ -1562,24 +1572,24 @@ Page({
           schoolCountryData: schoolCountry_data
         })
         break;
-      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,
-          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 '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,
+      //     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':
         var older_cardtypeData = this.data.oldercardtypeData
         older_cardtypeData.selected = older_cardtypeData.values[e.detail.value]

@@ -116,8 +116,8 @@
 </view>
 <!-- 赡养老人 -->
 <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}}" />
+  <!-- <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>