瀏覽代碼

手机号和验证码已显示正确,又一次的更改手机号,点击提交时验证码栏显示红色线框并提示手机号已修改请重新获取验证码

hangb 7 年之前
父節點
當前提交
569cd80e0f

+ 4 - 1
components/appeal/AccountAppeal.vue

@@ -346,8 +346,11 @@
                 return Promise.reject(response.data)
               }
             }).catch(err => {
-              this.isShowLoading = false
               this.$message.error(err.errMsg)
+              this.isShowLoading = false
+              this.codeErrorChecked = true
+              this.codeChecked = false
+              this.account_time = 0
             })
         }
       },

+ 12 - 3
components/appeal/ChangeManagerAppeal.vue

@@ -215,6 +215,7 @@
         if (value === '') {
           callback(new Error('请填写正确的企业名称'))
           this.spaceNameChecked = false
+          this.isSpaceNameExist = false
         } else {
           if (this.changeManager.spaceName !== '') {
             if (value.length > 20) {
@@ -606,8 +607,11 @@
                 return Promise.reject(response.data)
               }
             }).catch(err => {
-              this.isShowLoading = false
               this.$message.error(err.errMsg)
+              this.isShowLoading = false
+              this.codeErrorChecked = true
+              this.codeChecked = false
+              this.account_time = 0
             })
         }
       },
@@ -759,8 +763,13 @@
     text-align: left;
   }
   span.tip.codeError-tip {
-    right: -112px;
-    color: #f56c6c;
+    position: absolute;
+    top: 3px;
+    left: 378px;
+    width: 200px;
+    text-align: left;
+    color: #ff4949;
+    font-size: 12px;
   }
   i{
     position: absolute;

+ 1 - 1
components/certification/EnterpriseCertification.vue

@@ -434,8 +434,8 @@
                 return Promise.reject(response.data)
               }
             }).catch(err => {
-              this.isShowLoading = false
               this.$message.error(err.errMsg)
+              this.isShowLoading = false
             })
         }
       },

+ 4 - 1
components/change/ChangeManagerSecondStep.vue

@@ -252,8 +252,11 @@
                 return Promise.reject(response.data)
               }
             }).catch(err => {
+              this.$message.error(err.errMsg)
               this.isShowLoading = false
-              console.log(err)
+              this.secondStepCodeErrorChecked = true
+              this.secondCodeChecked = false
+              this.second_step_time = 0
             })
         }
       },

+ 1 - 1
components/login/Login.vue

@@ -77,7 +77,7 @@
       <el-dialog class="dialog"
                  :visible.sync="dialogVisible"
                  size="tiny">
-        <div class="x-floating x-list">
+        <div class="x-floating x-list" v-show="dialogVisible">
           <div class="x-list-header">您要登录的公司是:</div>
           <ul class="list-unstyled" v-for="space in this.enterprise">
             <li v-text="space.name" @click="chooseOneEnterprise(false, space.id)">华商龙科技有限公司</li>

+ 6 - 3
components/register/EnterpriseRegistration.vue

@@ -13,7 +13,7 @@
             </el-form-item>
             <el-form-item prop="code">
               <el-input type="text" v-model="enterprise.code"
-                                    v-bind:class="{ active: this.codeErrorChecked }"
+                                    v-bind:class="{ active: codeErrorChecked }"
                                     auto-complete="off"
                                     class="msg"
                                     placeholder="短信验证码"></el-input>
@@ -69,7 +69,7 @@
                         v-model="enterprise1.password"
                         auto-complete="off"
                         placeholder="密码确认"
-                        v-bind:class="{ correct: this.passwordChecked }"></el-input>
+                        v-bind:class="{ correct: passwordChecked }"></el-input>
               <span class="sure" v-if="isHasRegister" v-show="phoneIsRegisterTip">手机号已注册,请输入原密码 <a href="/reset/ForgetPasswordValidationAccount">忘记密码?</a></span>
             </el-form-item>
             <el-form-item prop="confirm" v-if="!isHasRegister">
@@ -536,8 +536,11 @@
                 return Promise.reject(response.data)
               }
             }).catch(err => {
-              this.isShowLoading = false
               this.$message.error(err.errMsg)
+              this.isShowLoading = false
+              this.codeErrorChecked = true
+              this.codeChecked = false
+              this.enterprise_time = 0
             })
         }
       },

+ 5 - 2
components/register/PersonalRegistration.vue

@@ -34,7 +34,7 @@
             </el-form-item>
             <el-form-item prop="code">
               <el-input type="text" v-model="item.code"
-                        v-bind:class="{ active: this.codeErrorChecked }" auto-complete="off" class="msg" placeholder="短信验证码"></el-input>
+                        v-bind:class="{ active: codeErrorChecked }" auto-complete="off" class="msg" placeholder="短信验证码"></el-input>
               <el-button type="primary" class="code"
                          v-show="sendPersonalCode"
                          @click="getCheckCode"
@@ -338,8 +338,11 @@
                 return Promise.reject(response.data)
               }
             }).catch(err => {
-              this.isShowLoading = false
               this.$message.error(err.errMsg)
+              this.isShowLoading = false
+              this.codeErrorChecked = true
+              this.codeChecked = false
+              this.personal_time = 0
             })
         }
       },

+ 2 - 4
components/reset/ChangePasswordChooseStyle.vue

@@ -93,10 +93,10 @@
       </div>
       <div class="content" v-show="showEmailValid">
         <div class="content-top">
-          <h3>验证手机</h3>
+          <h3>密码重置</h3>
           <div class="step">
             <img src="/images/all/step01.png" alt=""/>
-            <div class="step-item"><span class="active">账号验证</span><span>新手机号码</span><span>设置完成</span></div>
+            <div class="step-item"><span class="active">账号验证</span><span>密码设置</span><span>设置完成</span></div>
             <a href="" class="return"><img src="/images/all/return.png" alt=""/></a>
           </div>
         </div>
@@ -334,10 +334,8 @@
               if (response.data.success) {
                 this.isShowLoading = false
                 this.$store.commit('login/GET_TOKEN', response.data.content.token)
-                this.showPhoneValid = false
                 this.$router.push({ path: '/reset/passwordResetValidQuestion' })
               } else {
-                this.showPhoneValid = true
                 return Promise.reject(response.data)
               }
             }).catch(err => {

+ 0 - 1
components/reset/PasswordResetNewPassword.vue

@@ -121,7 +121,6 @@
         }
       }
       var validateConfirm = (rule, value, callback) => {
-        console.log(callback)
         if (value === '') {
           callback(new Error('请再次输入密码'))
           this.showPasswordError = false

+ 6 - 2
components/validation/PhoneValidation.vue

@@ -142,7 +142,7 @@
           this.codeChecked = false
         } else {
           if (this.valid.code !== '') {
-            if (this.token !== '') {
+            if (this.token) {
               if (this.valid.code !== '' && this.getMobile !== '') {
                 let param = new FormData()
                 param.append('mobile', this.getMobile)
@@ -165,7 +165,11 @@
                     this.codeErrorMsg = err.errMsg
                   })
               }
-            } else {}
+            } else {
+              callback(new Error('请先获取验证码'))
+              this.codeChecked = false
+              this.codeErrorChecked = false
+            }
           }
           callback()
         }

+ 13 - 4
components/validation/PhoneValidationSecondStep.vue

@@ -78,8 +78,10 @@
           this.secondCodeChecked = false
         } else {
           if (this.valid2.code !== '') {
-            if (this.secondToken !== '') {
-              if (this.valid2.code !== '' && this.valid2.mobile !== '') {
+            if (this.valid2.mobile === '') {
+              callback(new Error('请先填写正确的手机号'))
+            } else {
+              if (this.secondToken) {
                 let param = new FormData()
                 param.append('mobile', this.valid2.mobile)
                 param.append('code', this.valid2.code)
@@ -100,8 +102,12 @@
                   }).catch(err => {
                     this.secondCodeErrorMsg = err.errMsg
                   })
+              } else {
+                callback(new Error('请先获取验证码'))
+                this.codeChecked = false
+                this.codeErrorChecked = false
               }
-            } else {}
+            }
           }
           callback()
         }
@@ -189,8 +195,11 @@
                 return Promise.reject(response.data)
               }
             }).catch(err => {
+              this.$message.error(err.errMsg)
               this.isShowLoading = false
-              console.log(err)
+              this.secondStepCodeErrorChecked = true
+              this.secondCodeChecked = false
+              this.second_step_time = 0
             })
         }
       },