jmash-core-mp 0.1.46 → 0.1.48

package/lib/api/storage/index.js

@@ -18,7 +18,7 @@ class StorageApiImpl {
             method: "GET",
         });
     }
-    // 查询列表信息店铺用户浏览信息
+    // 查询列表信息店铺
     findStorageOrganInfoList(data) {
         const config = getApp().globalData.config;
         return mpx.xfetch.fetch({

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

@@ -6,11 +6,18 @@ export interface StorageOrganInfoList {
     results: StorageOrganInfoModel[];
 }
 export interface StorageOrganInfoModel {
+    storageId?: string;
+    organId?: string;
     organName?: string;
-    logoUrl?: string;
+    organCode?: string;
+    serviceType?: string;
+    storage?: string;
+    status?: boolean;
+    createBy?: string;
     createTime?: string;
-    remark?: string;
     organTenant?: string;
+    remark?: string;
+    logoUrl?: string;
 }
 export interface ShopBrowserUserList {
     results: ShopBrowserUserModel[];

package/lib/packages/pages/auth/setting-page.mpx.d.ts

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

package/package.json

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

package/src/api/storage/index.ts

@@ -32,7 +32,7 @@ class StorageApiImpl {
     });
   }
 
-  // 查询列表信息店铺用户浏览信息
+  // 查询列表信息店铺
   findStorageOrganInfoList(
     data: StorageOrganInfoReq
   ): Promise<ResponseData<StorageOrganInfoList>> {

package/src/api/storage/types.ts

@@ -5,25 +5,37 @@ export interface StorageOrganInfoReq {
   // 组织名称模糊检索
   likeOrganName?: string;
 }
-
 // 组织列表
 export interface StorageOrganInfoList {
   // 当前内容
   results: StorageOrganInfoModel[];
 }
-
 // 组织实体
 export interface StorageOrganInfoModel {
+  // 存储ID
+  storageId?: string;
+  // 组织ID
+  organId?: string;
   // 组织名称
   organName?: string;
-  // 店铺图片
-  logoUrl?: string;
+  // 组织编码
+  organCode?: string;
+  // 服务类型
+  serviceType?: string;
+  // 组织信息存储区
+  storage?: string;
+  // 状态
+  status?: boolean;
+  // 创建人
+  createBy?: string;
   // 创建时间
   createTime?: string;
-  // 备注
-  remark?: string;
   // 组织租户
   organTenant?: string;
+  // 备注
+  remark?: string;
+  // 组织LOGO
+  logoUrl?: string;
 }
 
 // 店铺用户浏览信息列表
@@ -31,7 +43,6 @@ export interface ShopBrowserUserList {
   // 当前内容
   results: ShopBrowserUserModel[];
 }
-
 // 店铺用户浏览信息实体
 export interface ShopBrowserUserModel {
   // 店铺名称

package/src/components/common/jmash-cell-group.mpx

@@ -0,0 +1,201 @@
+<template>
+    <view class="cell-main">
+        <!-- 主菜单列表 -->
+        <view class="cell-group">
+            <block wx:for="{{ arr }}" wx:key="index">
+                <button class="cell contact-cell" wx:if="{{ item.show }}"
+                    open-type="{{ item.type === 'contact' ? 'contact' : '' }}" bind:tap="handleNavigate"
+                    data-item="{{ item }}">
+                    <view class="my-cell-item-l">
+                        <image wx:if="{{ resourceUrl && item.icon }}" class="cell-icon"
+                            src="{{ resourceUrl + item.icon }}" mode="widthFix" />
+                        <view class="cell-text">{{ item.text }}</view>
+                    </view>
+                    <cube-icon class="cell-arrow" type="arrow" size="28rpx" />
+                </button>
+            </block>
+        </view>
+    </view>
+
+    <!-- 公众号弹窗 -->
+    <jmash-code-interest-popup show="{{ gzShow }}" bind:close="onGzClose" />
+</template>
+
+<script lang="ts">
+import mpx, { createComponent, ref, computed } from "@mpxjs/core";
+import { config } from "../../utils/config";
+import { EventBase } from "../../api/types";
+import { useUserStore } from "../../store/user";
+
+createComponent({
+    options: {
+        styleIsolation: "apply-shared",
+    },
+    properties: {
+        // 主菜单列表
+        menuList: {
+            type: Array,
+            value: [],
+        },
+    },
+    setup(props) {
+        // 用户状态管理
+        const userStore = useUserStore();
+        // 资源路径
+        const resourceUrl = config.resourceUrl + "/images/";
+        // 默认主菜单列表
+        const defaultMenuList = computed(() => [
+            {
+                type: "setting",
+                url: "/jmash/pages/auth/setting-page",
+                tabbar: false,
+                icon: "mall/icon-my-setting.png",
+                text: "系统设置",
+                show: true,
+            },
+            {
+                type: "gz",
+                url: "",
+                tabbar: false,
+                icon: "mall/icon_12.png",
+                text: "公众号",
+                show: true,
+            },
+            {
+                type: "contact",
+                url: "",
+                tabbar: false,
+                icon: "serve/icon-my-contact.png",
+                text: "联系客服",
+                show: true,
+            },
+        ]);
+        // 使用父组件传入的列表或默认列表
+        const arr = computed(() => props.menuList.length > 0 ? props.menuList : defaultMenuList.value);
+        // 公众号弹窗显示状态
+        let gzShow = ref(false);
+
+
+        // 公众号弹窗关闭
+        function onGzClose() {
+            gzShow.value = false;
+        }
+
+        // 跳转
+        function handleNavigate(e: EventBase) {
+            const { type, url, tabbar } = e.currentTarget.dataset.item;
+            if (type === "gz") {
+                // 公众号特殊处理
+                gzShow.value = true;
+                return;
+            }
+            if (type === "contact") {
+                // 联系客服由 open-type="contact" 处理，无需导航
+                return;
+            }
+            if (!userStore.checkLogin()) {
+                mpx.showModal({
+                    title: "提示",
+                    content: "请先登录！",
+                    success(res) {
+                        if (res.confirm) {
+                            mpx.navigateTo({
+                                url: config.loginUrl + "?tabbar=true&backurl=" + encodeURIComponent("/pages/tabbar/my"),
+                            });
+                        }
+                    },
+                });
+                return;
+            }
+            if (url && !tabbar) {
+                mpx.navigateTo({ url });
+            } else if (url && tabbar) {
+                mpx.switchTab({ url });
+            }
+        }
+
+        return {
+            resourceUrl,
+            gzShow,
+            arr,
+            userStore,
+            handleNavigate,
+            onGzClose,
+        };
+    },
+});
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+.cell-main {
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
+}
+
+.cell-group {
+    margin: 0 30rpx;
+    border-radius: $border-radius;
+    background-color: $background-white-color;
+    overflow: hidden;
+}
+
+.cell {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 26rpx 30rpx;
+    border-bottom: 2rpx solid $border-line;
+    box-sizing: border-box;
+    height: 90rpx;
+
+    .my-cell-item-l {
+        display: flex;
+        align-items: center;
+        gap: 20rpx;
+
+        .cell-icon {
+            width: 34rpx;
+            height: 34rpx;
+        }
+    }
+
+    .cell-text {
+        font-size: $font-size;
+        color: #1f2937;
+    }
+
+    .cell-arrow {
+        color: $font-color-grey-opacity;
+    }
+}
+
+.cell:last-child {
+    border-bottom: 0;
+}
+
+.contact-cell {
+    border: none;
+    margin: 0;
+    background: transparent;
+    text-align: left;
+    width: 100%;
+    line-height: inherit;
+}
+
+.contact-cell::after {
+    border: none;
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {
+        "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index",
+        "jmash-code-interest-popup": "../../components/common/jmash-code-interest-popup"
+    }
+}
+</script>

package/src/components/common/jmash-code-interest-popup.mpx

@@ -0,0 +1,223 @@
+<template>
+  <!-- 关注公众号弹窗 -->
+  <jmash-popup show="{{ show }}" titleShow="{{ false }}" borderRadius="0" padding="0" bind:close="handleClose">
+    <view class="organ-code-interest-popup">
+      <view class="position-box">
+        <image wx:if="{{ resourceUrl }}" class="main-bgc-image" src="{{ resourceUrl + 'replaced/push_bgc.png' }}"
+          mode="widthFix" />
+        <view class="main">
+          <!-- 关闭文字 -->
+          <view class="main-close-text" bind:tap="handleClose">稍后关注</view>
+          <view class="main-title-image-box">
+            <view class="main-title">关注公众号</view>
+          </view>
+          <!-- 手的图片的定位盒子 -->
+          <view class="main-push-position-box">
+            <image wx:if="{{ resourceUrl }}" class="main-push-bgc-image"
+              src="{{ resourceUrl + 'replaced/push_hand_none.png' }}" mode="widthFix" />
+            <!-- 公司公众号二维码 -->
+            <view class="main-push-code-image">
+              <image wx:if="{{ resourceUrl && appQrcodeUrl }}" class="code-image" show-menu-by-longpress="{{ true }}"
+                src="{{ appQrcodeUrl }}" mode="aspectFit" />
+            </view>
+            <!-- 提示文字 -->
+            <view class="main-push-text">
+              关注后即可获得以下权益
+              <view class="main-push-text_item">
+                <image wx:if="{{ resourceUrl }}" class="main-push-text_item_left"
+                  src="{{ resourceUrl + 'icon_image/interest_lisk.png' }}" mode="aspectFit" />
+                <view class="main-push-text_item_right">
+                  <view class="main-push-text_item_right_title">消息实时提醒</view>
+                  <view>及时接收订单、收发货、交易、收益等动态信息</view>
+                </view>
+              </view>
+              <view class="main-push-text_item">
+                <image wx:if="{{ resourceUrl }}" class="main-push-text_item_left"
+                  src="{{ resourceUrl + 'icon_image/interest_lisk.png' }}" mode="aspectFit" />
+                <view class="main-push-text_item_right">
+                  <view class="main-push-text_item_right_title">享受更多服务</view>
+                  <view>关注公众号，解锁客服、活动、会员等超值服务！</view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </jmash-popup>
+</template>
+
+<script lang="ts">
+import { createComponent, ref } from "@mpxjs/core";
+import { config } from "../../utils/config";
+
+createComponent({
+  options: {
+    styleIsolation: "apply-shared"
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 是否显示
+    show: {
+      type: Boolean,
+      value: false,
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  setup() {
+    // 资源路径
+    let resourceUrl = config.resourceUrl + "/images/";
+    // 公司公众号二维码图片
+    let appQrcodeUrl = ref(config.resourceUrl + "/images/replaced/official_account2x.png");
+
+    return {
+      resourceUrl,
+      appQrcodeUrl,
+    };
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 关闭弹框
+    handleClose() {
+      this.triggerEvent("close");
+    },
+  }
+});
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+.organ-code-interest-popup {
+  .position-box {
+    position: relative;
+    top: -10rpx;
+    left: 0;
+    height: 85vh;
+
+    .main-bgc-image {
+      position: absolute;
+      top: -10rpx;
+      left: 0;
+      width: $width;
+    }
+
+    .main {
+      position: absolute;
+      top: 0rpx;
+      left: 0;
+      padding-top: 37rpx;
+      width: $width;
+
+      .main-close-text {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        font-weight: 400;
+        font-size: 30rpx;
+        color: #ffffff;
+        margin-bottom: 40rpx;
+        padding-right: 30rpx;
+      }
+
+      .main-title-image-box {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .main-title {
+          font-size: 57rpx;
+          font-weight: 500;
+          color: #0551ff;
+        }
+
+        .main-title-image {
+          width: 60%;
+          height: 69rpx;
+        }
+      }
+
+      .main-push-position-box {
+        position: relative;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: $width;
+        height: 1000rpx;
+
+        .main-push-bgc-image {
+          width: $width;
+        }
+
+        .main-push-code-image {
+          position: absolute;
+          top: 227rpx;
+          width: 187rpx;
+          height: 187rpx;
+
+          .code-image {
+            position: relative;
+            left: 14rpx;
+            width: $width;
+            height: 100%;
+          }
+        }
+
+        .main-push-text {
+          position: absolute;
+          top: 737rpx;
+          left: 80rpx;
+          color: $font-color;
+          font-size: $font-size;
+          font-weight: 600;
+          display: flex;
+          flex-direction: column;
+          gap: 35rpx;
+          letter-spacing: 1px;
+
+          .main-push-text_item {
+            display: flex;
+            align-items: self-start;
+            gap: 20rpx;
+            letter-spacing: 0.8px;
+
+            .main-push-text_item_left {
+              width: 25rpx;
+              height: 25rpx;
+              margin-top: 8rpx;
+            }
+
+            .main-push-text_item_right {
+              display: flex;
+              flex-direction: column;
+              gap: 10rpx;
+              color: $font-color-grey-opacity;
+              font-size: $font-size-mini;
+
+              &_title {
+                color: #296efe;
+                font-size: 26rpx;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+
+<script type="application/json">
+{
+  "component": true,
+  "usingComponents": {
+    "jmash-popup": "./jmash-popup"
+  }
+}
+</script>

package/src/packages/index.mpx

@@ -4,6 +4,7 @@
         "./pages/auth/login",
         "./pages/auth/update-user",
         "./pages/auth/cms-protocol",
+        "./pages/auth/setting-page",
         "./pages/cms/cms-article-list",
         "./pages/cms/cms-article",
         "./pages/cms/cms-location-list",

package/src/packages/pages/auth/setting-page.mpx

@@ -0,0 +1,135 @@
+<template>
+  <!-- 我的协议 -->
+  <view class="cell-group" wx:for="{{ arr }}" wx:key="index">
+    <navigator class="cell" url="{{ item.url }}" open-type="{{ item.openType }}" hover-class="none">
+      <view class="cell-text">{{ item.title }}</view>
+      <cube-icon class="cell-arrow" type="arrow" size="28rpx" />
+    </navigator>
+  </view>
+
+  <!-- 退出登录-仅清理用户相关数据 -->
+  <view class="logout-section">
+    <view class="logout-btn" bindtap="handleLogout">
+      <text class="logout-text">退出登录</text>
+    </view>
+  </view>
+</template>
+
+<script lang="ts">
+import mpx, { createPage } from "@mpxjs/core";
+import { useUserStore } from "../../../store/user";
+
+createPage({
+  setup() {
+    const userStore = useUserStore();
+    const config = getApp().globalData.config;
+    // 我的协议
+    let arr = [
+      {
+        title: "用户协议",
+        openType: "navigateTo",
+        url: `/jmash/pages/auth/cms-protocol?tenant=${config.siteTenant}&siteId=${config.siteId}&channelAlias=${config.aliasAgreement}`,
+      },
+      {
+        title: "隐私政策",
+        openType: "navigateTo",
+        url: `/jmash/pages/auth/cms-protocol?tenant=${config.siteTenant}&siteId=${config.siteId}&channelAlias=${config.aliasPrivacy}`,
+      },
+    ];
+
+    return { arr, userStore }
+  },
+  methods: {
+    handleLogout() {
+      mpx.showModal({
+        title: "提示",
+        content: "确定要退出登录吗？",
+        success: (res) => {
+          if (!res.confirm) return
+
+          // 1. 只清除登录相关数据，保留角色权限等其他数据
+          mpx.removeStorageSync('token')
+          mpx.removeStorageSync('refreshToken')
+          mpx.removeStorageSync('expiresDate')
+          mpx.removeStorageSync('expiresIn')
+          mpx.removeStorageSync('userInfo')
+
+          // 2. 重置 store 状态
+          this.userStore.accessToken = ''
+          this.userStore.expiresDate = 0
+          this.userStore.userInfo = {} as any
+
+          mpx.showToast({ title: "已退出登录", icon: "none" })
+
+          // 3. 跳转到启动页，重新走登录流程
+          mpx.navigateBack({ delta: 1 })
+        },
+      })
+    },
+  },
+});
+</script>
+
+<style lang="scss">
+@use "../../../styles/index.scss" as *;
+
+page {
+  background-color: $background-color;
+}
+
+.cell-group {
+  background: $background-white-color;
+}
+
+.cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 28rpx 30rpx;
+  color: $font-color;
+  border-bottom: 2rpx solid $border-line;
+}
+
+.cell:last-child {
+  border-bottom: 0;
+}
+
+.cell-text {
+  font-size: $font-size;
+}
+
+.cell-arrow {
+  color: $font-color-grey-opacity;
+}
+
+.logout-section {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 0 0 calc(env(safe-area-inset-bottom) + 300rpx);
+  background-color: $background-color;
+}
+
+.logout-btn {
+  background-color: $background-white-color;
+  padding: 32rpx 0;
+  text-align: center;
+  border-radius: 12rpx;
+}
+
+.logout-text {
+  font-size: $font-size;
+  color: #dc2626;
+  font-weight: 500;
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {
+    "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index"
+  },
+  "navigationBarTitleText": "系统设置"
+}
+</script>