From c7bc3eb18e1fda4254ca0195e2133d2ed978de11 Mon Sep 17 00:00:00 2001
From: china <527956374@qq.com>
Date: 星期四, 11 五月 2023 17:48:48 +0800
Subject: [PATCH] 样式调整
---
src/views/user/login.vue | 58 ++++++++++++++++++++++------------------------------------
1 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index 6e8be39..bc8b968 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="jigsawLogin" />
+ <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>
@@ -156,6 +155,7 @@
// 鎷煎浘鏂瑰紡锛岀湅闇�瑕佸暐鍙傛暟锛屾殏鏈疄鐜�
console.log('jigsaw...');
this.loginForm.code = 'jigsaw'; // 濉厖code榛樿鍊硷紝鍚﹀垯楠岃瘉涓嶉�氳繃銆�2023-04-06
+ this.loginForm.uuid = ''; // 娓呯┖楠岃瘉鐮侊紝涓轰笅娆￠噸鏂伴獙璇佸噯澶囥��2023-04-16
} else if(this.loginForm.verifyType==='slide' || this.loginForm.verifyType==='sms'){
// 涓嶉渶瑕侀獙璇佺爜锛屼絾浠嶉渶瑕佽姹傛帴鍙ｈ幏鍙杣uid
@@ -176,46 +176,25 @@
this.loginForm.rememberMe = rememberMe === undefined ? this.loginForm.rememberMe : rememberMe
},
handleLogin(param) {
- if(this.loginForm.verifyType==='jigsaw' && param != null){
+ if(this.loginForm.verifyType==='jigsaw' && param != null && param.uuid != null){
// 鎷煎浘楠岃瘉鐮佹椂锛岃皟鐢ㄦ柟浼氫紶鍏ode锛堢敤鎴烽獙璇佺爜浣嶇疆锛夛紝uuid
this.loginForm.code = param.x;
this.loginForm.uuid = param.uuid;
- this.verify = true
- }else{
- 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();
- }
- });
- }
- });
+ // this.verify = false;
}
- },
- jigsawLogin(){
this.$refs.loginForm.validate(valid => {
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 });
@@ -226,10 +205,17 @@
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) {
+ // if(this.loginForm.verifyType==='code'){
+ // }
+ this.getCode();
+ }
});
}
});
--
Gitblit v1.9.1