Merge branch 'dev_py' into dev2.0

@@ -77,7 +77,7 @@ Page({
       placeholder: '请选择出生日期',
       mode: "date",
       fields: "day",
-      start: '1949-01-01',
+      start: '1970-01-01',
       end: '2018-01-01',
       onChange: 'onPickerSelect',
     },
@@ -406,7 +406,7 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      start: '2018-01-01',
+      start: '1970-01-01',
       datelong: 0,
     },
     leasestartDate: {
@@ -420,7 +420,7 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      start: '2000-01-01',
+      start: '1970-01-01',
       datelong: 0,
     },
     leaseendDate: {
@@ -434,7 +434,7 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      start: '2000-01-01',
+      start: '1970-01-01',
       datelong: 0,
     },
     loandatelongData: {
@@ -758,9 +758,9 @@ Page({
           olderbirthDate.datelong = data.birth_date
           setData.olderbirthDate = olderbirthDate
         }
-        if (data.relationship && data.relationship.length) {
+        if (data.family_ties && data.family_ties.length) {
           var older_relativeData = this.data.older_relativeData
-          older_relativeData.selected = data.relationship
+          older_relativeData.selected = data.family_ties
           setData.older_relativeData = older_relativeData
         }
         this.setData(setData)
@@ -1161,20 +1161,20 @@ Page({
         //   newdata.share_method = this.data.shareMethodData.selected
         // }
         if (!formdata.supported_name || formdata.supported_name.length < 1) {
-          this.showToast('请填写赡养人姓名')
+          this.showToast('请填写被赡养人姓名')
           return
         } else if (this.data.oldercardtypeData.selected.length < 1) {
-          this.showToast('请选择赡养人证照类型')
+          this.showToast('请选择被赡养人证照类型')
           return
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
-          this.showToast('请填写赡养人证照号')
+          this.showToast('请填写被赡养人证照号')
           return
         } else if (!format.isIDCardNum(formdata.id_card_no)) {
-          this.showToast('赡养人身份证格式有误')
+          this.showToast('被赡养人身份证格式有误')
           return
         }
         if (this.data.olderbirthDate.selected.length < 1) {
-          this.showToast('请选择赡养人出生日期')
+          this.showToast('请选择被赡养人出生日期')
           return
         }
         if (this.data.older_relativeData.selected.length < 1) {

@@ -237,7 +237,12 @@ Page({
       mobile: e.detail.value
     })
   },
-
+  nameInput: function (e) {
+    console.log('bindinputname', e)
+    this.setData({
+      name: e.detail.value
+    })
+  },
   // =============其他数据选中处理==============
 
   getIdInfo: function(e) {
@@ -269,10 +274,11 @@ Page({
       this.showtoast('证照号码有误');
       return
     }
-    if (formdata.name.length < 1) {
+    var name = formdata.person_name.length ? formdata.person_name : this.data.name
+    if (name.length < 1 ) {
       this.showtoast('姓名未填写');
       return
-    } else if (!regname.test(formdata.name)) {
+    } else if (!regname.test(name)) {
       this.showtoast('请输入正确姓名');
       return
     }
@@ -302,6 +308,7 @@ Page({
   goCommit: function(data) {
     var that = this
     var formdata = data
+    var name = formdata.person_name.length ? formdata.person_name : this.data.name
     console.log("form_data", formdata);
     var Authorization = app.globalData.Authorization;
     var url = baseUrl + 'persontax/v1/personal-taxes', method = "POST"
@@ -320,7 +327,7 @@ Page({
         "family_ties": that.data.relativeData.selected,
         "id_card_type": '居民身份证',//that.data.cardtypeData.selected,
         "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
-        "name": formdata.name,
+        "name": name,
         "gender": that.data.genderData.selected,
         "mobile": formdata.mobile,
         //"age": formdata.age ? formdata.age : '',//不传

@@ -35,7 +35,7 @@
         <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_777_30' maxlength='15' disabled='{{isDisable}}'></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' name='person_name' value='{{name}}' placeholder-class='text_777_30' maxlength='15' disabled='{{isDisable}}' bindinput='nameInput'></input>
         </view>
         <view class="divide_line_30"></view>