From 0b67fd879ccd4fb6319dc016babd3bb8ea79dff0 Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期二, 25 四月 2023 18:47:35 +0800
Subject: [PATCH] 修改列表组件，支持属性子属性
---
src/views/user/login.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index c3cd50c..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">
- <jigsaw-verify v-if="loginForm.verifyType==='jigsaw'" :left="left" :top="top" @hide="verifyFalse" @success="handleLogin" />
+ <transition duration="1000" name="el-fade-in" v-if="verify">
+ <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>
@@ -86,15 +85,15 @@
return {
verify:false, // 婊戝姩鏍￠獙
codeUrl: "",
- left: null, // 鎷煎浘楠岃瘉鐮佷綅缃�
- top: null, // 鎷煎浘楠岃瘉鐮佷綅缃�
+ left: '50%', // 鎷煎浘楠岃瘉鐮佷綅缃�
+ top: '220px', // 鎷煎浘楠岃瘉鐮佷綅缃�
loginForm: {
username: 'supervisor',
password: '123456',
code:'',
uuid: '',
loginType: 'user_pass', // 鐢ㄦ埛鍚嶃�佸瘑鐮佹柟寮忕櫥褰�
- verifyType: 'slide'// 'code': 楠岃瘉鐮� 'slide':婊戝潡 'jigsaw':鎷煎浘
+ verifyType: 'jigsaw'// 'code': 楠岃瘉鐮� 'slide':婊戝潡 'jigsaw':鎷煎浘
// rememberMe: false,
},
loginRules: {
@@ -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,12 +176,11 @@
this.loginForm.rememberMe = rememberMe === undefined ? this.loginForm.rememberMe : rememberMe
},
handleLogin(param) {
- if(this.loginForm.verifyType==='jigsaw' && param != null){
- // console.log(param);
- // console.log("鎷煎浘鎻愪氦鍙傛暟");
+ 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) {
@@ -190,6 +189,12 @@
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 });
@@ -206,7 +211,9 @@
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
this.loading = false;
- if (this.captchaEnabled && this.loginForm.verifyType==='code') {
+ if (this.captchaEnabled) {
+ // if(this.loginForm.verifyType==='code'){
+ // }
this.getCode();
}
});
--
Gitblit v1.9.1