修改师资培训报名信息提交和注册交互

src/pages/train/form.vue

@@ -59,7 +59,7 @@
           <el-input v-model="form.opening_bank_account"></el-input>
         </el-form-item>
         <el-form-item label="发票内容" id="sh" label-width="110px">
-          <el-input v-model="form.invoice_detail"></el-input>
+          <el-input v-model="form.invoice_detail" readonly></el-input>
         </el-form-item>
         <el-form-item label="手机号码" label-width="110px">
           <el-input v-model="form.mobile"></el-input>
@@ -101,7 +101,7 @@
           </el-upload>
         </el-form-item> -->
         <el-form-item label-width="110px">
-          <el-button style="width:200px;margin-left:44px;" type="primary" @click="onSubmit">提 交</el-button>
+          <el-button style="width: 200px; margin-left: 44px" type="primary" @click="onSubmit">提 交</el-button>
           <!-- <el-button @click="back">返回</el-button> -->
         </el-form-item>
       </el-form>
@@ -111,9 +111,9 @@
 <script>
 import action from '@action'
 import breadcrumb from '@/components/breadcrumb'
-const IDCARD_REG = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/;
-const MOBILE_REG = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/;
-const EMAIL_REG = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/;
+const IDCARD_REG = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/
+const MOBILE_REG = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+const EMAIL_REG = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
 export default {
   components: {
     breadcrumb
@@ -207,7 +207,7 @@ export default {
       } else if (!EMAIL_REG.test(this.form.email)) {
         this.$message('邮箱格式错误')
       } else {
-        this.defaultRegister()
+        /* this.defaultRegister()
         .then((res) => {
           return this.sendEnrollInfo()
         },(error) => {
@@ -225,6 +225,52 @@ export default {
           if (error && error.msg) errorMsg = error.msg
           this.$message.error(errorMsg)
         }).finally((data) => {
+        }) */
+        /* Promise.all([this.defaultRegister(), this.sendEnrollInfo()])
+          .then(res => {
+            console.log(res)
+          })
+          .catch(error => {
+            console.log(error)
+          }) */
+        /* Promise.all([this.defaultRegister(), this.sendEnrollInfo()])
+          .then(res => {
+            console.log(res)
+          })
+          .catch(err => {
+            console.log(err)
+          }) */
+          let arr = [this.defaultRegister(), this.sendEnrollInfo()];
+          Promise.all(arr.map((promise)=>promise.catch((e)=>{
+            return e
+            })))
+          .then(res => {
+            let msg = ''
+            let registerError = '';
+            let enrollError = '';
+            res.forEach(item => {
+              if (item.type === 'register') {
+                if (item.state === 'fail') registerError = item.msg
+              } else {
+                if (item.state === 'fail') enrollError = item.msg
+              }
+            })
+            console.log(registerError, enrollError)
+            if(!registerError && !enrollError) {
+              this.$message.success('报名信息提交成功！')
+              setTimeout(() => {
+                this.$message.success('手机号注册成功！')
+              }, 300)
+            } else if (registerError && !enrollError) {
+              this.$message.success('报名信息提交成功！')
+              setTimeout(() => {
+                this.$message.error('注册失败，' + registerError)
+              }, 300)
+            } else {
+              this.$message.error(enrollError)
+            }
+          })
+          .catch(err => {
           })
       }
     },
@@ -232,9 +278,17 @@ export default {
       let promise = new Promise((resolve, reject) => {
         action.articleAction.formCommit(this.form).then(res => {
           if (res && res.code === 200) {
-            resolve('enroll success')
+            resolve({
+              type: 'enroll',
+              state: 'success',
+              msg: '报名信息提交成功'
+            })
           } else {
-            reject(res)
+            reject({
+              type: 'enroll',
+              state: 'fail',
+              msg: res.msg || '报名信息提交失败'
+            })
           }
         })
       })
@@ -268,7 +322,7 @@ export default {
       }
     },
     btnDisabledTimer() {
-      let count = 3
+      let count = 60
       let timer = setInterval(() => {
         count--
         if (count < 1) {
@@ -291,11 +345,25 @@ export default {
       }
       let promise = new Promise((resolve, reject) => {
         action.articleAction.register(param).then(res => {
-          if (res && (res.code === 0 || res.code === 5)) {
+          if (res && res.code === 0) {
             //code: 0注册成功 5已注册
-            resolve('success')
+            resolve({
+              type: 'register',
+              state: 'success',
+              msg: 'success'
+            })
+          } else if (res && res.code === 5){
+            reject({
+              type: 'register',
+              state: 'fail',
+              msg: res.msg || '此手机号已经被注册'
+            })
           } else {
-            reject(res)
+            reject({
+              type: 'register',
+              state: 'fail',
+              msg: res.msg || '注册失败'
+            })
           }
         })
       })
@@ -304,11 +372,11 @@ export default {
       }) */
       return promise
     },
-    randomNickname () {
+    randomNickname() {
       const chars = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n']
       let str = ''
-      for(let i= 0; i<5; i++) {
-        let idx = parseInt(14*Math.random())
+      for (let i = 0; i < 5; i++) {
+        let idx = parseInt(14 * Math.random())
         str += chars[idx]
       }
       const timeStamp = Date.now()