jmash-core-mp 0.1.57 → 0.1.59

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

@@ -0,0 +1,7 @@
+import { ResponseData } from "../../api/types";
+import { BranchPage, BranchPageReq } from "./types";
+declare class ShopApiImpl {
+    findShopBranchPage(data: BranchPageReq): Promise<ResponseData<BranchPage>>;
+}
+declare const shopApi: ShopApiImpl;
+export { shopApi };

package/lib/api/shop/index.js

@@ -0,0 +1,16 @@
+import mpx from "@mpxjs/core";
+class ShopApiImpl {
+    // 查询分页信息门店管理
+    findShopBranchPage(data) {
+        const config = getApp().globalData.config;
+        data.tenant = data.tenant || config.tenant;
+        return mpx.xfetch.fetch({
+            url: "/v1/front/shop/scene_branch/page/" + data.tenant,
+            method: "GET",
+            data: data,
+            header: { Authorization: false },
+        });
+    }
+}
+const shopApi = new ShopApiImpl();
+export { shopApi };

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;
@@ -55,3 +57,29 @@ export interface BranchModel {
     distanceMeter?: string;
     organTenant?: string;
 }
+export interface BranchPageReq {
+    tenant?: string;
+    curPage?: number;
+    pageSize?: number;
+    orderName?: string;
+    orderAsc?: boolean;
+    shopId?: string;
+    likeFacadeName?: string;
+    facadeName?: string;
+    likeRegionCode?: string;
+    shopIds?: string[];
+    hasIsHq?: boolean;
+    isHq?: boolean;
+    hasStatus?: boolean;
+    status?: boolean;
+    longitude?: number;
+    latitude?: number;
+    likeCategory?: string;
+}
+export interface BranchPage {
+    results: Array<BranchModel>;
+    curPage: number;
+    pageSize: number;
+    totalSize: number;
+    pageCount: number;
+}

package/lib/index.d.ts

@@ -6,7 +6,7 @@ export { EntryDict, EnumDict, EntryLayDict, CustomBizDict } from "./api/dicts";
 export type { FileInfo, FileBase64Req, FileDownInfo, FileWebReq, } from "./api/files/types";
 export type { DictRegionList, DictRegionReq, DictRegionModel, } from "./api/region/types";
 export type { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganInfoModel, ShopBrowserUserList, ShopBrowserUserModel, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel, } from "./api/storage/types";
-export type { ShopInfoModel, BranchModel } from "./api/shop/types";
+export type { ShopInfoModel, BranchModel, BranchPageReq, BranchPage, } from "./api/shop/types";
 export { mpxFetch } from "./utils/request";
 export { config, initConfig, setConfig } from "./utils/config";
 export { grpc } from "./utils/grpc";
@@ -20,6 +20,7 @@ export { dictApi } from "./api/dict";
 export { fileApi } from "./api/files";
 export { regionApi } from "./api/region";
 export { storageApi } from "./api/storage";
+export { shopApi } from "./api/shop";
 export { net } from "./utils/net";
 export { getHeight, formatDateTime, validateRules, validateRequired, } from "./utils/common";
 import * as dayjs from "dayjs";

package/lib/index.js

@@ -13,6 +13,7 @@ export { dictApi } from "./api/dict";
 export { fileApi } from "./api/files";
 export { regionApi } from "./api/region";
 export { storageApi } from "./api/storage";
+export { shopApi } from "./api/shop";
 export { net } from "./utils/net";
 export { getHeight, formatDateTime, validateRules, validateRequired, } from "./utils/common";
 import * as dayjsLocaleZhCn from "dayjs/locale/zh-cn";

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

@@ -105,13 +105,15 @@ class LocalStorage {
         const config = getApp().globalData.config;
         mpx.setStorageSync("OrganTenant:" + config.tenant, organTenant);
     }
-    //获取组织信息
+    //获取组织信息 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.57",
+  "version": "0.1.59",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/shop/index.ts

@@ -0,0 +1,20 @@
+import mpx from "@mpxjs/core";
+import { ResponseData } from "../../api/types";
+import { BranchPage, BranchPageReq } from "./types";
+
+class ShopApiImpl {
+  // 查询分页信息门店管理
+  findShopBranchPage(data: BranchPageReq): Promise<ResponseData<BranchPage>> {
+    const config = getApp().globalData.config;
+    data.tenant = data.tenant || config.tenant;
+    return mpx.xfetch.fetch({
+      url: "/v1/front/shop/scene_branch/page/" + data.tenant,
+      method: "GET",
+      data: data,
+      header: { Authorization: false },
+    });
+  }
+}
+
+const shopApi = new ShopApiImpl();
+export { shopApi };

package/src/api/shop/types.ts

@@ -56,6 +56,10 @@ export interface ShopInfoModel {
   organId?: string;
   // 组织租户
   organTenant?: string;
+  // 创建人
+  createBy?: string;
+  // 创建时间
+  createTime?: string;
 }
 
 // 门店管理实体
@@ -111,3 +115,55 @@ export interface BranchModel {
   // 组织租户
   organTenant?: string;
 }
+
+// 门店管理查询
+export interface BranchPageReq {
+  // 租户
+  tenant?: string;
+  // 当前页码
+  curPage?: number;
+  // 页尺寸
+  pageSize?: number;
+  // 排序名称
+  orderName?: string;
+  // 是否升序排序
+  orderAsc?: boolean;
+  // 店铺ID
+  shopId?: string;
+  // 门店名称模糊查询
+  likeFacadeName?: string;
+  // 门店名称精确查询
+  facadeName?: string;
+  // 地区编码模糊查询
+  likeRegionCode?: string;
+  // 店铺ID列表
+  shopIds?: string[];
+  // 是否有总部
+  hasIsHq?: boolean;
+  // 是否总部
+  isHq?: boolean;
+  // 是否有状态
+  hasStatus?: boolean;
+  // 状态
+  status?: boolean;
+  // 经度
+  longitude?: number;
+  // 纬度
+  latitude?: number;
+  // 门店分类模糊查询
+  likeCategory?: string;
+}
+
+// 门店管理分页
+export interface BranchPage {
+  // 当前页内容
+  results: Array<BranchModel>;
+  // 当前页码
+  curPage: number;
+  // 页尺寸
+  pageSize: number;
+  // 总记录数
+  totalSize: number;
+  // 总页数
+  pageCount: number;
+}

package/src/app.mpx

@@ -35,6 +35,7 @@ createApp({
       "./pages/tabbar/my",
       "./pages/organ",
       "./pages/organ-search",
+      "./pages/branch-search",
     ],
     "packages": [
       "./packages/index?root=jmash"

package/src/components/organ/browser-organ-list.mpx

@@ -12,6 +12,7 @@ import { createComponent, ref } from "@mpxjs/core";
 import { storageApi } from "../../api/storage/index";
 import { formatDateTime } from "../../utils/common";
 import type { StorageOrganInfoModel } from "../../api/storage/types";
+import { useUserStore } from '../../store/user'
 
 createComponent({
     properties: {
@@ -28,11 +29,15 @@ createComponent({
     },
     setup(props) {
         let organList = ref([] as StorageOrganInfoModel[]);
-        storageApi.findStorageBrowserOrganList({ serviceType: props.serviceType }).then(({ data }) => {
-            data.results.forEach((item) => {
-                item.createTime = formatDateTime(item.createTime as string, "YYYY-MM-DD")
+        const userStore = useUserStore();
+        // 检查登录并跳转登录
+        userStore.loginOnlyAC().then((res) => {
+            storageApi.findStorageBrowserOrganList({ serviceType: props.serviceType }).then(({ data }) => {
+                data.results.forEach((item) => {
+                    item.createTime = formatDateTime(item.createTime as string, "YYYY-MM-DD")
+                });
+                organList.value = data.results;
             });
-            organList.value = data.results;
         });
         return { organList };
     },

package/src/components/organ/my-organ-list.mpx

@@ -12,6 +12,7 @@ import { createComponent, ref } from "@mpxjs/core";
 import { storageApi } from "../../api/storage/index";
 import { formatDateTime } from "../../utils/common";
 import type { StorageOrganInfoModel } from "../../api/storage/types";
+import { useUserStore } from '../../store/user'
 
 createComponent({
     properties: {
@@ -28,11 +29,15 @@ createComponent({
     },
     setup(props) {
         let organList = ref([] as StorageOrganInfoModel[]);
-        storageApi.findMyOrganList({ serviceType: props.serviceType }).then(({ data }) => {
-            data.results.forEach((item) => {
-                item.createTime = formatDateTime(item.createTime as string, "YYYY-MM-DD")
+        const userStore = useUserStore();
+        // 检查登录并跳转登录
+        userStore.loginOnlyAC().then((res) => {
+            storageApi.findMyOrganList({ serviceType: props.serviceType }).then(({ data }) => {
+                data.results.forEach((item) => {
+                    item.createTime = formatDateTime(item.createTime as string, "YYYY-MM-DD")
+                });
+                organList.value = data.results;
             });
-            organList.value = data.results;
         });
         return { organList };
     },

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

@@ -0,0 +1,112 @@
+/**
+* 组织组件
+* @props organInfo 组织信息
+* @props defaultClick 是否默认点击跳转
+* @events click 组织详情事件，参数为组织信息
+*/
+<template>
+    <view class="organ-item" data-id="{{ branchInfo.branchId }}" data-tenant="{{ branchInfo.organTenant }}"
+        bind:tap="handleInfo">
+        <image wx:if="{{ resourceUrl }}" 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 }}</text>
+                <text>{{ branchInfo.createTime }}</text>
+            </view>
+            <view>{{ branchInfo.note }}</view>
+        </view>
+    </view>
+</template>
+
+<script lang="ts">
+import mpx, { createComponent } from "@mpxjs/core";
+import type { EventBase } from "../../api/types";
+import type { BranchModel } from "../../api/shop/types";
+import { useShopStore } from "../../store/shop";
+
+createComponent({
+    properties: {
+        // 门店信息
+        branchInfo: {
+            type: Object,
+            value: {}
+        },
+        defaultClick: {
+            type: Boolean,
+            value: true
+        }
+    },
+    setup() {
+        const config = getApp().globalData.config;
+        // 资源路径
+        let resourceUrl = config.resourceUrl + "/images/components/";
+        // 图片路径
+        let baseUrl = config.baseUrl + "/v1/file/image/resize/100/100/";
+        return { resourceUrl, baseUrl }
+    },
+    methods: {
+        // 店铺详情
+        handleInfo(e: EventBase) {
+            //console.log("选择门店", this.branchInfo);
+            const shopStore = useShopStore();
+            shopStore.switchBranch(this.branchInfo as BranchModel).then(() => {
+                if (this.defaultClick) {
+                    mpx.reLaunch({
+                        url: "/pages/tabbar/home"
+                    });
+                }
+                this.triggerEvent("click", this.branchInfo);
+            });
+        }
+    }
+})
+</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/components/shop/branch-search.mpx

@@ -0,0 +1,142 @@
+/**
+* 店铺搜索组件
+* @param top 顶部安全距离（px）Number 默认0
+* @param placeholder 搜索框占位符 String 默认"搜索店铺"
+* @events click 店铺点击事件，参数为当前店铺租户 tenant
+*/
+<template>
+    <view class="organ-main" style="margin-top: {{ top }}px; height: calc(100vh - 100px - {{ top }}px);">
+        <!-- 搜索框 -->
+        <view class="search-box">
+            <jmash-search placeholder="{{ placeholder }}" isSearchBtn="{{ true }}"
+                likeName="{{ queryParams.likeFacadeName }}" bind:handleSearch="searchEvent">
+                <button class="search-right" bind:tap="querySearchBranchList">搜索</button>
+            </jmash-search>
+        </view>
+        <!-- 搜索店铺列表 -->
+        <scroll-view class="organ-content-h" scroll-y>
+            <view class="organ-content">
+                <view wx:if="{{ mySearchList.length > 0 }}">
+                    <branch-item wx:for="{{ mySearchList }}" wx:key="index" branchInfo="{{ item }}"
+                        defaultClick="{{ defaultClick }}" bind:click="handleItemClick" />
+                </view>
+                <jmash-none-data wx:else imgUrl="/mall/no-data.png" content="暂无搜索内容" contentColor="#5A94F1" />
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script lang="ts">
+import { createComponent, ref } from "@mpxjs/core";
+import { formatDateTime } from "../../utils/common";
+import type { BranchModel } from "../../api/shop/types";
+import { shopApi } from "../../api/shop/index";
+import type { EventBase } from "../../api/types";
+
+createComponent({
+    properties: {
+        // 顶部安全距离
+        top: {
+            type: Number,
+            value: 0
+        },
+        // 搜索框占位符
+        placeholder: {
+            type: String,
+            value: "搜索店铺"
+        },
+        // 是否默认点击跳转
+        defaultClick: {
+            type: Boolean,
+            value: true
+        }
+    },
+    setup(props) {
+        // 搜索参数
+        let queryParams = ref({
+            likeFacadeName: "",
+        });
+        // 搜索店铺列表
+        let mySearchList = ref([] as BranchModel[]);
+
+        // 搜索店铺列表
+        function querySearchBranchList() {
+            shopApi.findShopBranchPage(queryParams.value).then(({ data }) => {
+                data.results.forEach((item) => {
+                    item.createTime = formatDateTime(item.createTime as string, "YYYY-MM-DD")
+                });
+                mySearchList.value = data.results;
+            });
+        };
+        // 输入搜索关键字
+        function searchEvent(e: EventBase) {
+            queryParams.value.likeFacadeName = e.detail;
+        };
+
+        // 主动刷新列表（供外部调用）
+        function refresh() {
+            querySearchBranchList();
+        };
+
+        // 初始化加载
+        querySearchBranchList();
+
+        return {
+            queryParams,
+            mySearchList,
+            querySearchBranchList,
+            searchEvent,
+            refresh,
+        }
+    },
+    methods: {
+        // 店铺点击事件，向上抛出 tenant
+        handleItemClick(item: BranchModel) {
+            this.triggerEvent("click", item);
+        }
+    }
+})
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+.organ-main {
+    padding: 40rpx 0;
+    box-sizing: border-box;
+
+    .search-box {
+        padding: 0 30rpx;
+
+        .search-right {
+            background: linear-gradient(#3B82F6, #2563EB);
+            color: $white-color;
+            font-size: $font-size-mini;
+            padding: 0 60rpx;
+            border-radius: 40rpx;
+            height: 54rpx;
+            line-height: 54rpx;
+        }
+    }
+
+    .organ-content-h {
+        height: 90%;
+        padding-top: 20rpx;
+    }
+
+    .organ-content {
+        margin: 0 30rpx;
+    }
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {
+        "jmash-search": "../common/jmash-search",
+        "jmash-none-data": "../common/jmash-none-data",
+        "branch-item": "./branch-item"
+    }
+}
+</script>

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/index.ts

@@ -54,7 +54,12 @@ export type {
   StorageOrganBrowserUpdateReq,
   StorageOrganBrowserModel,
 } from "./api/storage/types";
-export type { ShopInfoModel, BranchModel } from "./api/shop/types";
+export type {
+  ShopInfoModel,
+  BranchModel,
+  BranchPageReq,
+  BranchPage,
+} from "./api/shop/types";
 
 export { mpxFetch } from "./utils/request";
 export { config, initConfig, setConfig } from "./utils/config";
@@ -70,6 +75,7 @@ export { dictApi } from "./api/dict";
 export { fileApi } from "./api/files";
 export { regionApi } from "./api/region";
 export { storageApi } from "./api/storage";
+export { shopApi } from "./api/shop";
 export { net } from "./utils/net";
 export {
   getHeight,

package/src/pages/branch-search.mpx

@@ -0,0 +1,60 @@
+<template>
+    <!-- 搜索店铺 -->
+    <jmash-top-navigation id="nav" indexBg title="{{ navigationTitle }}" leftIcon="back" />
+
+    <branch-search id="branch-search" top="{{ top }}" />
+</template>
+
+<script lang="ts">
+import { createPage, ref } from "@mpxjs/core";
+import { getHeight } from "../utils/common";
+
+createPage({
+
+    setup() {
+        let config = getApp().globalData.config;
+        // 顶部安全距离
+        let top = ref(getHeight().MenuButtonBottom);
+        // 小程序名称
+        let navigationTitle = ref(config.xcxName);
+
+        return {
+            top,
+            navigationTitle,
+        }
+    },
+
+    /**
+     * 页面显示时刷新搜索列表
+     */
+    onShow() {
+        const comp = this.selectComponent('#branch-search');
+        comp && comp.refresh();
+    },
+
+    /**
+     * 页面滚动时调用
+     */
+    onPageScroll(e) {
+        this.selectComponent('#nav').calculateOpacity(e.scrollTop);
+    },
+})
+</script>
+
+<style lang="scss">
+@use "../styles/index.scss" as *;
+
+page {
+    background: linear-gradient(#EDF5FF, $white-color);
+}
+</style>
+
+<script type="application/json">
+{
+    "usingComponents": {
+        "jmash-top-navigation": "../components/common/jmash-top-navigation",
+        "branch-search": "../components/shop/branch-search"
+    },
+    "navigationStyle": "custom"
+}
+</script>

package/src/pages/organ.mpx

@@ -22,6 +22,7 @@
 <script lang="ts">
 import mpx, { createPage, ref, onShow } from "@mpxjs/core";
 import { getHeight } from "../utils/common";
+import { useUserStore } from '../store/user'
 
 createPage({
     setup() {
@@ -32,12 +33,13 @@ createPage({
         let searchPlaceholder = ref("搜索店铺");
         // 小程序名称
         let navigationTitle = ref(config.xcxName);
-
-        /**
-         * 页面显示时调用
-         */
+        // 强制登录
         onShow(() => {
-
+            const userStore = useUserStore();
+            // 检查登录并跳转登录
+            userStore.loginAC("/pages/organ", false).then((res) => {
+                console.log(res);
+            });
         });
 
         // 搜索

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>
@@ -19,6 +20,7 @@ createPage({
         id: 1,
         items: [
           { key: 'organ', title: '选择组织', icon: '🏠', iconBg: '#409eff', path: '/pages/organ' },
+          { key: 'branch', title: '选择店铺', icon: '🏠', iconBg: '#409eff', path: '/pages/branch-search' },
           { key: 'home', title: '主页（全屏登录检查）', icon: '🏠', iconBg: '#409eff', path: '/pages/home' },
           { key: 'home2', title: '主页（全屏登录）', icon: '🏠', iconBg: '#67c23a', path: '/pages/home2' },
           { key: 'half-home', title: '主页（半屏登录）', icon: '🏠', iconBg: '#e6a23c', path: '/pages/half-home' },
@@ -87,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

@@ -125,13 +125,15 @@ class LocalStorage {
     const config = getApp().globalData.config;
     mpx.setStorageSync("OrganTenant:" + config.tenant, organTenant);
   }
-  //获取组织信息
+  //获取组织信息 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);
   }
 
   // 获取商铺信息