Merge branch 'develop/0.0.2(样式修改)' into test

src/hooks/index.js

@@ -79,6 +79,7 @@ export function useBusinessSelect(type) {
 
 // 门店筛选
 import { storeSelect } from "@/api/business/list";
+import useUserStore from "@/store/modules/user";
 
 export function useStoreSelect(type) {
   const storeData = reactive({
@@ -94,14 +95,17 @@ export function useStoreSelect(type) {
     storeSelect(storeData.form).then((res) => {
       if (res.code === 0) {
         storeData.options = res.data;
-        if (type && res.data.length > 1) {
+        if (
+          type &&
+          res.data.length > 1 &&
+          useUserStore().storeIds.length !== 0
+        ) {
           storeData.options.unshift({
             id: 0,
             name: "全部",
           });
         }
-        storeData.storeId =
-          storeData.options.length > 0 ? storeData.options[0].id : null;
+        storeData.storeId = storeData.options.length > 0 ? storeData.options[0].id : null;
       }
     });
   };

src/store/modules/user.js

@@ -11,6 +11,7 @@ const useUserStore = defineStore(
       name: '',
       avatar: '',
       userId: '',
+      storeIds: [],
       roles: [],
       permissions: []
     }),
@@ -37,7 +38,6 @@ const useUserStore = defineStore(
           getInfo().then(res => {
             const user = res.user
             const avatar = (user.avatar == "" || user.avatar == null) ? defAva : user.avatar;
-            const userId = user.userId
             if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
               this.roles = res.roles
               this.permissions = res.permissions
@@ -47,7 +47,8 @@ const useUserStore = defineStore(
             this.id = user.userId
             this.name = user.userName
             this.avatar = avatar
-            this.userId = userId
+            this.userId = user.userId
+            this.storeIds = user.storeIds
             resolve(res)
           }).catch(error => {
             reject(error)