From fbc213a1ebf9bf9d41c778c16f50b81c05711fba Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期一, 17 四月 2023 15:58:34 +0800
Subject: [PATCH] 拼图校验完成。
---
src/views/user/login.vue | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index 3096f7a..902a814 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -41,9 +41,8 @@
<drag-verify @success="verifyTrue" ref="verify"/>
</el-form-item>
<el-form-item v-if="loginForm.verifyType==='jigsaw'">
-<!-- <drag-verify @success="verifyTrue" ref="verify"/>-->
<transition duration="1000" name="el-fade-in" v-if="verify">
- <jigsaw-verify v-if="loginForm.verifyType==='jigsaw'" :left="left" :top="top" @hide="verifyFalse" @success="handleLogin" />
+ <jigsaw-verify :left="left" :top="top" @hide="verifyFalse" @success="handleLogin" />
</transition>
</el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
@@ -176,46 +175,47 @@
this.loginForm.rememberMe = rememberMe === undefined ? this.loginForm.rememberMe : rememberMe
},
handleLogin(param) {
- // 鎷煎浘楠岃瘉 娌℃湁杩斿洖param鏃跺��
- if(this.loginForm.verifyType==='jigsaw' && !param.uuid){
- this.verify = true
- return false
- }
- // 鎷煎浘楠岃瘉 杩斿洖param鏃跺��
- if(this.loginForm.verifyType==='jigsaw' && param.uuid){
+ if(this.loginForm.verifyType==='jigsaw' && param != null && param.uuid != null){
// 鎷煎浘楠岃瘉鐮佹椂锛岃皟鐢ㄦ柟浼氫紶鍏ode锛堢敤鎴烽獙璇佺爜浣嶇疆锛夛紝uuid
this.loginForm.code = param.x;
this.loginForm.uuid = param.uuid;
+ // this.verify = false;
}
this.$refs.loginForm.validate(valid => {
- if (valid) {
- if (this.loginForm.verifyType==='slide' && !this.verify) {
- this.$message.error('璇峰厛瀹屾垚楠岃瘉')
- this.loading = false
- return
- }
- this.loading = true;
- if (this.loginForm.rememberMe) {
- Cookies.set("username", this.loginForm.username, { expires: 30 });
- Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
- Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
- } else {
- Cookies.remove("username");
- Cookies.remove("password");
- Cookies.remove('rememberMe');
- }
- // console.log(this.loginForm);
- // console.log("-----------------------------");
- this.$store.dispatch("Login", this.loginForm).then(() => {
- this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
- }).catch(() => {
- this.loading = false;
- if (this.captchaEnabled && this.loginForm.verifyType==='code') {
- this.getCode();
- }
- });
+ if (valid) {
+ if (this.loginForm.verifyType==='slide' && !this.verify) {
+ this.$message.error('璇峰厛瀹屾垚楠岃瘉')
+ this.loading = false
+ return
}
- });
+ if(this.loginForm.verifyType==='jigsaw' && this.loginForm.uuid == ''){
+ // 寮瑰嚭鎷煎浘楠岃瘉鐮侊紝2023-04-16
+ this.verify = true;
+ return;
+ }
+
+ this.loading = true;
+ if (this.loginForm.rememberMe) {
+ Cookies.set("username", this.loginForm.username, { expires: 30 });
+ Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
+ Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+ } else {
+ Cookies.remove("username");
+ Cookies.remove("password");
+ Cookies.remove('rememberMe');
+ }
+ // console.log(this.loginForm);
+ // console.log("-----------------------------");
+ this.$store.dispatch("Login", this.loginForm).then(() => {
+ this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+ }).catch(() => {
+ this.loading = false;
+ if (this.captchaEnabled && this.loginForm.verifyType==='code') {
+ this.getCode();
+ }
+ });
+ }
+ });
}
}
};
--
Gitblit v1.9.1