jmash-core-mp 0.1.60 → 0.1.61

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

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

package/lib/api/shop/index.js

@@ -11,10 +11,20 @@ class ShopApiImpl {
             header: { Authorization: false },
         });
     }
-    // 查询店铺管理
-    findShopInfoById(organTenant) {
+    // 查询分页信息电商管理
+    findShopPage(data) {
+        const config = getApp().globalData.config;
+        return mpx.xfetch.fetch({
+            url: "/v1/shop/info/page/" + config.tenant,
+            method: "GET",
+            data: data,
+        });
+    }
+    // 查询电商管理
+    findShopInfoById(shopId) {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: "/v1/front/shop/info/shop_info/" + organTenant,
+            url: "/v1/front/shop/info/id/" + config.tenant + "/" + shopId,
             method: "GET",
         });
     }

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

@@ -30,6 +30,26 @@ export interface ShopInfoModel {
     createBy?: string;
     createTime?: string;
 }
+export interface ShopPageReq {
+    curPage?: number;
+    pageSize?: number;
+    orderName?: string;
+    orderAsc?: boolean;
+    likeShopName?: string;
+    hasStatus?: boolean;
+    status?: boolean;
+    shopName?: string;
+    organId?: string;
+    sceneId?: string;
+    excludeSceneId?: string;
+}
+export interface ShopPage {
+    results: Array<ShopInfoModel>;
+    curPage: number;
+    pageSize: number;
+    totalSize: number;
+    pageCount: number;
+}
 export interface BranchModel {
     tenantId?: string;
     branchId?: string;

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

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

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

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

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

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

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

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

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

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

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

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

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, BranchPageReq, BranchPage, } from "./api/shop/types";
+export type { ShopInfoModel, BranchModel, BranchPageReq, BranchPage, ShopPageReq, ShopPage, } from "./api/shop/types";
 export { mpxFetch } from "./utils/request";
 export { config, initConfig, setConfig } from "./utils/config";
 export { grpc } from "./utils/grpc";

package/lib/store/shop.d.ts

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

package/lib/store/shop.js

@@ -1,6 +1,7 @@
 import { defineStore } from "@mpxjs/pinia";
 import { db } from "../utils/db";
 import { useOrganStore } from "./organ";
+import { shopApi } from "../api/shop/index";
 export const useShopStore = defineStore("shop", {
     state: () => ({
         shopInfo: db.getShopInfo() || {},
@@ -8,7 +9,14 @@ export const useShopStore = defineStore("shop", {
         isShop: db.getIsShop() || false,
     }),
     actions: {
-        // 切换商户门店
+        clearShop() {
+            this.shopInfo = {};
+            this.branchInfo = {};
+            this.isShop = false;
+            db.removeBranchInfo();
+            db.removeShopInfo();
+            db.removeIsShop();
+        },
         switchShopBranch(shopInfo, branchInfo) {
             this.shopInfo = shopInfo;
             this.branchInfo = branchInfo;
@@ -34,15 +42,22 @@ export const useShopStore = defineStore("shop", {
         },
         // 切换门店
         switchBranch(branchInfo) {
-            this.shopInfo = {};
             this.branchInfo = branchInfo;
             this.isShop = false;
             // 切换门店
-            db.setShopInfo({});
             db.setBranchInfo(branchInfo);
             db.setIsShop(false);
-            const organStore = useOrganStore();
-            return organStore.setOrganTenant(branchInfo.organTenant || "");
+            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);
+                }
+            });
         },
     },
 });

package/lib/utils/db.d.ts

@@ -37,6 +37,9 @@ declare class LocalStorage {
     setBranchInfo(data: BranchModel): void;
     getIsShop(): boolean;
     setIsShop(isShop: boolean): void;
+    removeShopInfo(): void;
+    removeBranchInfo(): void;
+    removeIsShop(): void;
 }
 declare const db: LocalStorage;
 export { db };

package/lib/utils/db.js

@@ -139,6 +139,18 @@ class LocalStorage {
     setIsShop(isShop) {
         mpx.setStorageSync("isShop", isShop);
     }
+    // 删除商铺信息
+    removeShopInfo() {
+        mpx.removeStorageSync("shopInfo");
+    }
+    // 删除门店信息
+    removeBranchInfo() {
+        mpx.removeStorageSync("branchInfo");
+    }
+    // 删除是否是商户
+    removeIsShop() {
+        mpx.removeStorageSync("isShop");
+    }
 }
 const db = new LocalStorage();
 export { db };

package/package.json

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

package/src/api/shop/index.ts

@@ -1,6 +1,12 @@
 import mpx from "@mpxjs/core";
 import { ResponseData } from "../../api/types";
-import { BranchPage, BranchPageReq, ShopInfoModel } from "./types";
+import {
+  BranchPage,
+  BranchPageReq,
+  ShopInfoModel,
+  ShopPage,
+  ShopPageReq,
+} from "./types";
 
 class ShopApiImpl {
   // 查询分页信息门店管理
@@ -14,11 +20,21 @@ class ShopApiImpl {
       header: { Authorization: false },
     });
   }
+  // 查询分页信息电商管理
+  findShopPage(data: ShopPageReq): Promise<ResponseData<ShopPage>> {
+    const config = getApp().globalData.config;
+    return mpx.xfetch.fetch({
+      url: "/v1/shop/info/page/" + config.tenant,
+      method: "GET",
+      data: data,
+    });
+  }
 
-  // 查询店铺管理
-  findShopInfoById(organTenant: string): Promise<ResponseData<ShopInfoModel>> {
+  // 查询电商管理
+  findShopInfoById(shopId: string): Promise<ResponseData<ShopInfoModel>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: "/v1/front/shop/info/shop_info/" + organTenant,
+      url: "/v1/front/shop/info/id/" + config.tenant + "/" + shopId,
       method: "GET",
     });
   }

package/src/api/shop/types.ts

@@ -62,6 +62,45 @@ export interface ShopInfoModel {
   createTime?: string;
 }
 
+export interface ShopPageReq {
+  // 当前页码
+  curPage?: number;
+  // 页尺寸
+  pageSize?: number;
+  // 排序名称
+  orderName?: string;
+  // 是否升序排序
+  orderAsc?: boolean;
+  //店铺名称模糊.
+  likeShopName?: string;
+  //是否包含状态
+  hasStatus?: boolean;
+  //状态
+  status?: boolean;
+  //店铺名称.
+  shopName?: string;
+  //组织ID.
+  organId?: string;
+  //场景ID.
+  sceneId?: string;
+  //不包含的场景ID.
+  excludeSceneId?: string;
+}
+
+// 电商管理分页
+export interface ShopPage {
+  // 当前页内容
+  results: Array<ShopInfoModel>;
+  // 当前页码
+  curPage: number;
+  // 页尺寸
+  pageSize: number;
+  // 总记录数
+  totalSize: number;
+  // 总页数
+  pageCount: number;
+}
+
 // 门店管理实体
 export interface BranchModel {
   // 租户ID

package/src/components/organ/organ-item.mpx

@@ -27,6 +27,7 @@ import type { EventBase } from "../../api/types";
 import type { StorageOrganInfoModel } from "../../api/storage/types";
 import { storageApi } from "../../api/storage/index";
 import { useOrganStore } from "../../store/organ";
+import { useShopStore } from "../../store/shop";
 
 createComponent({
     properties: {
@@ -57,9 +58,11 @@ createComponent({
                 requestId: Math.random() * 10 + "1",
             };
             const organStore = useOrganStore();
+            const shopStore = useShopStore();
             storageApi.updateStorageOrganBrowser(tempData).then((res) => {
                 if (this.defaultClick) {
                     organStore.setOrganInfo(this.organInfo as StorageOrganInfoModel);
+                    shopStore.clearShop();
                     mpx.reLaunch({
                         url: "/pages/tabbar/home"
                     });

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

@@ -5,18 +5,18 @@
 * @events click 组织详情事件，参数为组织信息
 */
 <template>
-    <view class="organ-item" data-id="{{ organInfo.storageId }}" data-tenant="{{ organInfo.organTenant }}"
+    <view class="organ-item" data-id="{{ shopInfo.shopId }}" data-tenant="{{ shopInfo.organTenant }}"
         bind:tap="handleInfo">
-        <image wx:if="{{ baseUrl && organInfo.logoUrl }}" class="organ-logo" src="{{ baseUrl + organInfo.logoUrl }}"
+        <image wx:if="{{ baseUrl && shopInfo.picUrl }}" class="organ-logo" src="{{ baseUrl + shopInfo.picUrl }}"
             mode="aspectFit" />
-        <image wx:if="{{ resourceUrl && !organInfo.logoUrl }}" class="organ-logo"
+        <image wx:if="{{ resourceUrl && !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">{{ organInfo.organName }}</text>
-                <text>{{ organInfo.createTime }}</text>
+                <text class="organ-title-c">{{ shopInfo.shopName }}</text>
+                <text>{{ shopInfo.createTime }}</text>
             </view>
-            <view>{{ organInfo.remark }}</view>
+            <view>{{ shopInfo.remark }}</view>
         </view>
     </view>
 </template>
@@ -25,12 +25,11 @@
 import mpx, { createComponent } from "@mpxjs/core";
 import type { EventBase } from "../../api/types";
 import { useShopStore } from "../../store/shop";
-import { shopApi } from "../../api/shop/index";
 
 createComponent({
     properties: {
-        // 组织信息
-        organInfo: {
+        // 电商信息
+        shopInfo: {
             type: Object,
             value: {}
         },
@@ -50,19 +49,15 @@ createComponent({
     methods: {
         // 店铺详情
         handleInfo(e: EventBase) {
-            console.log("选择店铺", this.organInfo);
+            console.log("选择电商", this.shopInfo);
             const shopStore = useShopStore();
-            shopApi.findShopInfoById(this.organInfo.organTenant).then((res) => {
-                if (res.statusCode === 200) {
-                    shopStore.switchShop(res.data).then(() => {
-                        if (this.defaultClick) {
-                            mpx.reLaunch({
-                                url: "/pages/tabbar/home"
-                            });
-                        }
-                        this.triggerEvent("click", res.data);
+            shopStore.switchShop(this.shopInfo).then(() => {
+                if (this.defaultClick) {
+                    mpx.reLaunch({
+                        url: "/pages/tabbar/home"
                     });
                 }
+                this.triggerEvent("click", this.shopInfo);
             });
         }
     }

package/src/components/shop/shop-search.mpx

@@ -9,15 +9,15 @@
         <!-- 搜索框 -->
         <view class="search-box">
             <jmash-search placeholder="{{ placeholder }}" isSearchBtn="{{ true }}"
-                likeName="{{ queryParams.likeOrganName }}" bind:handleSearch="searchEvent">
-                <button class="search-right" bind:tap="querySearchStorageList">搜索</button>
+                likeName="{{ queryParams.likeShopName }}" bind:handleSearch="searchEvent">
+                <button class="search-right" bind:tap="querySearchShopList">搜索</button>
             </jmash-search>
         </view>
         <!-- 搜索店铺列表 -->
         <scroll-view class="organ-content-h" scroll-y>
             <view class="organ-content">
                 <view wx:if="{{ mySearchList.length > 0 }}">
-                    <shop-item wx:for="{{ mySearchList }}" wx:key="index" organInfo="{{ item }}"
+                    <shop-item wx:for="{{ mySearchList }}" wx:key="index" shopInfo="{{ item }}"
                         defaultClick="{{ defaultClick }}" bind:click="handleItemClick" />
                 </view>
                 <jmash-none-data wx:else imgUrl="/mall/no-data.png" content="暂无搜索内容" contentColor="#5A94F1" />
@@ -29,8 +29,8 @@
 <script lang="ts">
 import { createComponent, ref } from "@mpxjs/core";
 import { formatDateTime } from "../../utils/common";
-import type { StorageOrganInfoModel } from "../../api/storage/types";
-import { storageApi } from "../../api/storage/index";
+import type { ShopInfoModel } from "../../api/shop/types";
+import { shopApi } from "../../api/shop/index";
 import type { EventBase } from "../../api/types";
 
 createComponent({
@@ -43,12 +43,7 @@ createComponent({
         // 搜索框占位符
         placeholder: {
             type: String,
-            value: "搜索店铺"
-        },
-        // 服务类型
-        serviceType: {
-            type: String,
-            value: "mall"
+            value: "搜索电商"
         },
         // 是否默认点击跳转
         defaultClick: {
@@ -59,15 +54,14 @@ createComponent({
     setup(props) {
         // 搜索参数
         let queryParams = ref({
-            serviceType: props.serviceType,
-            likeOrganName: "",
+            likeShopName: "",
         });
         // 搜索店铺列表
-        let mySearchList = ref([] as StorageOrganInfoModel[]);
+        let mySearchList = ref([] as ShopInfoModel[]);
 
         // 搜索店铺列表
-        function querySearchStorageList() {
-            storageApi.findStorageOrganInfoList(queryParams.value).then(({ data }) => {
+        function querySearchShopList() {
+            shopApi.findShopPage(queryParams.value).then(({ data }) => {
                 data.results.forEach((item) => {
                     item.createTime = formatDateTime(item.createTime as string, "YYYY-MM-DD")
                 });
@@ -76,28 +70,28 @@ createComponent({
         };
         // 输入搜索关键字
         function searchEvent(e: EventBase) {
-            queryParams.value.likeOrganName = e.detail;
+            queryParams.value.likeShopName = e.detail;
         };
 
         // 主动刷新列表（供外部调用）
         function refresh() {
-            querySearchStorageList();
+            querySearchShopList();
         };
 
         // 初始化加载
-        querySearchStorageList();
+        querySearchShopList();
 
         return {
             queryParams,
             mySearchList,
-            querySearchStorageList,
+            querySearchShopList,
             searchEvent,
             refresh,
         }
     },
     methods: {
         // 店铺点击事件，向上抛出 tenant
-        handleItemClick(item: StorageOrganInfoModel) {
+        handleItemClick(item: ShopInfoModel) {
             this.triggerEvent("click", item);
         }
     }

package/src/index.ts

@@ -59,6 +59,8 @@ export type {
   BranchModel,
   BranchPageReq,
   BranchPage,
+  ShopPageReq,
+  ShopPage,
 } from "./api/shop/types";
 
 export { mpxFetch } from "./utils/request";

package/src/pages/tabbar/home.mpx

@@ -17,7 +17,7 @@ createPage({
         id: 1,
         items: [
           { key: 'organ', title: '选择组织', icon: '🏠', iconBg: '#409eff', path: '/pages/organ' },
-          { key: 'shop', title: '选择店铺', icon: '🏠', iconBg: '#409eff', path: '/pages/shop-search' },
+          { key: 'shop', title: '选择电商', icon: '🏠', iconBg: '#409eff', path: '/pages/shop-search' },
           { 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' },

package/src/store/shop.ts

@@ -3,6 +3,7 @@ import type { ShopInfoModel } from "../api/shop/types";
 import type { BranchModel } from "../api/shop/types";
 import { db } from "../utils/db";
 import { useOrganStore } from "./organ";
+import { shopApi } from "../api/shop/index";
 
 // 商户状态
 interface ShopState {
@@ -21,7 +22,14 @@ export const useShopStore = defineStore("shop", {
     isShop: db.getIsShop() || false,
   }),
   actions: {
-    // 切换商户门店
+    clearShop() {
+      this.shopInfo = {};
+      this.branchInfo = {};
+      this.isShop = false;
+      db.removeBranchInfo();
+      db.removeShopInfo();
+      db.removeIsShop();
+    },
     switchShopBranch(
       shopInfo: ShopInfoModel,
       branchInfo: BranchModel
@@ -50,15 +58,21 @@ export const useShopStore = defineStore("shop", {
     },
     // 切换门店
     switchBranch(branchInfo: BranchModel): Promise<boolean> {
-      this.shopInfo = {};
       this.branchInfo = branchInfo;
       this.isShop = false;
       // 切换门店
-      db.setShopInfo({});
       db.setBranchInfo(branchInfo);
       db.setIsShop(false);
-      const organStore = useOrganStore();
-      return organStore.setOrganTenant(branchInfo.organTenant || "");
+      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);
+        }
+      });
     },
   },
 });

package/src/utils/db.ts

@@ -140,6 +140,7 @@ class LocalStorage {
   getShopInfo(): ShopInfoModel {
     return mpx.getStorageSync("shopInfo");
   }
+
   // 设置商铺信息
   setShopInfo(data: ShopInfoModel) {
     mpx.setStorageSync("shopInfo", data);
@@ -160,6 +161,18 @@ class LocalStorage {
   setIsShop(isShop: boolean): void {
     mpx.setStorageSync("isShop", isShop);
   }
+  // 删除商铺信息
+  removeShopInfo() {
+    mpx.removeStorageSync("shopInfo");
+  }
+  // 删除门店信息
+  removeBranchInfo() {
+    mpx.removeStorageSync("branchInfo");
+  }
+  // 删除是否是商户
+  removeIsShop() {
+    mpx.removeStorageSync("isShop");
+  }
 }
 
 const db = new LocalStorage();