关联必填项

@@ -1230,19 +1230,33 @@ Page({
       this.showtoast('手机号码有误');
       return
     }
+    if (formdata.current_address_detail.length > 0 && this.data.currentaddressInfo.selected.length < 1) {
+      this.showtoast('请选择居住地址');
+      return
+    }
     if (this.data.curAddress_haschanged) {//选择了地址 || this.data.taxInfo.current_address.province_code
       if (formdata.current_address_detail.length < 1) {
         this.showtoast('请填写详细居住地址');
         return
       }
     }
+    if (formdata.huji_address_detail.length > 0 && this.data.birthaddressInfo.selected.length < 1) {
+      this.showtoast('请选择户籍地址');
+      return
+    }
     if (this.data.birthAddress_haschanged) {//选择了地址 || this.data.taxInfo.huji_address.province_code
       if (formdata.huji_address_detail.length < 1) {
         this.showtoast('请填写详细户籍地址');
         return
       }
     }
-    if (this.data.contactAddress_haschanged) {//选择了地址 || this.data.taxInfo.contact_address.province_code
+    if (this.data.hasOtherCard && formdata.contact_address_detail.length > 0) {
+      if (this.data.contactaddressInfo.selected.length < 1) {
+        this.showtoast('请选择联系地址');
+        return
+      }
+    }
+    if (this.data.hasOtherCard && this.data.contactAddress_haschanged) {//选择了地址 || this.data.taxInfo.contact_address.province_code
       if (formdata.contact_address_detail.length < 1) {
         this.showtoast('请填写详细联系地址');
         return
@@ -1256,21 +1270,17 @@ Page({
     //   this.showtoast('邮箱格式有误');
     //   return
     // }
+    if (this.data.bankInfo.selected.length > 0 && formdata.bank_account.length < 1) {
+      this.showtoast('请输入银行卡号')
+      return
+    }
     if (formdata.bank_account && formdata.bank_account.length > 0) {
       if (!format.banknoCheck(formdata.bank_account)){
-        wx.showToast({
-          title: '银行卡号格式有误',
-          duration: 2000,
-          icon: 'none'
-        })
+        this.showtoast('银行卡号格式有误')
         return
       }
       if (!this.data.bankInfo.selected) {
-        wx.showToast({
-          title: '请选择开户银行',
-          duration: 2000,
-          icon: 'none'
-        })
+        this.showtoast('请选择开户银行')
         return
       }
     }
@@ -1370,8 +1380,8 @@ Page({
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "comment": formdata.comment,
         
-        "contact_address": request_contact_address,
-        "contact_address_detail": formdata.contact_address_detail,
+        "contact_address": that.data.hasOtherCard ? request_contact_address : {},
+        "contact_address_detail": that.data.hasOtherCard ? formdata.contact_address_detail: '',
         
         // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date,
         // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date,