jmash-core-mp 0.1.68 → 0.1.69

package/lib/api/myorgan/index.d.ts

@@ -0,0 +1,8 @@
+import { ResponseData } from "../../api/types";
+import type { RolesPerms, UserInfo } from "../auth/types";
+declare class OrganUserApi {
+    userInfo(organTenant: string): Promise<ResponseData<UserInfo>>;
+    userRolesPerms(organTenant: string): Promise<ResponseData<RolesPerms>>;
+}
+export declare const organUserApi: OrganUserApi;
+export {};

package/lib/api/myorgan/index.js

@@ -0,0 +1,24 @@
+import mpx from "@mpxjs/core";
+class OrganUserApi {
+    // 获取当前会话用户
+    userInfo(organTenant) {
+        const config = getApp().globalData.config;
+        organTenant = organTenant || config.tenant;
+        return mpx.xfetch.fetch({
+            url: "/v1/rbac/auth/user?tenant=" + organTenant,
+            method: "GET",
+            header: { "Grpc-Metadata-Tenant": organTenant },
+        });
+    }
+    // 当前用户角色权限
+    userRolesPerms(organTenant) {
+        const config = getApp().globalData.config;
+        organTenant = organTenant || config.tenant;
+        return mpx.xfetch.fetch({
+            url: "/v1/rbac/auth/roles_perms?tenant=" + organTenant,
+            method: "GET",
+            header: { "Grpc-Metadata-Tenant": organTenant },
+        });
+    }
+}
+export const organUserApi = new OrganUserApi();

package/lib/api/shop/index.d.ts

@@ -1,10 +1,11 @@
 import { ResponseData } from "../../api/types";
-import { BranchPage, BranchPageReq, ShopInfoModel, BranchModel, ShopPage, ShopPageReq } from "./types";
+import { BranchPage, BranchPageReq, ShopInfoModel, BranchModel, ShopPage, ShopPageReq, ShopBranchsUsersModel } from "./types";
 declare class ShopApiImpl {
     findShopBranchPage(data: BranchPageReq): Promise<ResponseData<BranchPage>>;
     findShopPage(data: ShopPageReq): Promise<ResponseData<ShopPage>>;
     findShopInfoById(shopId: string): Promise<ResponseData<ShopInfoModel>>;
     findShopBranchById(organTenant: string, branchId: string): Promise<ResponseData<BranchModel>>;
+    findMyShopBranchUser(organTenant: string, branchId: string): Promise<ResponseData<ShopBranchsUsersModel>>;
 }
 declare const shopApi: ShopApiImpl;
 export { shopApi };

package/lib/api/shop/index.js

@@ -35,6 +35,17 @@ class ShopApiImpl {
         return mpx.xfetch.fetch({
             url: "/v1/front/shop/branch/id/" + organTenant + "/" + branchId,
             method: "GET",
+            header: { "Grpc-Metadata-Tenant": organTenant },
+        });
+    }
+    // 查询门店用户
+    findMyShopBranchUser(organTenant, branchId) {
+        const config = getApp().globalData.config;
+        organTenant = organTenant || config.tenant;
+        return mpx.xfetch.fetch({
+            url: "/v1/front/shop/branchs_users/my/" + organTenant + "/" + branchId,
+            method: "GET",
+            header: { "Grpc-Metadata-Tenant": organTenant },
         });
     }
 }

package/lib/api/shop/types.d.ts

@@ -14,17 +14,10 @@ export interface ShopInfoModel {
     latitude?: string;
     note?: string;
     businessPicUrl?: string;
-    idCard?: string;
-    idCardIns?: string;
-    mchName?: string;
-    bankName?: string;
-    bankCode?: string;
-    bankCodeIns?: string;
     status?: boolean;
     businessId?: string;
     regionCode?: string;
     adPics?: string;
-    accountName?: string;
     organId?: string;
     organTenant?: string;
     createBy?: string;
@@ -77,6 +70,10 @@ export interface BranchModel {
     distanceMeter?: string;
     organTenant?: string;
 }
+export interface BranchKey {
+    tenant?: string;
+    branchId?: string;
+}
 export interface BranchPageReq {
     tenant?: string;
     curPage?: number;
@@ -103,3 +100,24 @@ export interface BranchPage {
     totalSize: number;
     pageCount: number;
 }
+export interface ShopBranchsUsersModel {
+    tenantId?: string;
+    userId?: string;
+    shopBranchId?: string;
+    realName?: string;
+    nickName?: string;
+    headImage?: string;
+    mobilePhone?: string;
+    mobilePhoneIns?: string;
+    parentId?: string;
+    parentBranchId?: string;
+    invitationCode?: string;
+    invitationNum?: number;
+    status?: boolean;
+    createBy?: string;
+    createTime?: string;
+    updateBy?: string;
+    updateTime?: string;
+    isLeader?: boolean;
+    regionCode?: string;
+}

package/lib/store/organ.d.ts

@@ -1,10 +1,19 @@
 import { StorageOrganInfoModel } from "../api/storage/types";
+import { UserInfo, RolesPerms } from "../api/auth/types";
 interface OrganState {
     organTenant: string;
     organInfo: StorageOrganInfoModel;
+    organUserInfo: UserInfo;
+    organRoleCodes: string[];
+    organPermCodes: string[];
+    isSales: boolean;
 }
 export declare const useOrganStore: import("@mpxjs/pinia").StoreDefinition<"organ", OrganState, {}, {
+    clearOrganUser(): void;
     setOrganInfo(data: StorageOrganInfoModel): void;
     setOrganTenant(organTenant: string): Promise<boolean>;
+    getOrganUserInfo(): Promise<UserInfo>;
+    getOrganUserRolesPerms(): Promise<RolesPerms>;
+    setSales(isSales: boolean): void;
 }>;
 export {};

package/lib/store/organ.js

@@ -1,16 +1,36 @@
 import { defineStore } from "@mpxjs/pinia";
 import { storageApi } from "../api/storage";
 import { db } from "../utils/db";
+import { organUserApi } from "../api/myorgan";
 export const useOrganStore = defineStore("organ", {
     state: () => ({
         organTenant: db.getOrganTenant() || "",
         organInfo: db.getOrganInfo() || {},
+        //用户信息
+        organUserInfo: db.getOrganUserInfo() || {},
+        // 角色编码
+        organRoleCodes: db.getOrganRoleCodes() || [],
+        // 权限编码
+        organPermCodes: db.getOrganPermCodes() || [],
+        // 是否销售员
+        isSales: db.getOrganSales() || false,
     }),
     actions: {
+        clearOrganUser() {
+            this.organUserInfo = {};
+            this.organRoleCodes = [];
+            this.organPermCodes = [];
+            this.isSales = false;
+            db.setOrganUserInfo({});
+            db.setOrganRoleCodes([]);
+            db.setOrganPermCodes([]);
+            db.setOrganSales(false);
+        },
         //设置组织信息.
         setOrganInfo(data) {
             this.organInfo = data;
             this.organTenant = data.organTenant || "";
+            this.clearOrganUser();
             db.setOrganInfo(data);
             db.setOrganTenant(data.organTenant || "");
         },
@@ -18,6 +38,7 @@ export const useOrganStore = defineStore("organ", {
         setOrganTenant(organTenant) {
             this.organTenant = organTenant;
             db.setOrganTenant(organTenant);
+            this.clearOrganUser();
             return storageApi.findOrganTenant().then((res) => {
                 if (res.statusCode === 200) {
                     this.organInfo = res.data;
@@ -29,5 +50,34 @@ export const useOrganStore = defineStore("organ", {
                 }
             });
         },
+        // 获取组织用户信息
+        getOrganUserInfo() {
+            // 无缓存请求接口
+            return organUserApi
+                .userInfo(this.organTenant)
+                .then((resp) => {
+                this.organUserInfo = resp.data;
+                db.setOrganUserInfo(resp.data);
+                return resp.data;
+            })
+                .catch(() => Promise.reject("获取组织用户信息错误！"));
+        },
+        // 获取组织用户角色权限
+        getOrganUserRolesPerms() {
+            // 无缓存请求接口
+            return organUserApi
+                .userRolesPerms(this.organTenant)
+                .then((resp) => {
+                this.organRoleCodes = resp.data.roleCodes || [];
+                this.organPermCodes = resp.data.permCodes || [];
+                return resp.data;
+            })
+                .catch(() => Promise.reject("获取组织用户角色权限错误！"));
+        },
+        // 设置销售员
+        setSales(isSales) {
+            this.isSales = isSales;
+            db.setOrganSales(isSales);
+        },
     },
 });

package/lib/store/shop.d.ts

@@ -1,12 +1,16 @@
-import type { ShopInfoModel } from "../api/shop/types";
-import type { BranchModel } from "../api/shop/types";
+import type { ShopInfoModel, BranchModel, ShopBranchsUsersModel } from "../api/shop/types";
 interface ShopState {
     shopInfo: ShopInfoModel;
     branchInfo: BranchModel;
     isShop: boolean;
+    branchUser: ShopBranchsUsersModel;
+    isBranchManage: boolean;
+    isBranchEmployee: boolean;
 }
 export declare const useShopStore: import("@mpxjs/pinia").StoreDefinition<"shop", ShopState, {}, {
+    getMyBranchUserInfo(): Promise<ShopBranchsUsersModel>;
     clearShop(): void;
+    clearBranchUser(): void;
     switchShopBranch(shopInfo: ShopInfoModel, branchInfo: BranchModel): Promise<boolean>;
     switchShop(shopInfo: ShopInfoModel): Promise<boolean>;
     switchBranch(branchInfo: BranchModel): Promise<boolean>;

package/lib/store/shop.js

@@ -7,8 +7,34 @@ export const useShopStore = defineStore("shop", {
         shopInfo: db.getShopInfo() || {},
         branchInfo: db.getBranchInfo() || {},
         isShop: db.getIsShop() || false,
+        //门店员工信息
+        branchUser: {},
+        //是否是门店店长
+        isBranchManage: false,
+        //是否是门店员工
+        isBranchEmployee: false,
     }),
     actions: {
+        // 获取我的门店用户信息
+        getMyBranchUserInfo() {
+            return shopApi
+                .findMyShopBranchUser(this.branchInfo.organTenant || "", this.branchInfo.branchId || "")
+                .then((resp) => {
+                if (resp.data.shopBranchId !== "") {
+                    console.log("shopuser", resp.data);
+                    this.branchUser = resp.data || {};
+                    this.isBranchManage = resp.data.isLeader || false;
+                    this.isBranchEmployee = true;
+                }
+                else {
+                    console.log("empty", resp.data);
+                    this.clearBranchUser();
+                }
+                return resp.data;
+            })
+                .catch(() => Promise.reject("获取我的门店用户信息错误！"));
+        },
+        // 清除商户门店
         clearShop() {
             this.shopInfo = {};
             this.branchInfo = {};
@@ -16,11 +42,22 @@ export const useShopStore = defineStore("shop", {
             db.removeBranchInfo();
             db.removeShopInfo();
             db.removeIsShop();
+            //清理门店用户
+            this.clearBranchUser();
+        },
+        // 清理门店用户
+        clearBranchUser() {
+            this.branchUser = {};
+            this.isBranchManage = false;
+            this.isBranchEmployee = false;
         },
+        // 切换商户门店
         switchShopBranch(shopInfo, branchInfo) {
             this.shopInfo = shopInfo;
             this.branchInfo = branchInfo;
             this.isShop = false;
+            //清理门店用户
+            this.clearBranchUser();
             // 切换商户门店
             db.setShopInfo(shopInfo);
             db.setBranchInfo(branchInfo);
@@ -33,6 +70,8 @@ export const useShopStore = defineStore("shop", {
             this.shopInfo = shopInfo;
             this.branchInfo = {};
             this.isShop = true;
+            //清理门店用户
+            this.clearBranchUser();
             // 切换商户
             db.setShopInfo(shopInfo);
             db.setBranchInfo({});
@@ -44,6 +83,8 @@ export const useShopStore = defineStore("shop", {
         switchBranch(branchInfo) {
             this.branchInfo = branchInfo;
             this.isShop = false;
+            //清理门店用户
+            this.clearBranchUser();
             // 切换门店
             db.setBranchInfo(branchInfo);
             db.setIsShop(false);

package/lib/store/user.d.ts

@@ -6,7 +6,6 @@ interface UserState {
     permCodes: string[];
     accessToken: string;
     expiresDate: number;
-    isSales: boolean;
     referee: string;
 }
 export declare const useUserStore: import("@mpxjs/pinia").StoreDefinition<"user", UserState, {}, {
@@ -29,7 +28,6 @@ export declare const useUserStore: import("@mpxjs/pinia").StoreDefinition<"user"
     setUserInfo(userInfo: UserInfo): void;
     getRolePerm(cache?: boolean): Promise<RolesPerms>;
     refreshToken(): Promise<boolean>;
-    setSales(isSales: boolean): void;
     setReferee(referee: string): void;
 }>;
 export {};

package/lib/store/user.js

@@ -10,8 +10,6 @@ export const useUserStore = defineStore("user", {
         permCodes: db.getPermCodes() || [],
         accessToken: db.getToken() || "",
         expiresDate: db.getTokenExpiresDate() || 0,
-        // 是否销售员
-        isSales: db.getSales() || false,
         // 推荐人
         referee: db.getReferee() || "",
     }),
@@ -141,7 +139,7 @@ export const useUserStore = defineStore("user", {
         },
         // 退出登录，清空状态
         logout() {
-            db.clearStorage();
+            db.removeLogin();
             this.userInfo = {};
             this.roleCodes = [];
             this.permCodes = [];
@@ -226,11 +224,6 @@ export const useUserStore = defineStore("user", {
                 return true;
             });
         },
-        // 设置销售员
-        setSales(isSales) {
-            this.isSales = isSales;
-            db.setSales(isSales);
-        },
         // 设置推荐人
         setReferee(referee) {
             this.referee = referee;

package/lib/utils/db.d.ts

@@ -9,7 +9,6 @@ declare class LocalStorage {
     removeRefreshToken(): void;
     getTokenExpiresDate(): number;
     setToken(data: TokenModel): void;
-    clearStorage(): void;
     getBearerToken(): string;
     getUserInfo(): any;
     setUserInfo(data: UserInfo): void;
@@ -17,8 +16,8 @@ declare class LocalStorage {
     setRoleCodes(codes: string[]): void;
     getPermCodes(): any;
     setPermCodes(codes: string[]): void;
-    getSales(): boolean;
-    setSales(isSales: boolean): void;
+    removeLogin(): void;
+    clearStorage(): void;
     /**
      * 获取推荐人
      */
@@ -31,6 +30,14 @@ declare class LocalStorage {
     setOrganTenant(organTenant: string): void;
     getOrganInfo(): StorageOrganInfoModel;
     setOrganInfo(data: StorageOrganInfoModel): void;
+    getOrganUserInfo(): any;
+    setOrganUserInfo(data: UserInfo): void;
+    getOrganRoleCodes(): any;
+    setOrganRoleCodes(codes: string[]): void;
+    getOrganPermCodes(): any;
+    setOrganPermCodes(codes: string[]): void;
+    getOrganSales(): boolean;
+    setOrganSales(isSales: boolean): void;
     getShopInfo(): ShopInfoModel;
     setShopInfo(data: ShopInfoModel): void;
     getBranchInfo(): BranchModel;

package/lib/utils/db.js

@@ -39,10 +39,6 @@ class LocalStorage {
         const expiresDate = new Date().getTime() + data.expiresIn * 1000;
         mpx.setStorageSync("expiresDate", expiresDate);
     }
-    // 清理本地缓存
-    clearStorage() {
-        mpx.clearStorage();
-    }
     // 获取Bearer 格式请求Token
     getBearerToken() {
         const token = this.getToken();
@@ -75,13 +71,23 @@ class LocalStorage {
     setPermCodes(codes) {
         mpx.setStorageSync("permCodes", codes);
     }
-    // 用户是否销售员
-    getSales() {
-        return mpx.getStorageSync("isSales") || false;
+    // 移除登录缓存信息
+    removeLogin() {
+        // 登录Token
+        mpx.removeStorageSync("token");
+        mpx.removeStorageSync("expiresIn");
+        mpx.removeStorageSync("refreshToken");
+        mpx.removeStorageSync("expiresDate");
+        // 用户信息
+        mpx.removeStorageSync("userInfo");
+        mpx.removeStorageSync("roleCodes");
+        mpx.removeStorageSync("permCodes");
+        mpx.removeStorageSync("isSales");
+        // 组织用户信息
     }
-    // 设置销售员
-    setSales(isSales) {
-        mpx.setStorageSync("isSales", isSales);
+    // 清理本地缓存
+    clearStorage() {
+        mpx.clearStorage();
     }
     /**
      * 获取推荐人
@@ -115,6 +121,46 @@ class LocalStorage {
         const config = getApp().globalData.config;
         mpx.setStorageSync("OrganInfo:" + config.tenant, data);
     }
+    // 获取用户信息
+    getOrganUserInfo() {
+        const config = getApp().globalData.config;
+        return mpx.getStorageSync("OrganUserInfo:" + config.tenant) || {};
+    }
+    // 设置用户信息
+    setOrganUserInfo(data) {
+        const config = getApp().globalData.config;
+        mpx.setStorageSync("OrganUserInfo:" + config.tenant, data);
+    }
+    // 获取角色列表
+    getOrganRoleCodes() {
+        const config = getApp().globalData.config;
+        return mpx.getStorageSync("OrganRoleCodes:" + config.tenant) || [];
+    }
+    // 设置角色列表
+    setOrganRoleCodes(codes) {
+        const config = getApp().globalData.config;
+        mpx.setStorageSync("OrganRoleCodes:" + config.tenant, codes);
+    }
+    // 获取权限列表
+    getOrganPermCodes() {
+        const config = getApp().globalData.config;
+        return mpx.getStorageSync("OrganPermCodes:" + config.tenant) || [];
+    }
+    // 设置权限列表
+    setOrganPermCodes(codes) {
+        const config = getApp().globalData.config;
+        mpx.setStorageSync("OrganPermCodes:" + config.tenant, codes);
+    }
+    // 用户是否销售员
+    getOrganSales() {
+        const config = getApp().globalData.config;
+        return mpx.getStorageSync("OrganSales:" + config.tenant) || false;
+    }
+    // 设置销售员
+    setOrganSales(isSales) {
+        const config = getApp().globalData.config;
+        mpx.setStorageSync("OrganSales:" + config.tenant, isSales);
+    }
     // 获取商铺信息
     getShopInfo() {
         return mpx.getStorageSync("shopInfo");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/myorgan/index.ts

@@ -0,0 +1,29 @@
+import { ResponseData } from "../../api/types";
+import type { RolesPerms, UserInfo } from "../auth/types";
+import mpx from "@mpxjs/core";
+
+class OrganUserApi {
+  // 获取当前会话用户
+  userInfo(organTenant: string): Promise<ResponseData<UserInfo>> {
+    const config = getApp().globalData.config;
+    organTenant = organTenant || config.tenant;
+    return mpx.xfetch.fetch({
+      url: "/v1/rbac/auth/user?tenant=" + organTenant,
+      method: "GET",
+      header: { "Grpc-Metadata-Tenant": organTenant },
+    });
+  }
+
+  // 当前用户角色权限
+  userRolesPerms(organTenant: string): Promise<ResponseData<RolesPerms>> {
+    const config = getApp().globalData.config;
+    organTenant = organTenant || config.tenant;
+    return mpx.xfetch.fetch({
+      url: "/v1/rbac/auth/roles_perms?tenant=" + organTenant,
+      method: "GET",
+      header: { "Grpc-Metadata-Tenant": organTenant },
+    });
+  }
+}
+
+export const organUserApi = new OrganUserApi();

package/src/api/shop/index.ts

@@ -7,6 +7,7 @@ import {
   BranchModel,
   ShopPage,
   ShopPageReq,
+  ShopBranchsUsersModel,
 } from "./types";
 
 class ShopApiImpl {
@@ -50,6 +51,21 @@ class ShopApiImpl {
     return mpx.xfetch.fetch({
       url: "/v1/front/shop/branch/id/" + organTenant + "/" + branchId,
       method: "GET",
+      header: { "Grpc-Metadata-Tenant": organTenant },
+    });
+  }
+
+  // 查询门店用户
+  findMyShopBranchUser(
+    organTenant: string,
+    branchId: string
+  ): Promise<ResponseData<ShopBranchsUsersModel>> {
+    const config = getApp().globalData.config;
+    organTenant = organTenant || config.tenant;
+    return mpx.xfetch.fetch({
+      url: "/v1/front/shop/branchs_users/my/" + organTenant + "/" + branchId,
+      method: "GET",
+      header: { "Grpc-Metadata-Tenant": organTenant },
     });
   }
 }

package/src/api/shop/types.ts

@@ -30,18 +30,6 @@ export interface ShopInfoModel {
   note?: string;
   // 营业执照
   businessPicUrl?: string;
-  // 法人身份证
-  idCard?: string;
-  // 法人身份证脱敏
-  idCardIns?: string;
-  // 商户名称
-  mchName?: string;
-  // 开户行
-  bankName?: string;
-  // 银行账号
-  bankCode?: string;
-  // 银行账号脱敏
-  bankCodeIns?: string;
   // 状态
   status?: boolean;
   // 商户ID
@@ -50,8 +38,6 @@ export interface ShopInfoModel {
   regionCode?: string;
   // 店铺广告位图片
   adPics?: string;
-  // 账号名称
-  accountName?: string;
   // 组织ID
   organId?: string;
   // 组织租户
@@ -155,6 +141,14 @@ export interface BranchModel {
   organTenant?: string;
 }
 
+// 门店用户查询实体
+export interface BranchKey {
+  // 租户
+  tenant?: string;
+  // 门店ID
+  branchId?: string;
+}
+
 // 门店管理查询
 export interface BranchPageReq {
   // 租户
@@ -206,3 +200,45 @@ export interface BranchPage {
   // 总页数
   pageCount: number;
 }
+
+// 门店用户关系实体
+export interface ShopBranchsUsersModel {
+  // 租户ID
+  tenantId?: string;
+  // 用户ID
+  userId?: string;
+  // 门店ID
+  shopBranchId?: string;
+  // 姓名
+  realName?: string;
+  // 昵称
+  nickName?: string;
+  // 头像
+  headImage?: string;
+  // 联系电话
+  mobilePhone?: string;
+  // 联系电话脱敏
+  mobilePhoneIns?: string;
+  // 上级（总部店长）
+  parentId?: string;
+  // 上级门店（总部）
+  parentBranchId?: string;
+  // 邀请码
+  invitationCode?: string;
+  // 邀请人数
+  invitationNum?: number;
+  // 状态（可用、禁用）
+  status?: boolean;
+  // 创建人
+  createBy?: string;
+  // 创建时间
+  createTime?: string;
+  // 更新人
+  updateBy?: string;
+  // 更新时间
+  updateTime?: string;
+  // 是否门店店长
+  isLeader?: boolean;
+  // 地区编码
+  regionCode?: string;
+}

package/src/components/shop/shop-selected-item.mpx

@@ -14,6 +14,8 @@
                 <text>{{ branchInfo.createTime || shopInfo.createTime }}</text>
             </view>
             <view>{{ branchInfo.note || shopInfo.note }}</view>
+            <view wx:if="{{ shopStore.isBranchManage || shopStore.isBranchEmployee }}">{{ shopStore.isBranchManage ?
+                '门店店长' : '门店员工' }}</view>
         </view>
     </view>
 </template>
@@ -32,10 +34,10 @@ createComponent({
         const shopStore = useShopStore();
         let branchInfo = shopStore.branchInfo;
         let shopInfo = shopStore.shopInfo;
-        return { resourceUrl, baseUrl, branchInfo, shopInfo }
+        //获取门店用户信息
+        shopStore.getMyBranchUserInfo();
+        return { resourceUrl, baseUrl, branchInfo, shopInfo, shopStore }
     },
-    methods: {
-    }
 })
 </script>
 

package/src/store/organ.ts

@@ -2,24 +2,53 @@ import { defineStore } from "@mpxjs/pinia";
 import { storageApi } from "../api/storage";
 import { StorageOrganInfoModel } from "../api/storage/types";
 import { db } from "../utils/db";
+import { UserInfo, RolesPerms } from "../api/auth/types";
+import { organUserApi } from "../api/myorgan";
 
 interface OrganState {
   //组织租户
   organTenant: string;
   //组织信息
   organInfo: StorageOrganInfoModel;
+  //用户信息
+  organUserInfo: UserInfo;
+  // 角色编码
+  organRoleCodes: string[];
+  // 权限编码
+  organPermCodes: string[];
+  // 是否销售员
+  isSales: boolean;
 }
 
 export const useOrganStore = defineStore("organ", {
   state: (): OrganState => ({
     organTenant: db.getOrganTenant() || "",
     organInfo: db.getOrganInfo() || {},
+    //用户信息
+    organUserInfo: db.getOrganUserInfo() || {},
+    // 角色编码
+    organRoleCodes: db.getOrganRoleCodes() || [],
+    // 权限编码
+    organPermCodes: db.getOrganPermCodes() || [],
+    // 是否销售员
+    isSales: db.getOrganSales() || false,
   }),
   actions: {
+    clearOrganUser() {
+      this.organUserInfo = {} as UserInfo;
+      this.organRoleCodes = [];
+      this.organPermCodes = [];
+      this.isSales = false;
+      db.setOrganUserInfo({} as UserInfo);
+      db.setOrganRoleCodes([]);
+      db.setOrganPermCodes([]);
+      db.setOrganSales(false);
+    },
     //设置组织信息.
     setOrganInfo(data: StorageOrganInfoModel) {
       this.organInfo = data;
       this.organTenant = data.organTenant || "";
+      this.clearOrganUser();
       db.setOrganInfo(data);
       db.setOrganTenant(data.organTenant || "");
     },
@@ -27,6 +56,7 @@ export const useOrganStore = defineStore("organ", {
     setOrganTenant(organTenant: string): Promise<boolean> {
       this.organTenant = organTenant;
       db.setOrganTenant(organTenant);
+      this.clearOrganUser();
       return storageApi.findOrganTenant().then((res) => {
         if (res.statusCode === 200) {
           this.organInfo = res.data;
@@ -37,5 +67,34 @@ export const useOrganStore = defineStore("organ", {
         }
       });
     },
+    // 获取组织用户信息
+    getOrganUserInfo(): Promise<UserInfo> {
+      // 无缓存请求接口
+      return organUserApi
+        .userInfo(this.organTenant)
+        .then((resp) => {
+          this.organUserInfo = resp.data;
+          db.setOrganUserInfo(resp.data);
+          return resp.data;
+        })
+        .catch(() => Promise.reject("获取组织用户信息错误！"));
+    },
+    // 获取组织用户角色权限
+    getOrganUserRolesPerms(): Promise<RolesPerms> {
+      // 无缓存请求接口
+      return organUserApi
+        .userRolesPerms(this.organTenant)
+        .then((resp) => {
+          this.organRoleCodes = resp.data.roleCodes || [];
+          this.organPermCodes = resp.data.permCodes || [];
+          return resp.data;
+        })
+        .catch(() => Promise.reject("获取组织用户角色权限错误！"));
+    },
+    // 设置销售员
+    setSales(isSales: boolean): void {
+      this.isSales = isSales;
+      db.setOrganSales(isSales);
+    },
   },
 });

package/src/store/shop.ts

@@ -1,6 +1,9 @@
 import { defineStore } from "@mpxjs/pinia";
-import type { ShopInfoModel } from "../api/shop/types";
-import type { BranchModel } from "../api/shop/types";
+import type {
+  ShopInfoModel,
+  BranchModel,
+  ShopBranchsUsersModel,
+} from "../api/shop/types";
 import { db } from "../utils/db";
 import { useOrganStore } from "./organ";
 import { shopApi } from "../api/shop/index";
@@ -13,6 +16,12 @@ interface ShopState {
   branchInfo: BranchModel;
   //是否是商户
   isShop: boolean;
+  //门店员工信息
+  branchUser: ShopBranchsUsersModel;
+  //是否是门店店长
+  isBranchManage: boolean;
+  //是否是门店员工
+  isBranchEmployee: boolean;
 }
 
 export const useShopStore = defineStore("shop", {
@@ -20,8 +29,36 @@ export const useShopStore = defineStore("shop", {
     shopInfo: db.getShopInfo() || {},
     branchInfo: db.getBranchInfo() || {},
     isShop: db.getIsShop() || false,
+    //门店员工信息
+    branchUser: {} as ShopBranchsUsersModel,
+    //是否是门店店长
+    isBranchManage: false,
+    //是否是门店员工
+    isBranchEmployee: false,
   }),
   actions: {
+    // 获取我的门店用户信息
+    getMyBranchUserInfo(): Promise<ShopBranchsUsersModel> {
+      return shopApi
+        .findMyShopBranchUser(
+          this.branchInfo.organTenant || "",
+          this.branchInfo.branchId || ""
+        )
+        .then((resp) => {
+          if (resp.data.shopBranchId !== "") {
+            console.log("shopuser", resp.data);
+            this.branchUser = resp.data || {};
+            this.isBranchManage = resp.data.isLeader || false;
+            this.isBranchEmployee = true;
+          } else {
+            console.log("empty", resp.data);
+            this.clearBranchUser();
+          }
+          return resp.data;
+        })
+        .catch(() => Promise.reject("获取我的门店用户信息错误！"));
+    },
+    // 清除商户门店
     clearShop() {
       this.shopInfo = {};
       this.branchInfo = {};
@@ -29,7 +66,16 @@ export const useShopStore = defineStore("shop", {
       db.removeBranchInfo();
       db.removeShopInfo();
       db.removeIsShop();
+      //清理门店用户
+      this.clearBranchUser();
+    },
+    // 清理门店用户
+    clearBranchUser() {
+      this.branchUser = {};
+      this.isBranchManage = false;
+      this.isBranchEmployee = false;
     },
+    // 切换商户门店
     switchShopBranch(
       shopInfo: ShopInfoModel,
       branchInfo: BranchModel
@@ -37,6 +83,8 @@ export const useShopStore = defineStore("shop", {
       this.shopInfo = shopInfo;
       this.branchInfo = branchInfo;
       this.isShop = false;
+      //清理门店用户
+      this.clearBranchUser();
       // 切换商户门店
       db.setShopInfo(shopInfo);
       db.setBranchInfo(branchInfo);
@@ -49,6 +97,8 @@ export const useShopStore = defineStore("shop", {
       this.shopInfo = shopInfo;
       this.branchInfo = {};
       this.isShop = true;
+      //清理门店用户
+      this.clearBranchUser();
       // 切换商户
       db.setShopInfo(shopInfo);
       db.setBranchInfo({});
@@ -60,6 +110,8 @@ export const useShopStore = defineStore("shop", {
     switchBranch(branchInfo: BranchModel): Promise<boolean> {
       this.branchInfo = branchInfo;
       this.isShop = false;
+      //清理门店用户
+      this.clearBranchUser();
       // 切换门店
       db.setBranchInfo(branchInfo);
       db.setIsShop(false);

package/src/store/user.ts

@@ -25,8 +25,6 @@ interface UserState {
   accessToken: string;
   //Token过期时间
   expiresDate: number;
-  // 是否销售员
-  isSales: boolean;
   // 推荐人
   referee: string;
 }
@@ -38,8 +36,6 @@ export const useUserStore = defineStore("user", {
     permCodes: (db.getPermCodes() as string[]) || [],
     accessToken: (db.getToken() as string) || "",
     expiresDate: (db.getTokenExpiresDate() as number) || 0,
-    // 是否销售员
-    isSales: db.getSales() || false,
     // 推荐人
     referee: db.getReferee() || "",
   }),
@@ -182,7 +178,7 @@ export const useUserStore = defineStore("user", {
     },
     // 退出登录，清空状态
     logout() {
-      db.clearStorage();
+      db.removeLogin();
       this.userInfo = {} as UserInfo;
       this.roleCodes = [];
       this.permCodes = [];
@@ -273,11 +269,6 @@ export const useUserStore = defineStore("user", {
           return true;
         });
     },
-    // 设置销售员
-    setSales(isSales: boolean): void {
-      this.isSales = isSales;
-      db.setSales(isSales);
-    },
     // 设置推荐人
     setReferee(referee: string): void {
       this.referee = referee;

package/src/utils/db.ts

@@ -49,11 +49,6 @@ class LocalStorage {
     mpx.setStorageSync("expiresDate", expiresDate);
   }
 
-  // 清理本地缓存
-  clearStorage(): void {
-    mpx.clearStorage();
-  }
-
   // 获取Bearer 格式请求Token
   getBearerToken(): string {
     const token = this.getToken();
@@ -93,15 +88,25 @@ class LocalStorage {
     mpx.setStorageSync("permCodes", codes);
   }
 
-  // 用户是否销售员
-  getSales(): boolean {
-    return mpx.getStorageSync("isSales") || false;
-  }
-  // 设置销售员
-  setSales(isSales: boolean): void {
-    mpx.setStorageSync("isSales", isSales);
+  // 移除登录缓存信息
+  removeLogin() {
+    // 登录Token
+    mpx.removeStorageSync("token");
+    mpx.removeStorageSync("expiresIn");
+    mpx.removeStorageSync("refreshToken");
+    mpx.removeStorageSync("expiresDate");
+    // 用户信息
+    mpx.removeStorageSync("userInfo");
+    mpx.removeStorageSync("roleCodes");
+    mpx.removeStorageSync("permCodes");
+    mpx.removeStorageSync("isSales");
+    // 组织用户信息
   }
 
+  // 清理本地缓存
+  clearStorage(): void {
+    mpx.clearStorage();
+  }
   /**
    * 获取推荐人
    */
@@ -135,6 +140,51 @@ class LocalStorage {
     const config = getApp().globalData.config;
     mpx.setStorageSync("OrganInfo:" + config.tenant, data);
   }
+  // 获取用户信息
+  getOrganUserInfo() {
+    const config = getApp().globalData.config;
+    return mpx.getStorageSync("OrganUserInfo:" + config.tenant) || {};
+  }
+
+  // 设置用户信息
+  setOrganUserInfo(data: UserInfo) {
+    const config = getApp().globalData.config;
+    mpx.setStorageSync("OrganUserInfo:" + config.tenant, data);
+  }
+
+  // 获取角色列表
+  getOrganRoleCodes() {
+    const config = getApp().globalData.config;
+    return mpx.getStorageSync("OrganRoleCodes:" + config.tenant) || [];
+  }
+
+  // 设置角色列表
+  setOrganRoleCodes(codes: string[]) {
+    const config = getApp().globalData.config;
+    mpx.setStorageSync("OrganRoleCodes:" + config.tenant, codes);
+  }
+
+  // 获取权限列表
+  getOrganPermCodes() {
+    const config = getApp().globalData.config;
+    return mpx.getStorageSync("OrganPermCodes:" + config.tenant) || [];
+  }
+
+  // 设置权限列表
+  setOrganPermCodes(codes: string[]) {
+    const config = getApp().globalData.config;
+    mpx.setStorageSync("OrganPermCodes:" + config.tenant, codes);
+  }
+  // 用户是否销售员
+  getOrganSales(): boolean {
+    const config = getApp().globalData.config;
+    return mpx.getStorageSync("OrganSales:" + config.tenant) || false;
+  }
+  // 设置销售员
+  setOrganSales(isSales: boolean): void {
+    const config = getApp().globalData.config;
+    mpx.setStorageSync("OrganSales:" + config.tenant, isSales);
+  }
 
   // 获取商铺信息
   getShopInfo(): ShopInfoModel {

package/lib/app.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-activity-item.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-activity-list.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-article-item.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-article-list.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-article-view.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-article.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-like.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-location-list.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-location.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-product-item.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-product-list.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/common/jmash-none-data.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/common/jmash-stepper.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/common/jmash-top-navigation.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/organ/organ-search.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/shop/branch-search.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/shop/shop-search.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/packages/pages/cms/cms-activity-list.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/packages/pages/cms/cms-article-list.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/packages/pages/cms/cms-location-list.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/packages/pages/cms/cms-product-list.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/pages/branch-search.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/pages/organ-search.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/pages/shop-search.mpx.d.ts

@@ -1 +0,0 @@
-export {};