From 9e98eea8f4f2826ca13afbc3d1ef76d04995b307 Mon Sep 17 00:00:00 2001
From: expressgy <x71291@outlook.com>
Date: Mon, 1 Jul 2024 18:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/pacman.css           |  1 -
 src/components/Pacman/index.vue |  4 ++--
 src/views/SignIn/index.vue      | 22 +++++++++++++---------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/assets/pacman.css b/src/assets/pacman.css
index 2d0531a..3690c24 100644
--- a/src/assets/pacman.css
+++ b/src/assets/pacman.css
@@ -8,7 +8,6 @@
     align-items: center;
     justify-content: center;
     z-index: 10000;
-    border: 2px solid #cdcdcd;
 }
 
 .ear{
diff --git a/src/components/Pacman/index.vue b/src/components/Pacman/index.vue
index 07abc71..38d5ce9 100644
--- a/src/components/Pacman/index.vue
+++ b/src/components/Pacman/index.vue
@@ -4,8 +4,8 @@ defineProps(['loading']);
 </script>
 
 <template>
-    <div class="pacmanBox">
-        <div v-if="loading" class="pacmanLoader">
+    <div v-if="loading" class="pacmanBox">
+        <div class="pacmanLoader">
             <div class="pacman">
                 <div></div>
                 <div></div>
diff --git a/src/views/SignIn/index.vue b/src/views/SignIn/index.vue
index 85852af..411d9a8 100644
--- a/src/views/SignIn/index.vue
+++ b/src/views/SignIn/index.vue
@@ -7,7 +7,7 @@ import user from '@/components/icons/user.vue';
 import { NSwitch } from 'naive-ui';
 import { Sign } from '@/api/index.js';
 import { useRouter } from 'vue-router';
-import Pacman from '@/components/Pacman/index.vue'
+import Pacman from '@/components/Pacman/index.vue';
 
 
 const systemStore = useSystemStore();
@@ -29,7 +29,7 @@ const userTarget = ref(false);
 const passTarget = ref(false);
 
 // ! 正在登陆
-const isLoading = ref(false)
+const isLoading = ref(false);
 
 // ! 获取用户名输入
 const restrictUsername = (event) => {
@@ -58,12 +58,16 @@ const handleSignIn = async () => {
         return passTarget.value = true;
     }
     isLoading.value = true;
-    const resd = await Sign.signIn(username.value, password.value);
-    systemStore.setToken({
-        ...resd,
-        remember: toValue(remember),
-    });
-    // router.push(systemStore.defaultRoute);
+    try {
+        const resd = await Sign.signIn(username.value, password.value);
+        systemStore.setToken({
+            ...resd,
+            remember: toValue(remember),
+        });
+        router.push(systemStore.defaultRoute);
+    }catch(err) {
+        isLoading.value = false;
+    }
 };
 
 // ! 聚焦
@@ -79,6 +83,7 @@ const handleFocus = (name) => {
 <template>
     <div class="SignIn">
         <div class="maskLayer">
+            <Pacman :loading="isLoading"/>
             <div class="container">
                 <header>{{ systemStore.title }}</header>
                 <main>
@@ -86,7 +91,6 @@ const handleFocus = (name) => {
                         <div><img :src="hutao" alt="" /></div>
                     </div>
                     <div class="right">
-                        <Pacman :loading="isLoading"/>
                         <header>
                             <div>登录</div>
                         </header>