优化

@@ -7,18 +7,32 @@ Page({
    * Page initial data
    */
   data: {
-    support_duty_id:"",
-    name:"",
-    id_card_no:""
+    support_duty_id: "",
+    name: "",
+    nation: "",
+    id_card_no: "",
+    commonbirthDate: {
+      label: '共同赡养人出生日期',
+      isrequre: true,
+      bindtype: 'birthday',
+      selected: '',
+      isblack: 'true',
+      placeholder: '请选择出生日期',
+      mode: "date",
+      fields: "day",
+      start: '1970-01-01',
+      end: '2018-01-01',
+      onChange: 'onBirthdaySelect',
+    },
   },
 
   /**
    * Lifecycle function--Called when page load
    */
   onLoad: function(options) {
-    console.log("onLoad",options)
+    console.log("onLoad", options)
     this.setData({
-      support_duty_id:options.id
+      support_duty_id: options.id
     })
   },
 
@@ -33,24 +47,27 @@ Page({
    * Lifecycle function--Called when page show
    */
   onShow: function() {
-      var that = this
-      wx.getStorage({
-        key: 'id_info',
-        success: function(res) {
-          console.log('id_info', res.data)
-          if (res.data && res.data.length > 0) {
-            var id_info = JSON.parse(res.data)
-            if (that.data.name.length > 0 && id_info.name != that.data.name) {
-              that.showtoast("姓名冲突")
-              return
-            }
-            that.setData({
-              name: id_info.name,
-              id_card_no: id_info.id_card_number
-            })
+    var that = this
+    wx.getStorage({
+      key: 'id_info',
+      success: function(res) {
+        console.log('id_info', res.data)
+        if (res.data && res.data.length > 0) {
+          var id_info = JSON.parse(res.data)
+          if (that.data.name.length > 0 && id_info.name != that.data.name) {
+            that.showtoast("姓名冲突")
+            return
           }
-        },
-      })
+          var commonbirthDate = that.data.commonbirthDate
+          commonbirthDate.selected = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day
+          commonbirthDate.datelong = Date.parse(new Date(commonbirthDate.selected)) / 1000
+          that.setData({
+            name: id_info.name,
+            id_card_no: id_info.id_card_number
+          })
+        }
+      },
+    })
     wx.removeStorage({
       key: 'id_info',
       success(res) {
@@ -66,10 +83,10 @@ Page({
   },
 
 
-  formSubmit: function (e) {
+  formSubmit: function(e) {
     console.log("formSubmit", e);
     var formdata = e.detail.value
-    if (!formdata.name || formdata.name.length<1){
+    if (!formdata.name || formdata.name.length < 1) {
       this.showToast("请输入姓名")
       return;
     } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
@@ -79,23 +96,26 @@ Page({
     this.goAdd(formdata)
   },
 
-  goAdd: function (formdata){
+  goAdd: function(formdata) {
     var that = this;
     var Authorization = getApp().globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/co-supporters',
       data: {
         "support_duty_id": that.data.support_duty_id,
-        "co_supporter": formdata.name ,
+        "co_supporter": formdata.name,
         "id_card_type": "1",
         "id_card_no": formdata.id_card_no,
+        "birthday": that.data.commonbirthDate.datelong,
+        "nation": "中国",
+        "relation_ship": "兄、弟、姐、妹"
       },
       header: {
         'content-type': 'application/json',
         "Authorization": Authorization
       },
-      method:"POST",
-      success: function (res) {
+      method: "POST",
+      success: function(res) {
         if (res && res.data) {
           console.log("res", res)
           if (res && res.statusCode == 200) {
@@ -108,7 +128,17 @@ Page({
     })
   },
 
-  showToast: function (data) {
+  onBirthdaySelect: function(e) {
+    console.log('picker发送选择改变，携带值为', e)
+    var commonbirthDate = this.data.commonbirthDate
+    commonbirthDate.selected = e.detail.value
+    commonbirthDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
+    this.setData({
+      commonbirthDate: commonbirthDate
+    })
+  },
+
+  showToast: function(data) {
     if (data && data.length > 0) {
       wx.showToast({
         title: data,

 <!--pages/main/addtionalreduce/adddupporters/adddupporters.wxml-->
+<import src="../../../common/picker_cell" />
+
 <view class='page'>
   <form bindsubmit='formSubmit'>
     <view style='height:90rpx;padding:0 30rpx'>
@@ -23,11 +25,12 @@
       </view>
     </view>
     <view class="divide_line"></view>
-      <view style='height:90rpx;padding:0 30rpx'>
+    <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
+      <!-- <view style='height:90rpx;padding:0 30rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
         <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人出生日期</text>
         <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>1949-09-19</text>
-      </view>
+      </view> -->
       <view class="divide_line"></view>
       <view style='height:90rpx;padding:0 30rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>

@@ -36,6 +36,9 @@ Page({
     lable: 0,
     title: '',
     isIdCard: true,
+    workAddress_haschanged: false,
+    loanAddress_haschanged: false,
+    rentAddress_haschanged: false,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
     cur_index: 'support_duty',
     lovercardtypeData: {
@@ -318,6 +321,7 @@ Page({
       address_value: ['', ''],
       selected: '',
       placeholder: '请选择城市',
+      requestdata: {},
       onChange: 'onPickerSelect'
     },
     houseLocateInfo: {
@@ -330,6 +334,7 @@ Page({
       address_code: ['', '', ''],
       address_value: ['', '', ''],
       selected: '',
+      requestdata: {},
       placeholder: '请选择地址',
       onChange: 'onPickerSelect'
     },
@@ -343,6 +348,7 @@ Page({
       address_code: ['', '', ''],
       address_value: ['', '', ''],
       selected: '',
+      requestdata: {},
       placeholder: '请选择地址',
       onChange: 'onPickerSelect'
     },
@@ -577,13 +583,13 @@ Page({
       case 'continuing_education':
         var setData = {}
         if (data.education_type && data.education_type.length) {
-          if ('title' == data.education_type){
+          if ('title' == data.education_type) {
             var edutypeData = this.data.edutypeData
             edutypeData.selected = "学历继续教育"
             setData.edutypeData = edutypeData
-          }else{
+          } else {
             var edutypeData = this.data.edutypeData
-            edutypeData.selected = data.education_type =='major'?"专业技术人员职业资格":"技能人员职业资格"
+            edutypeData.selected = data.education_type == 'major' ? "专业技术人员职业资格" : "技能人员职业资格"
             setData.edutypeData = edutypeData
           }
         }
@@ -618,7 +624,7 @@ Page({
         }
         if (data.certification_autority && data.certification_autority.length) {
           setData.certification_autority = data.certification_autority
-        } 
+        }
         this.setData(setData)
         break;
       case 'support_duty':
@@ -687,17 +693,12 @@ Page({
           loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
           loverbirthDate.datelong = data.spouse_birthday
           setData.loverbirthDate = loverbirthDate
-        } 
+        }
         if (data.loan_type && data.loan_type.length) {
           var loantypeData = this.data.loantypeData
           loantypeData.selected = data.loan_type
           setData.loantypeData = loantypeData
         }
-        if (data.house_address && data.house_address.length) {
-          var houseLocateInfo = this.data.houseLocateInfo
-          houseLocateInfo.selected = data.house_address
-          setData.houseLocateInfo = houseLocateInfo
-        }
         if (data.house_detail_address && data.house_detail_address.length) {
           setData.house_detail_address = data.house_detail_address
         }
@@ -737,11 +738,25 @@ Page({
           leaseendDate.datelong = data.rent_end
           setData.leaseendDate = leaseendDate
         }
-        if (data.work_city && data.work_city.length) {
+        if (data.work_city && data.work_city.province) {
           var workingcityInfo = this.data.workingcityInfo
-          workingcityInfo.selected = data.work_city
+          workingcityInfo.requestdata = data.work_city
+          workingcityInfo.selected = data.work_city.province + data.work_city.city
           setData.workingcityInfo = workingcityInfo
         }
+        if (house_type == 'house_fund_loan' && data.house_address && data.house_address.province) {
+          var houseLocateInfo = this.data.houseLocateInfo
+          houseLocateInfo.requestdata = data.house_address
+          houseLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
+          setData.houseLocateInfo = houseLocateInfo
+        }
+        if (house_type == 'house_fund_rent' && data.house_address && data.house_address.province) {
+          var rentLocateInfo = this.data.rentLocateInfo
+          rentLocateInfo.requestdata = data.house_address
+          rentLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
+          setData.rentLocateInfo = rentLocateInfo
+        }
+
         this.setData(setData)
         break;
     }
@@ -1043,10 +1058,10 @@ Page({
         } else {
           newdata.percentage = parseFloat(formdata.percentage)
         }
-        newdata.older_birthday = this.data.olderbirthDate.datelong
-        newdata.older_relative = this.data.older_relativeData.selected
+        newdata.birthday = this.data.olderbirthDate.datelong
+        newdata.relationship = this.data.older_relativeData.selected
         newdata.support_type = this.data.supporttypeData.selected
-        newdata.older_cardtype = this.data.oldercardtypeData.selected
+        newdata.id_card_type = this.data.oldercardtypeData.selected
         break;
       case 'medical_fund':
         subUrl = 'persontax/v1/medical-funds'
@@ -1091,7 +1106,7 @@ Page({
           } else if (this.data.identifytypeData.selected.length < 1) {
             this.showToast('请选择证书类型')
             return
-          }  else if (!formdata.certification_no || formdata.certification_no.length < 1) {
+          } else if (!formdata.certification_no || formdata.certification_no.length < 1) {
             this.showToast('请填写证书号码')
             return
           } else if (this.data.beforemarryData.selected.length < 1) {
@@ -1116,7 +1131,6 @@ Page({
             this.showToast('请选择贷款期限')
             return
           }
-          newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
           newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n'
           newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
           newdata.identify_type = this.data.identifytypeData.selected
@@ -1125,6 +1139,9 @@ Page({
           newdata.loan_bank = this.data.bankInfo.selected
           newdata.payback_date = this.data.firstpaybackDate.selected
           newdata.loan_datelong = this.data.loandatelongData.selected
+          var request_loan_address = that.getLoanAddressRequest()
+          newdata.house_location = request_loan_address
+
         } else if (this.data.house_type == "house_fund_rent") {
           if (this.data.workingcityInfo.address_value.length < 1) {
             this.showToast('请选择工作城市')
@@ -1138,35 +1155,42 @@ Page({
           } else if (!formdata.lease_idno || formdata.lease_idno.length < 1) {
             this.showToast('请填写纳税人识别号')
             return
-          } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
-            this.showToast('请填写出租方号码')
-            return
-          } else if (this.data.identifytypeData.selected.length < 1) {
+          }
+          //  else if (!formdata.identify_no || formdata.identify_no.length < 1) {
+          //   this.showToast('请填写出租方号码')
+          //   return
+          // } 
+          else if (this.data.identifytypeData.selected.length < 1) {
             this.showToast('请选择证件类型')
             return
-          } else if (this.data.rentLocateInfo.address_value.length < 1) {
-            this.showToast('请选择房屋地址')
-            return
           } else if (!formdata.owner_id_cartd_no || formdata.owner_id_cartd_no.length < 1) {
             this.showToast('请填写证件号码')
             return
-          } else if (!formdata.rent_contract_no || formdata.rent_contract_no.length < 1) {
+          } else if (this.data.rentLocateInfo.address_value.length < 1) {
+            this.showToast('请选择房屋地址')
+            return
+          }  
+           else if (!formdata.rent_contract_no || formdata.rent_contract_no.length < 1) {
             this.showToast('请填写租赁合同编号')
             return
-          }else if (this.data.leasestartDate.selected.length < 1) {
+          } else if (this.data.leasestartDate.selected.length < 1) {
             this.showToast('请选择日期')
             return
           } else if (this.data.leaseendDate.selected.length < 1) {
             this.showToast('请选择日期')
             return
           }
-          newdata.house_address = this.data.rentLocateInfo.address_value[0] + this.data.rentLocateInfo.address_value[1] + this.data.rentLocateInfo.address_value[2]
-          newdata.work_city = this.data.workingcityInfo.address_value[0] + this.data.workingcityInfo.address_value[1] + this.data.workingcityInfo.address_value[2]
           newdata.lease_type = this.data.leasetypeData.selected
           newdata.certification_type = this.data.identifytypeData.selected
           newdata.rent_start = this.data.leasestartDate.selected
           newdata.rent_end = this.data.leaseendDate.selected
-          console.log('houseLocateInfo', this.data.houseLocateInfo)
+
+          var request_working_address = that.getWorkingAddressRequest()
+          newdata.work_city = request_working_address
+          var request_rent_address = that.getRentAddressRequest()
+          newdata.house_address = request_rent_address
+          console.log('request_working_address', this.data.request_working_address)
+
         }
         if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
           if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
@@ -1488,7 +1512,10 @@ Page({
           house_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
 
         }
+        house_address.address_value = e.detail.value
+        house_address.address_code = e.detail.code
         this.setData({
+          loanAddress_haschanged: true,
           houseLocateInfo: house_address
         })
         break;
@@ -1499,10 +1526,12 @@ Page({
         if (e.detail.value[0] == e.detail.value[1]) {
           work_address.selected = e.detail.value[1] + e.detail.value[2]
         } else {
-          work_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
-
+          work_address.selected = e.detail.value[0] + e.detail.value[1]
         }
+        work_address.address_value = e.detail.value
+        work_address.address_code = e.detail.code
         this.setData({
+          workAddress_haschanged: true,
           workingcityInfo: work_address
         })
         break;
@@ -1514,9 +1543,11 @@ Page({
           rent_address.selected = e.detail.value[1] + e.detail.value[2]
         } else {
           rent_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
-
         }
+        rent_address.address_value = e.detail.value
+        rent_address.address_code = e.detail.code
         this.setData({
+          rentAddress_haschanged: true,
           rentLocateInfo: rent_address
         })
         break;
@@ -1601,6 +1632,52 @@ Page({
   //   })
   // },
 
+  getWorkingAddressRequest: function() {
+    var that = this
+    if (that.data.workAddress_haschanged) {
+      return {
+        "province_code": that.data.workingcityInfo.address_code[0],
+        "province": that.data.workingcityInfo.address_value[0],
+        "city_code": that.data.workingcityInfo.address_code[1],
+        "city": that.data.workingcityInfo.address_value[1]
+      }
+    } else {
+      return that.data.workingcityInfo.requestdata
+    }
+  },
+
+  getRentAddressRequest: function() {
+    var that = this
+    if (that.data.rentAddress_haschanged) {
+      return {
+        "province_code": that.data.rentLocateInfo.address_code[0],
+        "province": that.data.rentLocateInfo.address_value[0],
+        "city_code": that.data.rentLocateInfo.address_code[1],
+        "city": that.data.rentLocateInfo.address_value[1],
+        "district_code": that.data.rentLocateInfo.address_code[2],
+        "district": that.data.rentLocateInfo.address_value[2]
+      }
+    } else {
+      return that.data.rentLocateInfo.requestdata
+    }
+  },
+
+  getLoanAddressRequest: function() {
+    var that = this
+    if (that.data.loanAddress_haschanged) {
+      return {
+        "province_code": that.data.houseLocateInfo.address_code[0],
+        "province": that.data.houseLocateInfo.address_value[0],
+        "city_code": that.data.houseLocateInfo.address_code[1],
+        "city": that.data.houseLocateInfo.address_value[1],
+        "district_code": that.data.houseLocateInfo.address_code[2],
+        "district": that.data.houseLocateInfo.address_value[2]
+      }
+    } else {
+      return that.data.houseLocateInfo.requestdata
+    }
+  },
+
   showToast: function(data) {
     if (data && data.length > 0) {
       wx.showToast({

@@ -120,7 +120,7 @@
       <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='supported_name'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入被赡养人姓名' name='supported_name' value='{{supported_name}}'></input>
       </view>
       <view class='divide_line_f5f5f5'></view>
       <template is="picker_cell_normal" data="{{...oldercardtypeData}}" />
@@ -258,7 +258,7 @@
           <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='owner_id_cartd_no'></input>
+            <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证件号码' name='owner_id_cartd_no'></input>
           </view>
         </view>
         <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>