commit

src/main/resources/views/platform/sys/login.html

@@ -235,14 +235,14 @@
                                 </el-input>
                             </el-form-item>
                             <el-form-item prop="platformCaptcha">
-                                <el-input @keyup.enter.native="doLogin" placeholder="请输入手机动态码" prefix-icon="el-icon-unlock" v-model="loginForm.platformCaptcha">
-                                    <el-button @click="sendCode()" type="primary" slot="append">{{ codeMsg }}</el-button>
+                                <el-input placeholder="请输入手机动态码" prefix-icon="el-icon-unlock" v-model="loginForm.platformCaptcha">
+                                    <el-button @click="handleLogin" type="primary" slot="append">{{ codeMsg }}</el-button>
                                 </el-input>
                             </el-form-item>
                             <el-form-item>
                                 <el-button :disabled="disabled"
                                            :loading="loading"
-                                           @click.native.prevent="handleLogin"
+                                           @click.native.prevent="doLogin"
                                            class="login-button"
                                            type="primary">
                                     <span v-if="!loading">登 录</span>
@@ -385,7 +385,8 @@
                 Object.assign(this.loginForm, captcha);
                 const resp = await this.validVerify()
                 if(resp.code === 0) {
-                    await this.doLogin();
+                    this.isShowSliderVerify = false
+                    await this.sendCode();
                 } else {
                     this.$refs.sliderVerify.verifyFailEvent(resp.msg);
                 }
@@ -413,10 +414,11 @@
                 });
             },
             handleLogin() {
-                let self = this;
-                self.$refs.loginForm.validate((flag) => {
-                    self.isShowSliderVerify = flag;
-                });
+                this.$refs.loginForm.validateField('mobile', async (valid) => {
+                    if(!valid) {
+                        this.isShowSliderVerify = true;
+                    }
+                })
             },
             async doLogin() {
                 const valid = await this.$refs['loginForm'].validate()