From ec4480e386de8cc79f1ec93ac7fa4db1ac87e5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Tue, 12 Mar 2024 20:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=93=8D=E5=BA=94=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20#99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/app/t-sidebar.vue       | 25 +++++++++++++++++--------
 src/components/config/tc-userBadge.vue |  9 +++++++--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/app/t-sidebar.vue b/src/components/app/t-sidebar.vue
index e6fa3473..294584aa 100644
--- a/src/components/app/t-sidebar.vue
+++ b/src/components/app/t-sidebar.vue
@@ -253,14 +253,19 @@ const userStore = storeToRefs(useUserStore());
 
 const isDevEnv = ref<boolean>(import.meta.env.MODE === "development");
 
-const userInfo = computed(() => {
-  const info = userStore.briefInfo.value;
-  if (info && info.nickname) return info;
-  return {
-    nickname: "未登录",
-    avatar: "/source/UI/lumine.webp",
-  };
+const userInfo = ref({
+  nickname: "未登录",
+  uid: "-1",
+  desc: "请扫码登录",
+  avatar: "/source/UI/lumine.webp",
 });
+
+watch(userStore.briefInfo, (val) => {
+  if (val && val.nickname) {
+    userInfo.value = val;
+  }
+});
+
 const rail = ref(appStore.sidebar.collapse);
 // theme
 const themeGet = computed({
@@ -295,6 +300,9 @@ onMounted(async () => {
   if (TauriWindow.getCurrent().label === "TeyvatGuide") {
     await mhyClient.run();
   }
+  if (userStore.briefInfo.value && userStore.briefInfo.value.nickname) {
+    userInfo.value = userStore.briefInfo.value;
+  }
 });
 
 async function switchTheme(): Promise<void> {
@@ -311,7 +319,8 @@ async function openClient(func: string): Promise<void> {
 
 function login(): void {
   showSnackbar({
-    text: "请前往设置页面扫码登录",
+    text: "请前往设置页面登录！",
+    color: "warn",
   });
 }
 
diff --git a/src/components/config/tc-userBadge.vue b/src/components/config/tc-userBadge.vue
index 49ab732f..feac33d6 100644
--- a/src/components/config/tc-userBadge.vue
+++ b/src/components/config/tc-userBadge.vue
@@ -19,7 +19,7 @@
 import { event, window as windowTauri } from "@tauri-apps/api";
 import type { UnlistenFn } from "@tauri-apps/api/helpers/event";
 import { storeToRefs } from "pinia";
-import { onMounted, onUnmounted, ref } from "vue";
+import { onMounted, onUnmounted, ref, watch } from "vue";
 
 import TGSqlite from "../../plugins/Sqlite";
 import { useAppStore } from "../../store/modules/app";
@@ -58,6 +58,12 @@ onMounted(() => {
   }
 });
 
+watch(userStore.briefInfo, (v) => {
+  if (v && v.nickname) {
+    userInfo.value = v;
+  }
+});
+
 async function toWebLogin(): Promise<void> {
   const confirm = await showConfirm({
     title: "请在子窗口中完成登录操作",
@@ -218,7 +224,6 @@ async function getTokenWeb(cookie: string): Promise<void> {
     text: "登录成功!",
     color: "success",
   });
-  console.log("cookieUser", cookieUser);
 }
 
 async function refreshUser() {