Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store

2025-04-09 17:33:05 +08:00
parent fd3167d325 f1e85eeb27
commit d3e18f3a8c
5 changed files with 23 additions and 43 deletions
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -63,7 +63,7 @@ export const useUserStore = defineStore("user", () => {
          console.log(userInfo)
          console.log(data)
          localStorage.setItem("shopId", "" + data.id);
-          Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: userInfo.value.shopId });
+          Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: data.id });
          resolve(userInfo.value);
        })
        .catch((error) => {