jmash-core-mp 0.1.76 → 0.1.78

package/src/pages/tabbar/organ.mpx

@@ -1,87 +1,87 @@
-<template>
-  <view class="page-body">
-    <organ-selected-item></organ-selected-item>
-    <jmash-menu menuGroups="{{ menuGroups }}" bind:itemClick="handleMenuClick"></jmash-menu>
-  </view>
-</template>
-
-<script>
-import mpx, { createPage } from '@mpxjs/core'
-import { useUserStore } from '../../store/user';
-import { share } from "../../utils/share";
-
-createPage({
-  data: {
-    userStore: null,
-    menuGroups: [
-      {
-        id: 1,
-        items: [
-          { key: 'organ', title: '选择组织', icon: '🏠', iconBg: '#409eff', path: '/pages/organ' },
-        ]
-      }
-    ]
-  },
-  onLoad(options) {
-    share.shareOrganLoad(options).then(() => {
-      this.userStore = useUserStore();
-    });
-  },
-  onShow() {
-    if (typeof this.getTabBar === 'function' &&
-      this.getTabBar()) {
-      this.getTabBar().$refs.tabBar.activeTab("Organ");
-    }
-  },
-  methods: {
-    handleMenuClick(e) {
-      const { item } = e.detail
-      if (item.path) {
-        mpx.navigateTo({ url: item.path })
-      }
-    },
-  },
-  onShareAppMessage() {
-    return {
-      title: '组织首页-分享给好友',
-      path: share.shareOrganPath(share.getCurrentPage(), share.getCurrentQuery())
-    }
-  },
-  onShareTimeline() {
-    return {
-      title: '组织首页-分享给朋友圈',
-      query: share.shareOrganQuery(share.getCurrentQuery())
-    }
-  },
-
-})
-</script>
-
-<style lang="scss">
-.page-body {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-
-  .logout-section {
-    display: flex;
-    justify-content: center;
-    padding: 40rpx 16rpx;
-
-    button {
-      width: 80%;
-      height: 88rpx;
-      font-size: 30rpx;
-      border-radius: 44rpx;
-    }
-  }
-}
-</style>
-
-<script type="application/json">
-{
-  "usingComponents": {
-    "jmash-menu": "../../components/common/jmash-menu.mpx",
-    "organ-selected-item": "../../components/organ/organ-selected-item.mpx"
-  }
-}
+<template>
+  <view class="page-body">
+    <organ-selected-item></organ-selected-item>
+    <jmash-menu menuGroups="{{ menuGroups }}" bind:itemClick="handleMenuClick"></jmash-menu>
+  </view>
+</template>
+
+<script>
+import mpx, { createPage } from '@mpxjs/core'
+import { useUserStore } from '../../store/user';
+import { share } from "../../utils/share";
+
+createPage({
+  data: {
+    userStore: null,
+    menuGroups: [
+      {
+        id: 1,
+        items: [
+          { key: 'organ', title: '选择组织', icon: '🏠', iconBg: '#409eff', path: '/pages/organ' },
+        ]
+      }
+    ]
+  },
+  onLoad(options) {
+    share.shareOrganLoad(options).then(() => {
+      this.userStore = useUserStore();
+    });
+  },
+  onShow() {
+    if (typeof this.getTabBar === 'function' &&
+      this.getTabBar()) {
+      this.getTabBar().$refs.tabBar.activeTab("Organ");
+    }
+  },
+  methods: {
+    handleMenuClick(e) {
+      const { item } = e.detail
+      if (item.path) {
+        mpx.navigateTo({ url: item.path })
+      }
+    },
+  },
+  onShareAppMessage() {
+    return {
+      title: '组织首页-分享给好友',
+      path: share.shareOrganPath(share.getCurrentPage(), share.getCurrentQuery())
+    }
+  },
+  onShareTimeline() {
+    return {
+      title: '组织首页-分享给朋友圈',
+      query: share.shareOrganQuery(share.getCurrentQuery())
+    }
+  },
+
+})
+</script>
+
+<style lang="scss">
+.page-body {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+
+  .logout-section {
+    display: flex;
+    justify-content: center;
+    padding: 40rpx 16rpx;
+
+    button {
+      width: 80%;
+      height: 88rpx;
+      font-size: 30rpx;
+      border-radius: 44rpx;
+    }
+  }
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {
+    "jmash-menu": "../../components/common/jmash-menu.mpx",
+    "organ-selected-item": "../../components/organ/organ-selected-item.mpx"
+  }
+}
 </script>

package/src/store/organ.ts

@@ -1,100 +1,100 @@
-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 || "");
-    },
-    //设置组织租户和组织信息.
-    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;
-          db.setOrganInfo(res.data);
-          return Promise.resolve(true);
-        } else {
-          return Promise.resolve(false);
-        }
-      });
-    },
-    // 获取组织用户信息
-    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);
-    },
-  },
-});
+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 || "");
+    },
+    //设置组织租户和组织信息.
+    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;
+          db.setOrganInfo(res.data);
+          return Promise.resolve(true);
+        } else {
+          return Promise.resolve(false);
+        }
+      });
+    },
+    // 获取组织用户信息
+    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,130 +1,130 @@
-import { defineStore } from "@mpxjs/pinia";
-import type {
-  ShopInfoModel,
-  BranchModel,
-  ShopBranchsUsersModel,
-} from "../api/shop/types";
-import { db } from "../utils/db";
-import { useOrganStore } from "./organ";
-import { shopApi } from "../api/shop/index";
-
-// 商户状态
-interface ShopState {
-  //商户信息
-  shopInfo: ShopInfoModel;
-  //门店信息
-  branchInfo: BranchModel;
-  //是否是商户
-  isShop: boolean;
-  //门店员工信息
-  branchUser: ShopBranchsUsersModel;
-  //是否是门店店长
-  isBranchManage: boolean;
-  //是否是门店员工
-  isBranchEmployee: boolean;
-}
-
-export const useShopStore = defineStore("shop", {
-  state: (): ShopState => ({
-    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 = {};
-      this.isShop = false;
-      db.removeBranchInfo();
-      db.removeShopInfo();
-      db.removeIsShop();
-      //清理门店用户
-      this.clearBranchUser();
-    },
-    // 清理门店用户
-    clearBranchUser() {
-      this.branchUser = {};
-      this.isBranchManage = false;
-      this.isBranchEmployee = false;
-    },
-    // 切换商户门店
-    switchShopBranch(
-      shopInfo: ShopInfoModel,
-      branchInfo: BranchModel
-    ): Promise<boolean> {
-      this.shopInfo = shopInfo;
-      this.branchInfo = branchInfo;
-      this.isShop = false;
-      //清理门店用户
-      this.clearBranchUser();
-      // 切换商户门店
-      db.setShopInfo(shopInfo);
-      db.setBranchInfo(branchInfo);
-      db.setIsShop(false);
-      const organStore = useOrganStore();
-      return organStore.setOrganTenant(branchInfo.organTenant || "");
-    },
-    // 切换商户
-    switchShop(shopInfo: ShopInfoModel): Promise<boolean> {
-      this.shopInfo = shopInfo;
-      this.branchInfo = {};
-      this.isShop = true;
-      //清理门店用户
-      this.clearBranchUser();
-      // 切换商户
-      db.setShopInfo(shopInfo);
-      db.setBranchInfo({});
-      db.setIsShop(true);
-      const organStore = useOrganStore();
-      return organStore.setOrganTenant(shopInfo.organTenant || "");
-    },
-    // 切换门店
-    switchBranch(branchInfo: BranchModel): Promise<boolean> {
-      this.branchInfo = branchInfo;
-      this.isShop = false;
-      //清理门店用户
-      this.clearBranchUser();
-      // 切换门店
-      db.setBranchInfo(branchInfo);
-      db.setIsShop(false);
-      return shopApi.findShopInfoById(branchInfo.shopId || "").then((res) => {
-        if (res.statusCode === 200) {
-          this.shopInfo = res.data || {};
-          db.setShopInfo(this.shopInfo);
-          const organStore = useOrganStore();
-          return organStore.setOrganTenant(branchInfo.organTenant || "");
-        } else {
-          return Promise.resolve(false);
-        }
-      });
-    },
-  },
-});
+import { defineStore } from "@mpxjs/pinia";
+import type {
+  ShopInfoModel,
+  BranchModel,
+  ShopBranchsUsersModel,
+} from "../api/shop/types";
+import { db } from "../utils/db";
+import { useOrganStore } from "./organ";
+import { shopApi } from "../api/shop/index";
+
+// 商户状态
+interface ShopState {
+  //商户信息
+  shopInfo: ShopInfoModel;
+  //门店信息
+  branchInfo: BranchModel;
+  //是否是商户
+  isShop: boolean;
+  //门店员工信息
+  branchUser: ShopBranchsUsersModel;
+  //是否是门店店长
+  isBranchManage: boolean;
+  //是否是门店员工
+  isBranchEmployee: boolean;
+}
+
+export const useShopStore = defineStore("shop", {
+  state: (): ShopState => ({
+    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 = {};
+      this.isShop = false;
+      db.removeBranchInfo();
+      db.removeShopInfo();
+      db.removeIsShop();
+      //清理门店用户
+      this.clearBranchUser();
+    },
+    // 清理门店用户
+    clearBranchUser() {
+      this.branchUser = {};
+      this.isBranchManage = false;
+      this.isBranchEmployee = false;
+    },
+    // 切换商户门店
+    switchShopBranch(
+      shopInfo: ShopInfoModel,
+      branchInfo: BranchModel
+    ): Promise<boolean> {
+      this.shopInfo = shopInfo;
+      this.branchInfo = branchInfo;
+      this.isShop = false;
+      //清理门店用户
+      this.clearBranchUser();
+      // 切换商户门店
+      db.setShopInfo(shopInfo);
+      db.setBranchInfo(branchInfo);
+      db.setIsShop(false);
+      const organStore = useOrganStore();
+      return organStore.setOrganTenant(branchInfo.organTenant || "");
+    },
+    // 切换商户
+    switchShop(shopInfo: ShopInfoModel): Promise<boolean> {
+      this.shopInfo = shopInfo;
+      this.branchInfo = {};
+      this.isShop = true;
+      //清理门店用户
+      this.clearBranchUser();
+      // 切换商户
+      db.setShopInfo(shopInfo);
+      db.setBranchInfo({});
+      db.setIsShop(true);
+      const organStore = useOrganStore();
+      return organStore.setOrganTenant(shopInfo.organTenant || "");
+    },
+    // 切换门店
+    switchBranch(branchInfo: BranchModel): Promise<boolean> {
+      this.branchInfo = branchInfo;
+      this.isShop = false;
+      //清理门店用户
+      this.clearBranchUser();
+      // 切换门店
+      db.setBranchInfo(branchInfo);
+      db.setIsShop(false);
+      return shopApi.findShopInfoById(branchInfo.shopId || "").then((res) => {
+        if (res.statusCode === 200) {
+          this.shopInfo = res.data || {};
+          db.setShopInfo(this.shopInfo);
+          const organStore = useOrganStore();
+          return organStore.setOrganTenant(branchInfo.organTenant || "");
+        } else {
+          return Promise.resolve(false);
+        }
+      });
+    },
+  },
+});