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 |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index aa875b7..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,8 +85,8 @@
     return {
       verify:false,  // 婊戝姩鏍¢獙
       codeUrl: "",
-      left: null,    // 鎷煎浘楠岃瘉鐮佷綅缃�
-      top: null,     // 鎷煎浘楠岃瘉鐮佷綅缃�
+      left: '50%',    // 鎷煎浘楠岃瘉鐮佷綅缃�
+      top: '220px',     // 鎷煎浘楠岃瘉鐮佷綅缃�
       loginForm: {
         username: 'supervisor',
         password: '123456',
@@ -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'){
         // 涓嶉渶瑕侀獙璇佺爜锛屼絾浠嶉渶瑕佽姹傛帴鍙h幏鍙杣uid
@@ -176,11 +176,11 @@
       this.loginForm.rememberMe = rememberMe === undefined ? this.loginForm.rememberMe : rememberMe
     },
     handleLogin(param) {
-      // console.log(param);
-      if(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 = false;
       }
       this.$refs.loginForm.validate(valid => {
         if (valid) {
@@ -189,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 });
@@ -205,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