是否有配偶逻辑

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @4f070f3
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @4f070f3
@@ -34,6 +34,7 @@ Page({
   legal_entity_id: "",
   legal_entity: "",
   data: {
+    hasLover:false,
     house_type: "",
     deduction_amount: '',
     lable: 0,
@@ -44,6 +45,17 @@ Page({
     rentAddress_haschanged: false,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
     cur_index: '',
+
+    hasLoverData: {
+      label: '是否有配偶',
+      isrequre: true,
+      bindtype: 'hasLover',
+      selected: '',
+      isblack: 'true',
+      placeholder: '请选择',
+      values: ['是', '否'],
+      onChange: 'onPickerSelect'
+    },
     lovercardtypeData: {
       label: '配偶证照类型',
       bindtype: 'lovercardtype',
@@ -982,8 +994,12 @@ Page({
           this.showToast('请选择就读学校')
           return
         }
+        if (this.data.hasLoverData.selected.length < 1) {
+          this.showToast('请选择是否有配偶')
+          return
+        }
-        if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
+        if (this.data.hasLover) {
           if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
             this.showToast('请填写配偶姓名')
             return
@@ -1249,7 +1265,11 @@ Page({
           console.log('request_working_address', request_working_address)
           newdata.nation = "中国"
         }
-        if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
+        if (this.data.hasLoverData.selected.length < 1) {
+          this.showToast('请选择是否有配偶')
+          return
+        }
+        if (this.data.hasLover) {
           if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
             this.showToast('请填写配偶姓名')
             return
@@ -1396,6 +1416,15 @@ Page({
   onPickerSelect: function(e) {
     console.log('picker发送选择改变，携带值为', e)
     switch (e.currentTarget.id) {
+      case 'hasLover':
+        var hasLoverData = this.data.hasLoverData
+        hasLoverData.selected = hasLoverData.values[e.detail.value]
+        var hasLover = e.detail.value == '0'
+        this.setData({
+          hasLoverData: hasLoverData,
+          hasLover: hasLover
+        })
+        break;
       case 'lovercardtype':
         var lover_cardtypeData = this.data.lovercardtypeData
         lover_cardtypeData.selected = lover_cardtypeData.values[e.detail.value]
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @4f070f3
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @4f070f3
@@ -313,12 +313,15 @@
 <view style='padding:0 30rpx;'>
   <view wx:if="{{cur_index=='children_education' || cur_index=='house_fund'}}">
+    <template is="picker_cell_normal" data="{{...hasLoverData}}" />
+    <view class='divide_line_f5f5f5'></view>
+  </view>
+  <view wx:if="{{hasLover}}">
     <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='spouse_name' value='{{spouse_name}}'></input>
     </view>
     <view class='divide_line_f5f5f5'></view>
-
     <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
     <view class='divide_line_f5f5f5'></view>
     <view style='height:90rpx'>