From 373fd88226bf3598d8d38fb161c1f64192c8ecd8 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 9 Apr 2025 10:46:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E9=97=A8=E5=BA=97=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/components/SidebarLogo.vue | 5 ++++-
 src/store/modules/user.ts                                | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue
index 1e8491c..8a8bd70 100644
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -53,7 +53,10 @@ async function geiShopList() {
 async function handleCommand(command) {
   console.log(command)
   let res = state.branchList.filter(v => v.shopId == command)[0]
-  // localStorage.setItem("shopId", res.shopId )
+  // localStorage.getItem("shopId")
+  if (localStorage.getItem("shopId") == command) {
+    return
+  }
   await ShopApi.getBranchChange(res.shopId)
   // localStorage.setItem("branch_shopId", res.shopId)
   localStorage.setItem("shopName", res.shopName)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 296ff1b..5c6e0be 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -38,7 +38,7 @@ export const useUserStore = defineStore("user", () => {
           setToken(token);
           setRefreshToken(token);
           localStorage.setItem("shopId", "" + data.shopInfo.id);
-          localStorage.setItem("branch_shopId",data.shopInfo.id)
+          localStorage.setItem("branch_shopId", data.shopInfo.id)
           resolve();
         })
         .catch((error) => {
@@ -52,16 +52,17 @@ export const useUserStore = defineStore("user", () => {
    *
    * @returns {UserInfo} 用户信息
    */
-  function getUserInfo() {
+  function getUserInfo(shopId?: string | number) {
     return new Promise<UserInfo>((resolve, reject) => {
-      ShopApi.get({ id: userInfo.value.shopId })
+      ShopApi.get({ id: shopId || userInfo.value.shopId })
         .then((data) => {
           if (!data) {
             reject("Verification failed, please Login again.");
             return;
           }
           console.log(userInfo)
-          localStorage.setItem("shopId", "" + userInfo.value.shopId);
+          console.log(data)
+          localStorage.setItem("shopId", "" + data.id);
           Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: userInfo.value.shopId });
           resolve(userInfo.value);
         })