优化配偶

@@ -68,7 +68,7 @@ Page({
       label: '配偶证照类型',
       label: '配偶证照类型',
       bindtype: 'lovercardtype',
       bindtype: 'lovercardtype',
       selected: '',
       selected: '',
-      disabled: true,
+      // disabled: true,
       placeholder: '请选择证照类型',
       placeholder: '请选择证照类型',
       values: cardTypeArray,
       values: cardTypeArray,
       onChange: 'onPickerSelect'
       onChange: 'onPickerSelect'
@@ -77,12 +77,10 @@ Page({
       label: '出生日期',
       label: '出生日期',
       bindtype: 'loverbirthday',
       bindtype: 'loverbirthday',
       selected: '',
       selected: '',
-      disabled: true,
+      // disabled: true,
       placeholder: '请选择出生日期',
       placeholder: '请选择出生日期',
       mode: "date",
       mode: "date",
       fields: "day",
       fields: "day",
-      start: '1970-01-01',
-      end: '2018-01-01',
       onChange: 'onPickerSelect',
       onChange: 'onPickerSelect',
     },
     },
     older_relativeData: {
     older_relativeData: {
@@ -1101,7 +1099,7 @@ Page({
           if (data.loan_before_marry && data.loan_before_marry.length) {
           if (data.loan_before_marry && data.loan_before_marry.length) {
             var beforemarryData = this.data.beforemarryData
             var beforemarryData = this.data.beforemarryData
             beforemarryData.selected = data.loan_before_marry=='y'?'是':'否'
             beforemarryData.selected = data.loan_before_marry=='y'?'是':'否'
-            if (!this.data.hasLover){//健壮
+            if (!this.data.hasLover){//健壮（有配偶时不需要设置）
               this.handleBeforemarry(data.loan_before_marry == 'y')
               this.handleBeforemarry(data.loan_before_marry == 'y')
             }
             }
             setData.beforemarryData = beforemarryData
             setData.beforemarryData = beforemarryData
@@ -2182,10 +2180,13 @@ Page({
   //   } 
   //   } 
   // },
   // },
   handleBeforemarry: function (beforemarry) {
   handleBeforemarry: function (beforemarry) {
-    var hasLover = beforemarry
+    var hasLover = this.data.hasLover
     var deduction_amount = beforemarry ? (Deduce_amounts_month["house_fund_loan"] / 2) : Deduce_amounts_month["house_fund_loan"]
     var deduction_amount = beforemarry ? (Deduce_amounts_month["house_fund_loan"] / 2) : Deduce_amounts_month["house_fund_loan"]
-    this.data.hasLoverData.selected = beforemarry ? '是' : '' 
     this.data.hasLoverData.disabled = beforemarry
     this.data.hasLoverData.disabled = beforemarry
+    if (beforemarry){
+      this.data.hasLoverData.selected =  '是'
+      hasLover = true
+    }
     this.setData({
     this.setData({
       hasLoverData: this.data.hasLoverData,
       hasLoverData: this.data.hasLoverData,
       hasLover: hasLover,
       hasLover: hasLover,
@@ -2389,7 +2390,7 @@ Page({
       //   })
       //   })
       //   break;
       //   break;
       case 'lovercardtype':
       case 'lovercardtype':
-        var lover_cardtypeData = this.data.lover_cardtypeData
+        var lover_cardtypeData = this.data.lovercardtypeData
         var new_type = lover_cardtypeData.values[e.detail.value]
         var new_type = lover_cardtypeData.values[e.detail.value]
         if (new_type != lover_cardtypeData.selected) {
         if (new_type != lover_cardtypeData.selected) {
           this.dealCardType(new_type, 'lovercardtype')
           this.dealCardType(new_type, 'lovercardtype')
@@ -2397,6 +2398,7 @@ Page({
             spouse_id_card_no: ""
             spouse_id_card_no: ""
           })
           })
         }
         }
+        break;
       case 'loverbirthday':
       case 'loverbirthday':
         var lover_birthDate = this.data.loverbirthDate
         var lover_birthDate = this.data.loverbirthDate
         lover_birthDate.selected = e.detail.value
         lover_birthDate.selected = e.detail.value