jmash-core-mp 0.1.75 → 0.1.77

package/lib/api/types.d.ts

@@ -3,7 +3,7 @@
 export type ResponseData<T extends string | WechatMiniprogram.IAnyObject | ArrayBuffer = string | WechatMiniprogram.IAnyObject | ArrayBuffer> = WechatMiniprogram.RequestSuccessCallbackResult<T>;
 export interface AppConfig {
     tenant: string;
-    name: string;
+    xcxName: string;
     baseUrl: string;
     resourceUrl: string;
     appId: string;

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/cms/jmash-cms-activity-item.mpx.d.ts

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

package/lib/components/cms/jmash-cms-activity-list.mpx.d.ts

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

package/lib/components/cms/jmash-cms-article-item.mpx.d.ts

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

package/lib/components/cms/jmash-cms-article-list.mpx.d.ts

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

package/lib/components/cms/jmash-cms-article-view.mpx.d.ts

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

package/lib/components/cms/jmash-cms-like.mpx.d.ts

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

package/lib/components/cms/jmash-cms-location-list.mpx.d.ts

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

package/lib/components/cms/jmash-cms-product-item.mpx.d.ts

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

package/lib/components/cms/jmash-cms-product-list.mpx.d.ts

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

package/lib/components/common/jmash-search.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/components/organ/organ-item.mpx.d.ts

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

package/lib/components/organ/organ-search.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/packages/pages/auth/setting-page.mpx.d.ts

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

package/lib/packages/pages/cms/cms-activity-list.mpx.d.ts

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

package/lib/packages/pages/cms/cms-article-list.mpx.d.ts

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

package/lib/packages/pages/cms/cms-location-list.mpx.d.ts

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

package/lib/packages/pages/cms/cms-product-list.mpx.d.ts

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

package/lib/packages/pages/share/scan.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/config.js

@@ -1,6 +1,6 @@
 import mpx from "@mpxjs/core";
 const defaultConfig = {
-    name: "Jmash Core MPX",
+    xcxName: "Jmash Core MPX",
     dev: true,
     testNewUser: false,
     tenant: "xyvcard",

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.75",
+  "version": "0.1.77",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/types.ts

@@ -2,14 +2,14 @@ export type ResponseData<
   T extends string | WechatMiniprogram.IAnyObject | ArrayBuffer =
     | string
     | WechatMiniprogram.IAnyObject
-    | ArrayBuffer
+    | ArrayBuffer,
 > = WechatMiniprogram.RequestSuccessCallbackResult<T>;
 
 export interface AppConfig {
   //租户
   tenant: string;
   // 名称
-  name: string;
+  xcxName: string;
   //请求地址
   baseUrl: string;
   //静态资源地址

package/src/components/core/jmash-popup-login.ali.mpx

@@ -1,6 +1,6 @@
 <template>
   <!-- 支付宝小程序授权登录 -->
-  <cube-modal a:ref="loginModal" visible="{{ isVisible }}" noBuiltInBtns="true" maskClosable="false" z-index="999"
+  <cube-modal a:ref="loginModal" visible="{{ isVisible }}" noBuiltInBtns="true" maskClosable="false"
     bind:cancel="onClose" mask-opacity="0.1" class="login-popup">
     <!-- 标题区域 -->
     <view class="popup-header" slot="header">
@@ -51,9 +51,9 @@ createComponent({
     }
   },
   setup(props) {
-    let config = getApp().globalData.config || { resourceUrl: '', name: '应用' };
+    let config = getApp().globalData.config || { resourceUrl: '', xcxName: '应用' };
     let resourceUrl = config.resourceUrl;
-    let appName = config.name;
+    let appName = config.xcxName;
     let isCheckBox = ref(false);
     let isVisible = ref(props.visible);
     let userStore = useUserStore();

package/src/components/core/jmash-popup-login.mpx

@@ -1,6 +1,6 @@
 <template>
   <!-- 授权登录 -->
-  <cube-modal wx:ref="loginModal" visible="{{ isVisible }}" noBuiltInBtns="true" maskClosable="false" z-index="999999"
+  <cube-modal wx:ref="loginModal" visible="{{ isVisible }}" noBuiltInBtns="true" maskClosable="false"
     bind:cancel="onClose" mask-opacity="0.1" class="login-popup">
     <!-- 标题区域 -->
     <view class="popup-header" slot="header">
@@ -16,7 +16,7 @@
     <view class="popup-body" slot="content">
       <!-- 头像区域 -->
       <view class="avatar-section">
-        <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+        <button class="avatar-wrapper" plain open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
           <image wx:if="{{ avatarUrl || avatar }}" class="avatar-img" src="{{ avatarUrl || avatar }}"
             mode="aspectFill" />
           <view class="avatar-badge">
@@ -73,9 +73,9 @@ createComponent({
     }
   },
   setup(props) {
-    let config = getApp().globalData.config || { resourceUrl: '', name: '应用' };
+    let config = getApp().globalData.config || { resourceUrl: '', xcxName: '应用' };
     let resourceUrl = config.resourceUrl;
-    let appName = config.name;
+    let appName = config.xcxName;
     let avatar = resourceUrl + "/images/components/gray_head2x.png";
     let avatarUrl = ref('');
     let nameValue = ref('');
@@ -252,15 +252,14 @@ $bg-card: #ffffff;
     position: relative;
     margin: 0;
     padding: 0;
-    background: none;
-    border: none;
+    background: transparent !important;
+    border: none !important;
     line-height: 1;
 
     .avatar-img {
       width: 120rpx;
       height: 120rpx;
       border-radius: 50%;
-      border: 4rpx solid $border;
       display: block;
     }
 
@@ -272,7 +271,6 @@ $bg-card: #ffffff;
       height: 36rpx;
       background: $primary;
       border-radius: 50%;
-      border: 3rpx solid $bg-card;
       display: flex;
       align-items: center;
       justify-content: center;

package/src/components/core/jmash-popup-login.web.mpx

@@ -1,6 +1,6 @@
 <template>
   <!-- Web端账号登录弹窗 -->
-  <cube-modal wx:ref="loginModal" visible="{{ isVisible }}" noBuiltInBtns="true" maskClosable="false" z-index="999"
+  <cube-modal wx:ref="loginModal" visible="{{ isVisible }}" noBuiltInBtns="true" maskClosable="false"
     bind:cancel="onClose" mask-opacity="0.1" class="login-popup">
     <!-- 标题区域 -->
     <view class="popup-header" slot="header">

package/src/packages/pages/auth/login.mpx

@@ -16,7 +16,7 @@ createPage({
   setup(props) {
     let config = getApp().globalData.config;
     let resourceUrl = ref(config.resourceUrl);
-    let appName = ref(config.name);
+    let appName = ref(config.xcxName);
     let linkType = ref("redirectTo");
     let backurl = ref("/pages/home");
     onLoad((options) => {

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

@@ -2,7 +2,7 @@ import { AppConfig } from "../api/types";
 import mpx from "@mpxjs/core";
 
 const defaultConfig: AppConfig = {
-  name: "Jmash Core MPX",
+  xcxName: "Jmash Core MPX",
   dev: true,
   testNewUser: false,
   tenant: "xyvcard",

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();