jmash-core-mp 0.1.74 → 0.1.76

package/lib/components/auth-user/jmash-update-user.mpx.d.ts

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

package/lib/components/auth-user/jmash-user.mpx.d.ts

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

package/lib/components/core/jmash-login.mpx.d.ts

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

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

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

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

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

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

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

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

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

package/lib/store/user.d.ts

@@ -9,7 +9,9 @@ interface UserState {
     referee: string;
 }
 export declare const useUserStore: import("@mpxjs/pinia").StoreDefinition<"user", UserState, {}, {
-    /** 登录检查 */
+    /** 尝试登录,无需处理异常 */
+    loginTry(): Promise<boolean>;
+    /** 登录检查(需处理异常) */
     loginOnlyAC(): Promise<boolean>;
     /** 登录检查并跳转登录 */
     loginAC(backurl: string, tabbar: boolean, loginurl?: string): Promise<boolean>;

package/lib/store/user.js

@@ -14,7 +14,17 @@ export const useUserStore = defineStore("user", {
         referee: db.getReferee() || "",
     }),
     actions: {
-        /** 登录检查 */
+        /** 尝试登录,无需处理异常 */
+        loginTry() {
+            return this.loginOnlyAC()
+                .then((res) => {
+                return res;
+            })
+                .catch(() => {
+                return false;
+            });
+        },
+        /** 登录检查(需处理异常) */
         loginOnlyAC() {
             // 1. 已登录 → 直接返回成功
             if (this.checkLogin()) {

package/lib/utils/share.js

@@ -45,7 +45,7 @@ class ShareUtil {
                 .findShopBranchById(options.organTenant, options.branchId)
                 .then((res) => {
                 return shopStore.switchBranch(res.data).then(() => {
-                    return userStore.loginOnlyAC();
+                    return userStore.loginTry();
                 });
             });
         }
@@ -54,7 +54,7 @@ class ShareUtil {
             console.log("商城ID", options.shopId);
             return shopApi.findShopInfoById(options.shopId).then((res) => {
                 return shopStore.switchShop(res.data).then(() => {
-                    return userStore.loginOnlyAC();
+                    return userStore.loginTry();
                 });
             });
         }
@@ -64,11 +64,11 @@ class ShareUtil {
             console.log("组织Token", options.organTenant);
             return organStore.setOrganTenant(options.organTenant).then(() => {
                 //静默登录
-                return userStore.loginOnlyAC();
+                return userStore.loginTry();
             });
         }
         //静默登录
-        return userStore.loginOnlyAC();
+        return userStore.loginTry();
     }
     // 分享用户页给好友
     shareUserPath(pagePath, query) {
@@ -91,7 +91,7 @@ class ShareUtil {
             userStore.setReferee(options.referee);
         }
         //静默登录
-        return userStore.loginOnlyAC();
+        return userStore.loginTry();
     }
     // 分享组织页给好友
     shareOrganPath(pagePath, query) {
@@ -122,11 +122,11 @@ class ShareUtil {
         if (options.organTenant) {
             return organStore.setOrganTenant(options.organTenant).then(() => {
                 //静默登录
-                return userStore.loginOnlyAC();
+                return userStore.loginTry();
             });
         }
         //静默登录
-        return userStore.loginOnlyAC();
+        return userStore.loginTry();
     }
     // 分享电商页给好友
     shareMallPath(pagePath, query) {
@@ -175,7 +175,7 @@ class ShareUtil {
                 .findShopBranchById(options.organTenant, options.branchId)
                 .then((res) => {
                 return shopStore.switchBranch(res.data).then(() => {
-                    return userStore.loginOnlyAC();
+                    return userStore.loginTry();
                 });
             });
         }
@@ -184,12 +184,12 @@ class ShareUtil {
             console.log("商城ID", options.shopId);
             return shopApi.findShopInfoById(options.shopId).then((res) => {
                 return shopStore.switchShop(res.data).then(() => {
-                    return userStore.loginOnlyAC();
+                    return userStore.loginTry();
                 });
             });
         }
         //静默登录
-        return userStore.loginOnlyAC();
+        return userStore.loginTry();
     }
 }
 const share = new ShareUtil();

package/package.json

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

package/src/components/common/jmash-status-filter.mpx

@@ -0,0 +1,152 @@
+/**
+* 通用状态下拉筛选组件
+* @param {Array} props.options - 下拉选项列表 [{ value: "", text: "" }] - 默认值为[]
+* @param {String} props.value - 当前选中值 - 默认值为""
+* @param {String} props.placeholder - 无匹配项时的占位文本 - 默认值为"全部"
+* @event bind:change - 选择某项时触发，事件 detail 为 { value, text }
+*/
+<template>
+    <view class="status-filter">
+        <view class="status-filter-current" bind:tap="handleToggle">
+            {{ currentText }}
+            <cube-icon type="{{ selectStatus ? 'collapse' : 'expand' }}" size="22rpx" color="#333" />
+        </view>
+        <!-- 下拉框 -->
+        <view wx:if="{{ selectStatus }}" class="status-filter-dropdown" catch:tap>
+            <view class="status-filter-dropdown-item" wx:for="{{ options }}" wx:key="value"
+                data-value="{{ item.value }}" bind:tap="handleSelect">
+                {{ item.text }}
+            </view>
+        </view>
+    </view>
+
+    <!-- 透明遮罩：点击其他区域关闭下拉框 -->
+    <view wx:if="{{ selectStatus }}" class="status-filter-mask" catch:tap="handleToggle" />
+</template>
+
+<script lang="ts">
+import { createComponent, ref } from "@mpxjs/core";
+import { EventBase } from "../../api/types";
+
+createComponent({
+    properties: {
+        // 下拉选项列表
+        options: {
+            type: Array,
+            value: [],
+            observer() {
+                this.updateCurrentText();
+            },
+        },
+        // 当前选中值
+        value: {
+            type: String,
+            value: "",
+            observer() {
+                this.updateCurrentText();
+            },
+        },
+        // 占位文本
+        placeholder: {
+            type: String,
+            value: "全部",
+        },
+    },
+    setup() {
+        // 是否展开下拉框
+        let selectStatus = ref(false);
+        // 当前显示文本
+        let currentText = ref("");
+
+        return { selectStatus, currentText }
+    },
+    lifetimes: {
+        ready() {
+            this.updateCurrentText();
+        },
+    },
+    methods: {
+        // 根据当前 value 在 options 中查找对应文本
+        updateCurrentText() {
+            const item = (this.options as Array<{ value: string; text: string }>)
+                .find((o) => o.value === this.value);
+            this.currentText = item ? item.text : this.placeholder;
+        },
+        // 切换下拉框展开/收起
+        handleToggle() {
+            this.selectStatus = !this.selectStatus;
+        },
+        // 选择某项
+        handleSelect(e: EventBase) {
+            const value = e.currentTarget.dataset.value as string;
+            const item = (this.options as Array<{ value: string; text: string }>)
+                .find((o) => o.value === value);
+            this.currentText = item ? item.text : this.placeholder;
+            this.selectStatus = false;
+            this.triggerEvent("change", { value, text: item ? item.text : this.placeholder });
+        },
+    },
+})
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+.status-filter {
+    display: flex;
+    align-items: center;
+    gap: 10rpx;
+    font-weight: 400;
+    font-size: 26rpx;
+    color: $font-color-grey;
+    line-height: 37rpx;
+    position: relative;
+
+    .status-filter-current {
+        display: flex;
+        align-items: center;
+        gap: 6rpx;
+    }
+
+    // 下拉框
+    .status-filter-dropdown {
+        position: absolute;
+        top: 50rpx;
+        right: 0;
+        background: $background-white-color;
+        border-radius: 8rpx;
+        padding: 10rpx 0;
+        z-index: 101;
+        white-space: nowrap;
+        box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.08);
+
+        .status-filter-dropdown-item {
+            padding: 14rpx 28rpx;
+            font-weight: 400;
+            font-size: 26rpx;
+            color: $font-color;
+            line-height: 37rpx;
+        }
+    }
+}
+
+// 透明遮罩
+.status-filter-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 99;
+    background: transparent;
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {
+        "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index"
+    }
+}
+</script>

package/src/packages/pages/share/scan.mpx

@@ -19,19 +19,16 @@ createPage({
          * 生命周期函数--监听页面加载
          */
         onLoad(async (options) => {
-            // 判断是否登录-静默登录
-            userStore.loginOnlyAC().then(() => {
-                // 处理页面参数
-                if (options.q) {
-                    const q = decodeURIComponent(options.q);
-                    if (q.includes("share?")) {
-                        const params = _URIParams(q);
-                        onRedirectTo(params, _ReturnParams(params));
-                    }
-                } else {
-                    onRedirectTo(options, _ReturnParams(options));
+            // 处理页面参数
+            if (options.q) {
+                const q = decodeURIComponent(options.q);
+                if (q.includes("share?")) {
+                    const params = _URIParams(q);
+                    onRedirectTo(params, _ReturnParams(params));
                 }
-            });
+            } else {
+                onRedirectTo(options, _ReturnParams(options));
+            }
         });
 
         // 跳转页面
@@ -45,7 +42,10 @@ createPage({
                     mpx.switchTab({ url: options.action });
                 });
             } else {
-                mpx.navigateTo({ url: `${options.action}${query}` });
+                // 判断是否登录-静默登录
+                userStore.loginTry().then(() => {
+                    mpx.navigateTo({ url: `${options.action}${query}` });
+                });
             }
         };
 

package/src/store/user.ts

@@ -40,7 +40,17 @@ export const useUserStore = defineStore("user", {
     referee: db.getReferee() || "",
   }),
   actions: {
-    /** 登录检查 */
+    /** 尝试登录,无需处理异常 */
+    loginTry(): Promise<boolean> {
+      return this.loginOnlyAC()
+        .then((res) => {
+          return res;
+        })
+        .catch(() => {
+          return false;
+        });
+    },
+    /** 登录检查(需处理异常) */
     loginOnlyAC(): Promise<boolean> {
       // 1. 已登录 → 直接返回成功
       if (this.checkLogin()) {

package/src/utils/share.ts

@@ -46,7 +46,7 @@ class ShareUtil {
         .findShopBranchById(options.organTenant, options.branchId)
         .then((res) => {
           return shopStore.switchBranch(res.data).then(() => {
-            return userStore.loginOnlyAC();
+            return userStore.loginTry();
           });
         });
     } else if (options.shopId) {
@@ -54,7 +54,7 @@ class ShareUtil {
       console.log("商城ID", options.shopId);
       return shopApi.findShopInfoById(options.shopId).then((res) => {
         return shopStore.switchShop(res.data).then(() => {
-          return userStore.loginOnlyAC();
+          return userStore.loginTry();
         });
       });
     } else if (options.organTenant) {
@@ -63,11 +63,11 @@ class ShareUtil {
       console.log("组织Token", options.organTenant);
       return organStore.setOrganTenant(options.organTenant).then(() => {
         //静默登录
-        return userStore.loginOnlyAC();
+        return userStore.loginTry();
       });
     }
     //静默登录
-    return userStore.loginOnlyAC();
+    return userStore.loginTry();
   }
 
   // 分享用户页给好友
@@ -91,7 +91,7 @@ class ShareUtil {
       userStore.setReferee(options.referee);
     }
     //静默登录
-    return userStore.loginOnlyAC();
+    return userStore.loginTry();
   }
   // 分享组织页给好友
   shareOrganPath(pagePath: string, query: string): string {
@@ -122,11 +122,11 @@ class ShareUtil {
     if (options.organTenant) {
       return organStore.setOrganTenant(options.organTenant).then(() => {
         //静默登录
-        return userStore.loginOnlyAC();
+        return userStore.loginTry();
       });
     }
     //静默登录
-    return userStore.loginOnlyAC();
+    return userStore.loginTry();
   }
 
   // 分享电商页给好友
@@ -174,7 +174,7 @@ class ShareUtil {
         .findShopBranchById(options.organTenant, options.branchId)
         .then((res) => {
           return shopStore.switchBranch(res.data).then(() => {
-            return userStore.loginOnlyAC();
+            return userStore.loginTry();
           });
         });
     } else if (options.shopId) {
@@ -182,12 +182,12 @@ class ShareUtil {
       console.log("商城ID", options.shopId);
       return shopApi.findShopInfoById(options.shopId).then((res) => {
         return shopStore.switchShop(res.data).then(() => {
-          return userStore.loginOnlyAC();
+          return userStore.loginTry();
         });
       });
     }
     //静默登录
-    return userStore.loginOnlyAC();
+    return userStore.loginTry();
   }
 }
 const share = new ShareUtil();