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

diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index f36717b..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">
-          <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',
@@ -176,12 +175,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 +188,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 });

--
Gitblit v1.9.1