jmash-core-mp 0.1.59 → 0.1.60

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

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

package/lib/api/shop/index.js

@@ -11,6 +11,13 @@ class ShopApiImpl {
             header: { Authorization: false },
         });
     }
+    // 查询店铺管理
+    findShopInfoById(organTenant) {
+        return mpx.xfetch.fetch({
+            url: "/v1/front/shop/info/shop_info/" + organTenant,
+            method: "GET",
+        });
+    }
 }
 const shopApi = new ShopApiImpl();
 export { shopApi };

package/package.json

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

package/src/api/shop/index.ts

@@ -1,6 +1,6 @@
 import mpx from "@mpxjs/core";
 import { ResponseData } from "../../api/types";
-import { BranchPage, BranchPageReq } from "./types";
+import { BranchPage, BranchPageReq, ShopInfoModel } from "./types";
 
 class ShopApiImpl {
   // 查询分页信息门店管理
@@ -14,6 +14,14 @@ class ShopApiImpl {
       header: { Authorization: false },
     });
   }
+
+  // 查询店铺管理
+  findShopInfoById(organTenant: string): Promise<ResponseData<ShopInfoModel>> {
+    return mpx.xfetch.fetch({
+      url: "/v1/front/shop/info/shop_info/" + organTenant,
+      method: "GET",
+    });
+  }
 }
 
 const shopApi = new ShopApiImpl();

package/src/app.mpx

@@ -35,6 +35,7 @@ createApp({
       "./pages/tabbar/my",
       "./pages/organ",
       "./pages/organ-search",
+      "./pages/shop-search",
       "./pages/branch-search",
     ],
     "packages": [

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

@@ -43,7 +43,7 @@ createComponent({
         // 搜索框占位符
         placeholder: {
             type: String,
-            value: "搜索店铺"
+            value: "搜索门店"
         },
         // 是否默认点击跳转
         defaultClick: {

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

@@ -0,0 +1,118 @@
+/**
+* 组织组件
+* @props organInfo 组织信息
+* @props defaultClick 是否默认点击跳转
+* @events click 组织详情事件，参数为组织信息
+*/
+<template>
+    <view class="organ-item" data-id="{{ organInfo.storageId }}" data-tenant="{{ organInfo.organTenant }}"
+        bind:tap="handleInfo">
+        <image wx:if="{{ baseUrl && organInfo.logoUrl }}" class="organ-logo" src="{{ baseUrl + organInfo.logoUrl }}"
+            mode="aspectFit" />
+        <image wx:if="{{ resourceUrl && !organInfo.logoUrl }}" 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>
+            </view>
+            <view>{{ organInfo.remark }}</view>
+        </view>
+    </view>
+</template>
+
+<script lang="ts">
+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: {
+            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.organInfo);
+            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);
+                    });
+                }
+            });
+        }
+    }
+})
+</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/shop-search.mpx

@@ -0,0 +1,148 @@
+/**
+* 店铺搜索组件
+* @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.likeOrganName }}" bind:handleSearch="searchEvent">
+                <button class="search-right" bind:tap="querySearchStorageList">搜索</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 }}"
+                        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 { StorageOrganInfoModel } from "../../api/storage/types";
+import { storageApi } from "../../api/storage/index";
+import type { EventBase } from "../../api/types";
+
+createComponent({
+    properties: {
+        // 顶部安全距离
+        top: {
+            type: Number,
+            value: 0
+        },
+        // 搜索框占位符
+        placeholder: {
+            type: String,
+            value: "搜索店铺"
+        },
+        // 服务类型
+        serviceType: {
+            type: String,
+            value: "mall"
+        },
+        // 是否默认点击跳转
+        defaultClick: {
+            type: Boolean,
+            value: true
+        }
+    },
+    setup(props) {
+        // 搜索参数
+        let queryParams = ref({
+            serviceType: props.serviceType,
+            likeOrganName: "",
+        });
+        // 搜索店铺列表
+        let mySearchList = ref([] as StorageOrganInfoModel[]);
+
+        // 搜索店铺列表
+        function querySearchStorageList() {
+            storageApi.findStorageOrganInfoList(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.likeOrganName = e.detail;
+        };
+
+        // 主动刷新列表（供外部调用）
+        function refresh() {
+            querySearchStorageList();
+        };
+
+        // 初始化加载
+        querySearchStorageList();
+
+        return {
+            queryParams,
+            mySearchList,
+            querySearchStorageList,
+            searchEvent,
+            refresh,
+        }
+    },
+    methods: {
+        // 店铺点击事件，向上抛出 tenant
+        handleItemClick(item: StorageOrganInfoModel) {
+            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",
+        "shop-item": "./shop-item"
+    }
+}
+</script>

package/src/pages/shop-search.mpx

@@ -0,0 +1,60 @@
+<template>
+    <!-- 搜索店铺 -->
+    <jmash-top-navigation id="nav" indexBg title="{{ navigationTitle }}" leftIcon="back" />
+
+    <shop-search id="shop-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",
+        "shop-search": "../components/shop/shop-search"
+    },
+    "navigationStyle": "custom"
+}
+</script>

package/src/pages/tabbar/home.mpx

@@ -2,9 +2,6 @@
   <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>
-    </view>
   </view>
 </template>
 
@@ -20,11 +17,11 @@ createPage({
         id: 1,
         items: [
           { key: 'organ', title: '选择组织', icon: '🏠', iconBg: '#409eff', path: '/pages/organ' },
-          { key: 'branch', title: '选择店铺', icon: '🏠', iconBg: '#409eff', path: '/pages/branch-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' },
           { key: 'half-home', title: '主页（半屏登录）', icon: '🏠', iconBg: '#e6a23c', path: '/pages/half-home' },
-          { key: 'comp-test', title: '组件演示', icon: '🧩', iconBg: '#f56c6c', path: '/pages/basic-component' },
           {
             key: 'cms-location-list', title: '位置列表', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/cms/cms-location-list'
           },
@@ -55,13 +52,6 @@ createPage({
         mpx.navigateTo({ url: item.path })
       }
     },
-    loginOut() {
-      this.userStore.logout();
-      mpx.showToast({
-        title: '已退出登录',
-        icon: 'success'
-      })
-    }
   }
 })
 </script>