Merge branch 'dev-caiji' into test

src/views/pages/caiji.vue

@@ -319,8 +319,8 @@ export default {
     let envShow = process.env.VUE_APP_NODE_ENV
     console.log('环境', envShow)
 
-    // let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',]
-    let internalShequId = ['1202807601961984002',]
+    let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',]
+    // let internalShequId = ['1202807601961984002',]
     // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境
     //   internalShequId = null
     // } else if (envShow === 'prod:uat') { // 体验
@@ -607,7 +607,7 @@ export default {
 
       this.memberList.forEach(element => {
 
-        if (element.name && element.idNum) {
+        if (element.name && element.name !== '' && element.idNum && element.idNum !== '') {
           element.customerId = this.customerId
           if (element.selDetNum && element.selDetNum.value) {
             element.heSuanCount = element.selDetNum.value
@@ -716,25 +716,27 @@ export default {
         return aletMessage
       }
 
+      if (this.memberList[0].length > 1) {
+        for (let i = 1; i < this.memberList.length; i++) {
+          let item = this.memberList[i]
 
-      for (let i = 1; i < this.memberList.length; i++) {
-        let item = this.memberList[i]
-
-        if (item.name || item.mobile || item.idNum || item.selDetNum.value || item.selDetCondition.value) {//填写了信息的，必须填写姓名身份证
-          if (!item.name || !item.idNum) {
-            aletMessage = '请完整填写用户' + (i + 1) + '的姓名和身份证信息'
+          if (item.name || item.mobile || item.idNum || item.selDetNum.value || item.selDetCondition.value) {//填写了信息的，必须填写姓名身份证
+            if (!item.name || !item.idNum) {
+              aletMessage = '请完整填写用户' + (i + 1) + '的姓名和身份证信息'
+              return aletMessage
+            }
+          } else {
+            aletMessage = '用户' + (i + 1) + '的信息没有填写，是否继续'
+            this.showMessagsBox = true
             return aletMessage
+
           }
-        } else {
-          aletMessage = '用户' + (i + 1) + '的信息没有填写，是否继续'
-          this.showMessagsBox = true
-          return aletMessage
 
         }
-
       }
 
 
+
     },
 
     popupOk () {