jmash-core-mp 0.1.58 → 0.1.59

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

@@ -27,6 +27,8 @@ export interface ShopInfoModel {
     accountName?: string;
     organId?: string;
     organTenant?: string;
+    createBy?: string;
+    createTime?: string;
 }
 export interface BranchModel {
     tenantId?: string;

package/lib/store/shop.d.ts

@@ -6,8 +6,8 @@ interface ShopState {
     isShop: boolean;
 }
 export declare const useShopStore: import("@mpxjs/pinia").StoreDefinition<"shop", ShopState, {}, {
-    switchShopBranch(shopInfo: ShopInfoModel, branchInfo: BranchModel): void;
-    switchShop(shopInfo: ShopInfoModel): void;
-    switchBranch(branchInfo: BranchModel): void;
+    switchShopBranch(shopInfo: ShopInfoModel, branchInfo: BranchModel): Promise<boolean>;
+    switchShop(shopInfo: ShopInfoModel): Promise<boolean>;
+    switchBranch(branchInfo: BranchModel): Promise<boolean>;
 }>;
 export {};

package/lib/store/shop.js

@@ -1,5 +1,6 @@
 import { defineStore } from "@mpxjs/pinia";
 import { db } from "../utils/db";
+import { useOrganStore } from "./organ";
 export const useShopStore = defineStore("shop", {
     state: () => ({
         shopInfo: db.getShopInfo() || {},
@@ -16,6 +17,8 @@ export const useShopStore = defineStore("shop", {
             db.setShopInfo(shopInfo);
             db.setBranchInfo(branchInfo);
             db.setIsShop(false);
+            const organStore = useOrganStore();
+            return organStore.setOrganTenant(branchInfo.organTenant || "");
         },
         // 切换商户
         switchShop(shopInfo) {
@@ -26,6 +29,8 @@ export const useShopStore = defineStore("shop", {
             db.setShopInfo(shopInfo);
             db.setBranchInfo({});
             db.setIsShop(true);
+            const organStore = useOrganStore();
+            return organStore.setOrganTenant(shopInfo.organTenant || "");
         },
         // 切换门店
         switchBranch(branchInfo) {
@@ -36,6 +41,8 @@ export const useShopStore = defineStore("shop", {
             db.setShopInfo({});
             db.setBranchInfo(branchInfo);
             db.setIsShop(false);
+            const organStore = useOrganStore();
+            return organStore.setOrganTenant(branchInfo.organTenant || "");
         },
     },
 });

package/lib/utils/db.js

@@ -107,11 +107,13 @@ class LocalStorage {
     }
     //获取组织信息 TODO
     getOrganInfo() {
-        return mpx.getStorageSync("organInfo") || {};
+        const config = getApp().globalData.config;
+        return mpx.getStorageSync("OrganInfo:" + config.tenant) || {};
     }
     //设置组织信息
     setOrganInfo(data) {
-        mpx.setStorageSync("organInfo", data);
+        const config = getApp().globalData.config;
+        mpx.setStorageSync("OrganInfo:" + config.tenant, data);
     }
     // 获取商铺信息
     getShopInfo() {

package/package.json

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

package/src/api/shop/types.ts

@@ -56,6 +56,10 @@ export interface ShopInfoModel {
   organId?: string;
   // 组织租户
   organTenant?: string;
+  // 创建人
+  createBy?: string;
+  // 创建时间
+  createTime?: string;
 }
 
 // 门店管理实体

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

@@ -24,7 +24,6 @@ import mpx, { createComponent } from "@mpxjs/core";
 import type { EventBase } from "../../api/types";
 import type { BranchModel } from "../../api/shop/types";
 import { useShopStore } from "../../store/shop";
-import { useOrganStore } from "../../store/organ";
 
 createComponent({
     properties: {
@@ -49,11 +48,9 @@ createComponent({
     methods: {
         // 店铺详情
         handleInfo(e: EventBase) {
-            console.log("选择门店", this.branchInfo);
+            //console.log("选择门店", this.branchInfo);
             const shopStore = useShopStore();
-            const organStore = useOrganStore();
-            shopStore.switchBranch(this.branchInfo as BranchModel);
-            organStore.setOrganTenant(this.branchInfo.organTenant).then(() => {
+            shopStore.switchBranch(this.branchInfo as BranchModel).then(() => {
                 if (this.defaultClick) {
                     mpx.reLaunch({
                         url: "/pages/tabbar/home"

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

@@ -0,0 +1,88 @@
+<template>
+    <view wx:if="{{ branchInfo.branchId || shopInfo.shopId }}" class="organ-item"
+        data-id="{{ branchInfo.branchId || shopInfo.shopId }}"
+        data-tenant="{{ branchInfo.organTenant || shopInfo.organTenant }}">
+        <image wx:if="{{ baseUrl && branchInfo.picUrl }}" class="organ-logo" src="{{ baseUrl + branchInfo.picUrl }}"
+            mode="aspectFit" />
+        <image wx:if="{{ baseUrl && shopInfo.picUrl }}" class="organ-logo" src="{{ baseUrl + shopInfo.picUrl }}"
+            mode="aspectFit" />
+        <image wx:if="{{ resourceUrl && !branchInfo.picUrl && !shopInfo.picUrl }}" class="organ-logo"
+            src="{{ resourceUrl + 'gray_logo_upload.png' }}" mode="aspectFit" />
+        <view class="organ-item-right">
+            <view class="organ-item-title">
+                <text class="organ-title-c">{{ branchInfo.facadeName || shopInfo.shopName }}</text>
+                <text>{{ branchInfo.createTime || shopInfo.createTime }}</text>
+            </view>
+            <view>{{ branchInfo.note || shopInfo.note }}</view>
+        </view>
+    </view>
+</template>
+
+<script lang="ts">
+import { createComponent } from "@mpxjs/core";
+import { useShopStore } from "../../store/shop";
+
+createComponent({
+    setup() {
+        const config = getApp().globalData.config;
+        // 资源路径
+        let resourceUrl = config.resourceUrl + "/images/components/";
+        // 图片路径
+        let baseUrl = config.baseUrl + "/v1/file/image/resize/100/100/";
+        const shopStore = useShopStore();
+        let branchInfo = shopStore.branchInfo;
+        let shopInfo = shopStore.shopInfo;
+        return { resourceUrl, baseUrl, branchInfo, shopInfo }
+    },
+    methods: {
+    }
+})
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+.organ-item {
+    background-color: $white-color;
+    border-radius: $border-radius;
+    padding: 20rpx 30rpx;
+    display: flex;
+    align-items: center;
+    gap: 20rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 8rpx 24rpx 0 rgba(44, 19, 19, 0.08);
+}
+
+.organ-logo {
+    width: 80rpx;
+    height: 80rpx;
+}
+
+.organ-item-right {
+    width: 90%;
+    display: flex;
+    flex-direction: column;
+    gap: 10rpx;
+    color: $font-color-grey;
+    font-size: $font-size-mini;
+    font-weight: 400;
+
+    .organ-item-title {
+        display: flex;
+        justify-content: space-between;
+
+        .organ-title-c {
+            color: $font-color;
+            font-size: $font-size;
+            font-weight: bold;
+        }
+    }
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {}
+}
+</script>

package/src/pages/tabbar/home.mpx

@@ -1,5 +1,6 @@
 <template>
   <view class="page-body">
+    <shop-selected-item></shop-selected-item>
     <jmash-menu menuGroups="{{ menuGroups }}" bind:itemClick="handleMenuClick"></jmash-menu>
     <view class="logout-section">
       <button type="warn" bind:tap="loginOut">退出登录</button>
@@ -88,7 +89,8 @@ createPage({
 <script type="application/json">
 {
   "usingComponents": {
-    "jmash-menu": "../../components/common/jmash-menu.mpx"
+    "jmash-menu": "../../components/common/jmash-menu.mpx",
+    "shop-selected-item": "../../components/shop/shop-selected-item.mpx"
   }
 }
 </script>

package/src/store/shop.ts

@@ -2,6 +2,7 @@ import { defineStore } from "@mpxjs/pinia";
 import type { ShopInfoModel } from "../api/shop/types";
 import type { BranchModel } from "../api/shop/types";
 import { db } from "../utils/db";
+import { useOrganStore } from "./organ";
 
 // 商户状态
 interface ShopState {
@@ -21,7 +22,10 @@ export const useShopStore = defineStore("shop", {
   }),
   actions: {
     // 切换商户门店
-    switchShopBranch(shopInfo: ShopInfoModel, branchInfo: BranchModel) {
+    switchShopBranch(
+      shopInfo: ShopInfoModel,
+      branchInfo: BranchModel
+    ): Promise<boolean> {
       this.shopInfo = shopInfo;
       this.branchInfo = branchInfo;
       this.isShop = false;
@@ -29,9 +33,11 @@ export const useShopStore = defineStore("shop", {
       db.setShopInfo(shopInfo);
       db.setBranchInfo(branchInfo);
       db.setIsShop(false);
+      const organStore = useOrganStore();
+      return organStore.setOrganTenant(branchInfo.organTenant || "");
     },
     // 切换商户
-    switchShop(shopInfo: ShopInfoModel) {
+    switchShop(shopInfo: ShopInfoModel): Promise<boolean> {
       this.shopInfo = shopInfo;
       this.branchInfo = {};
       this.isShop = true;
@@ -39,9 +45,11 @@ export const useShopStore = defineStore("shop", {
       db.setShopInfo(shopInfo);
       db.setBranchInfo({});
       db.setIsShop(true);
+      const organStore = useOrganStore();
+      return organStore.setOrganTenant(shopInfo.organTenant || "");
     },
     // 切换门店
-    switchBranch(branchInfo: BranchModel) {
+    switchBranch(branchInfo: BranchModel): Promise<boolean> {
       this.shopInfo = {};
       this.branchInfo = branchInfo;
       this.isShop = false;
@@ -49,6 +57,8 @@ export const useShopStore = defineStore("shop", {
       db.setShopInfo({});
       db.setBranchInfo(branchInfo);
       db.setIsShop(false);
+      const organStore = useOrganStore();
+      return organStore.setOrganTenant(branchInfo.organTenant || "");
     },
   },
 });

package/src/utils/db.ts

@@ -127,11 +127,13 @@ class LocalStorage {
   }
   //获取组织信息 TODO
   getOrganInfo(): StorageOrganInfoModel {
-    return mpx.getStorageSync("organInfo") || {};
+    const config = getApp().globalData.config;
+    return mpx.getStorageSync("OrganInfo:" + config.tenant) || {};
   }
   //设置组织信息
   setOrganInfo(data: StorageOrganInfoModel) {
-    mpx.setStorageSync("organInfo", data);
+    const config = getApp().globalData.config;
+    mpx.setStorageSync("OrganInfo:" + config.tenant, data);
   }
 
   // 获取商铺信息

package/lib/app.mpx.d.ts

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

package/lib/components/organ/browser-organ-list.mpx.d.ts

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

package/lib/components/organ/my-organ-list.mpx.d.ts

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

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

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

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

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

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

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

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

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