From 4b2b8c172865dc06736422c710a9da0e5b8a473a Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Fri, 21 Apr 2023 14:20:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E4=B9=8B=E5=90=8E=E6=9F=A5=E8=AF=A2=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/Login/index.vue | 45 +++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue
index ce2fdc2f..4e563dc3 100644
--- a/src/views/user/Login/index.vue
+++ b/src/views/user/Login/index.vue
@@ -163,14 +163,14 @@
 <script setup lang="ts">
 import { getImage } from '@/utils/comm';
 import {
-    config,
-    code,
-    authLogin,
-    getInitSet,
-    systemVersion,
-    bindInfo,
-    settingDetail,
-} from '@/api/login';
+  config,
+  code,
+  authLogin,
+  getInitSet,
+  systemVersion,
+  bindInfo,
+  settingDetail, userDetail
+} from '@/api/login'
 import { useUserInfo } from '@/store/userInfo';
 import { LocalStore } from '@/utils/comm';
 import { BASE_API_PATH, TOKEN_KEY, Version_Code } from '@/utils/variable';
@@ -250,18 +250,29 @@ const onFinish = async () => {
         const res: any = await authLogin(form);
         loading.value = false;
         if (res.success) {
+          LocalStore.set(TOKEN_KEY, res?.result.token);
+          const userResp = await userDetail()
+          if (userResp.success) {
             store.$patch({
-                ...res.result,
-                username: form.username,
+              userInfos: {
+                ...userResp.result,
+                token: res?.result.token,
+              },
+              isAdmin: userResp.username === "admin",
             });
-            LocalStore.set(TOKEN_KEY, res?.result.token);
-            if (res.result.user?.username === 'admin') {
-                const resp: any = await getInitSet();
-                if (resp.status === 200 && !resp.result.length) {
-                    window.location.href = '/#/init-home';
-                    return;
-                }
+
+            if (userResp.result?.username === 'admin') {
+              const resp: any = await getInitSet();
+              if (resp.status === 200 && !resp.result.length) {
+                window.location.href = '/#/init-home';
+                return;
+              }
             }
+          } else {
+            store.$patch({
+              ...res.result
+            });
+          }
             window.location.href = '/';
         }
     } catch (error) {