jmash-core-mp 0.1.18 → 0.1.20

package/lib/api/auth/index.js

@@ -1,7 +1,6 @@
 import { OpensType } from "./types";
 import { db } from "../../utils/db";
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 class AuthApi {
     // 小程序静默登录
@@ -12,6 +11,7 @@ class AuthApi {
         if (__mpx_mode__ === "ali") {
             data.opensType = OpensType.ali_pay;
         }
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/front/rbac/miniapp_login/" + config.tenant,
             method: "POST",
@@ -30,6 +30,7 @@ class AuthApi {
         if (__mpx_mode__ === "ali") {
             data.opensType = OpensType.ali_pay;
         }
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/front/rbac/miniapp_phonenumber/" + config.tenant,
             method: "POST",
@@ -41,6 +42,7 @@ class AuthApi {
     }
     // 已登陆状态小程序更换绑定手机号
     replaceBindphone(data) {
+        const config = getApp().globalData.config;
         data.tenant = config.tenant;
         if (__mpx_mode__ === "wx") {
             data.opensType = OpensType.wechat;
@@ -57,6 +59,7 @@ class AuthApi {
     }
     //web登录.
     webLogin(data) {
+        const config = getApp().globalData.config;
         data.tenant = config.tenant;
         data.directoryId = "user";
         data.clientId = config.appId ? config.appId : "h5";
@@ -73,6 +76,7 @@ class AuthApi {
     }
     // 刷新token
     refreshToken() {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/front/rbac/auth/refresh_token",
             method: "POST",
@@ -86,6 +90,7 @@ class AuthApi {
     }
     // 获取当前会话用户
     userInfo() {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/rbac/auth/user?tenant=" + config.tenant,
             method: "GET",
@@ -93,6 +98,7 @@ class AuthApi {
     }
     // 当前用户角色权限
     userRolesPerms() {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/rbac/auth/roles_perms?tenant=" + config.tenant,
             method: "GET",
@@ -100,6 +106,7 @@ class AuthApi {
     }
     // 允许切换身份的用户列表
     allowRunAsUser() {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/rbac/auth/allow_run_as_user?tenant=" + config.tenant,
             method: "GET",
@@ -107,6 +114,7 @@ class AuthApi {
     }
     // 运行某种身份
     runAsUser(userId) {
+        const config = getApp().globalData.config;
         const data = {
             tenant: config.tenant,
             userId: userId,
@@ -140,6 +148,7 @@ class AuthApi {
     }
     // 部门Tree
     deptTree(deptId, tenant) {
+        const config = getApp().globalData.config;
         const query = {
             tenant: tenant ? tenant : config.tenant,
             excludeId: deptId,
@@ -152,6 +161,7 @@ class AuthApi {
     }
     // 职务Tree
     jobTree(jobId, tenant) {
+        const config = getApp().globalData.config;
         const query = {
             tenant: tenant ? tenant : config.tenant,
             roleType: "job",
@@ -166,6 +176,7 @@ class AuthApi {
     }
     // 修改个人信息
     updateUserInfo(data) {
+        const config = getApp().globalData.config;
         data.tenant = config.tenant;
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({
@@ -176,6 +187,7 @@ class AuthApi {
     }
     // 获取当前会话用户的信息
     findUserInfo(data) {
+        const config = getApp().globalData.config;
         data.tenant = config.tenant;
         return mpx.xfetch.fetch({
             url: "/v1/front/rbac/auth/user",

package/lib/api/cms/index.js

@@ -1,5 +1,4 @@
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 // 获取网站内容信息
 class CmsApiImpl {
@@ -46,6 +45,7 @@ class CmsApiImpl {
     }
     // 根据栏目别名查询翻页信息信息主表-单页栏目内容
     findCmsContentInfo(data) {
+        const config = getApp().globalData.config;
         data.tenant = data.tenant || config.tenant;
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({

package/lib/api/dict/index.js

@@ -1,4 +1,3 @@
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 class DictApiImpl {
     /**
@@ -23,6 +22,7 @@ class DictApiImpl {
         if (data) {
             data.hasEnable = data.enable !== undefined;
         }
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/dict/dict_entry/list/" + config.tenant,
             method: "GET",

package/lib/api/files/index.js

@@ -1,9 +1,9 @@
 import { db } from "../../utils/db";
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 class FileApi {
     baseApiUrl() {
+        const config = getApp().globalData.config;
         let currentBaseURL = config.baseUrl;
         // 使用 slice() 方法
         if (currentBaseURL.slice(-1) === "/") {
@@ -13,6 +13,7 @@ class FileApi {
     }
     // 上传Url
     uploadUrl() {
+        const config = getApp().globalData.config;
         return this.baseApiUrl() + "/v1/file/upload?tenant=" + config.tenant;
     }
     /**
@@ -37,6 +38,7 @@ class FileApi {
      * @param type resize	等比例缩放,white	补白,trans	补透明,clip	裁剪
      */
     imageIdUrl(imageId, width = 0, height = 0, type = "clip") {
+        const config = getApp().globalData.config;
         return (this.baseApiUrl() +
             "/v1/file/image_id/" +
             config.tenant +
@@ -49,10 +51,12 @@ class FileApi {
     }
     // Id 获取文件Full路径
     fileIdUrl(fileId) {
+        const config = getApp().globalData.config;
         return this.baseApiUrl() + "/v1/file/id/" + config.tenant + fileId;
     }
     // 上传文件
     uploadBase64File(base64) {
+        const config = getApp().globalData.config;
         base64.tenant = config.tenant;
         grpc.clearEmpty(base64);
         return mpx.xfetch.fetch({

package/lib/api/region/index.js

@@ -1,5 +1,4 @@
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 class RegionApiImpl {
     // 查询列表信息地区信息
@@ -8,6 +7,7 @@ class RegionApiImpl {
             query.hasEnable = query.enable !== undefined;
         }
         grpc.clearEmpty(query);
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/region/dict_region/list/" + config.tenant,
             method: "GET",

package/lib/api/storage/index.js

@@ -1,10 +1,10 @@
 import mpx from "@mpxjs/core";
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 class StorageApiImpl {
     // 查询我的组织列表
     findMyOrganList(data) {
         grpc.clearEmpty(data);
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: `/v1/storage/storage_organ/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
             method: "GET",
@@ -12,6 +12,7 @@ class StorageApiImpl {
     }
     // 查询列表信息店铺用户浏览信息
     findStorageBrowserOrganList(data) {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: `/v1/front/storage/storage_organ_browser/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
             method: "GET",
@@ -19,6 +20,7 @@ class StorageApiImpl {
     }
     // 查询列表信息店铺用户浏览信息
     findStorageOrganInfoList(data) {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: `/v1/storage/storage_organ_info/list/${config.tenant}?&serviceType[]=${data.serviceType}`,
             method: "GET",
@@ -27,6 +29,7 @@ class StorageApiImpl {
     }
     // 修改组织浏览信息
     updateStorageOrganBrowser(data) {
+        const config = getApp().globalData.config;
         data.tenant = config.tenant;
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({

package/lib/store/user.js

@@ -1,5 +1,4 @@
 import { defineStore } from "@mpxjs/pinia";
-import { config } from "../utils/config";
 import { authApi } from "../api/auth/index";
 import { db } from "../utils/db";
 import { net } from "../utils/net";
@@ -19,6 +18,7 @@ export const useUserStore = defineStore("user", {
             if (this.checkLogin()) {
                 return Promise.resolve(true);
             }
+            const config = getApp().globalData.config;
             // 2. 测试环境特殊配置 → 直接返回失败
             if (config.dev && config.testNewUser) {
                 return Promise.reject("测试环境，要求用户登录！");
@@ -36,25 +36,27 @@ export const useUserStore = defineStore("user", {
             }
             // 2. 拼接登录跳转地址（抽离公共逻辑）
             const toUrl = `${loginurl}?tabbar=${tabbar}&backurl=${encodeURIComponent(backurl)}`;
+            const config = getApp().globalData.config;
             // 3. 测试环境特殊处理
             if (config.dev && config.testNewUser) {
                 mpx.navigateTo({ url: toUrl });
                 return Promise.resolve(false);
             }
             // 4. 生产环境：执行静默登录
-            return this.silentLogin().then((res) => {
-                if (res.status) {
-                    // 静默登录成功
-                    return true;
-                }
-                // 静默登录失败 → 跳转登录页
+            return this.silentLogin()
+                .then((res) => {
+                // 静默登录成功
+                return Promise.resolve(res.status);
+            })
+                .catch(() => {
                 mpx.navigateTo({ url: toUrl });
-                return false;
+                return Promise.resolve(false);
             });
         },
         /** 静默登录 */
         silentLogin() {
             const obj = __mpx_mode__ === "ali" ? { scopes: "auth_base" } : {};
+            const config = getApp().globalData.config;
             return mpx
                 .login(obj)
                 .then((res) => {
@@ -78,6 +80,7 @@ export const useUserStore = defineStore("user", {
         // 手机号code 注册登录
         mpRegister(phoneCode, nickName = "", avatar = "") {
             const obj = __mpx_mode__ === "ali" ? { scopes: "auth_user" } : {};
+            const config = getApp().globalData.config;
             return mpx
                 .login(obj)
                 .then((res) => {

package/lib/utils/request.js

@@ -3,13 +3,13 @@ import { grpc } from "../utils/grpc";
 import mpx from "@mpxjs/core";
 import mpxFetch from "@mpxjs/fetch";
 mpx.use(mpxFetch);
-import { config as appconfig } from "../utils/config";
 let isRefreshing = false;
 let requests = [];
 //是否登出.
 let isLogout = false;
 mpx.xfetch.interceptors.request.use(function (config) {
     if (!config.url.startsWith("http")) {
+        const appconfig = getApp().globalData.config;
         config.url = appconfig.baseUrl + config.url;
     }
     //console.log("request:", config);
@@ -108,6 +108,7 @@ mpx.xfetch.interceptors.response.use(function (res) {
 });
 //刷新Token
 function refreshToken(refreshToken) {
+    const appconfig = getApp().globalData.config;
     return mpx.xfetch.fetch({
         url: appconfig.baseUrl + "/v1/front/rbac/auth/refresh_token",
         method: "POST",

package/package.json

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

package/src/api/auth/index.ts

@@ -1,4 +1,4 @@
-import { ResponseData } from "../../api/types";
+import { ResponseData, AppConfig } from "../../api/types";
 import { OpensType } from "./types";
 import type {
   LoginReq,
@@ -14,7 +14,6 @@ import type {
 } from "./types";
 import { db } from "../../utils/db";
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 
 class AuthApi {
@@ -26,6 +25,7 @@ class AuthApi {
     if (__mpx_mode__ === "ali") {
       data.opensType = OpensType.ali_pay;
     }
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/front/rbac/miniapp_login/" + config.tenant,
       method: "POST",
@@ -45,6 +45,7 @@ class AuthApi {
     if (__mpx_mode__ === "ali") {
       data.opensType = OpensType.ali_pay;
     }
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/front/rbac/miniapp_phonenumber/" + config.tenant,
       method: "POST",
@@ -57,6 +58,7 @@ class AuthApi {
 
   // 已登陆状态小程序更换绑定手机号
   replaceBindphone(data: PhoneReplaceReq): Promise<ResponseData<string>> {
+    const config = getApp().globalData.config;
     data.tenant = config.tenant;
     if (__mpx_mode__ === "wx") {
       data.opensType = OpensType.wechat;
@@ -74,6 +76,7 @@ class AuthApi {
 
   //web登录.
   webLogin(data: WebLoginReq): Promise<ResponseData<TokenModel>> {
+    const config = getApp().globalData.config;
     data.tenant = config.tenant;
     data.directoryId = "user";
     data.clientId = config.appId ? config.appId : "h5";
@@ -91,6 +94,7 @@ class AuthApi {
 
   // 刷新token
   refreshToken(): Promise<ResponseData<TokenModel>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/front/rbac/auth/refresh_token",
       method: "POST",
@@ -105,6 +109,7 @@ class AuthApi {
 
   // 获取当前会话用户
   userInfo(): Promise<ResponseData<UserInfo>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/rbac/auth/user?tenant=" + config.tenant,
       method: "GET",
@@ -113,6 +118,7 @@ class AuthApi {
 
   // 当前用户角色权限
   userRolesPerms(): Promise<ResponseData<RolesPerms>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/rbac/auth/roles_perms?tenant=" + config.tenant,
       method: "GET",
@@ -120,6 +126,7 @@ class AuthApi {
   }
   // 允许切换身份的用户列表
   allowRunAsUser(): Promise<ResponseData<any[]>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/rbac/auth/allow_run_as_user?tenant=" + config.tenant,
       method: "GET",
@@ -128,6 +135,7 @@ class AuthApi {
 
   // 运行某种身份
   runAsUser(userId: string): Promise<ResponseData<any>> {
+    const config = getApp().globalData.config;
     const data = {
       tenant: config.tenant,
       userId: userId,
@@ -165,6 +173,7 @@ class AuthApi {
   }
   // 部门Tree
   deptTree(deptId?: string, tenant?: string): Promise<ResponseData<any[]>> {
+    const config = getApp().globalData.config;
     const query = {
       tenant: tenant ? tenant : config.tenant,
       excludeId: deptId,
@@ -178,6 +187,7 @@ class AuthApi {
 
   // 职务Tree
   jobTree(jobId?: string, tenant?: string): Promise<ResponseData<any[]>> {
+    const config = getApp().globalData.config;
     const query = {
       tenant: tenant ? tenant : config.tenant,
       roleType: "job",
@@ -192,6 +202,7 @@ class AuthApi {
   }
   // 修改个人信息
   updateUserInfo(data: UpdateUserReq): Promise<ResponseData<UserInfo>> {
+    const config = getApp().globalData.config;
     data.tenant = config.tenant;
     grpc.clearEmpty(data);
     return mpx.xfetch.fetch({
@@ -203,6 +214,7 @@ class AuthApi {
 
   // 获取当前会话用户的信息
   findUserInfo(data: UserInfoReq): Promise<ResponseData<UserInfo>> {
+    const config = getApp().globalData.config;
     data.tenant = config.tenant;
     return mpx.xfetch.fetch({
       url: "/v1/front/rbac/auth/user",

package/src/api/cms/index.ts

@@ -24,9 +24,8 @@ import {
   CmsChannelKey,
   CmsChannelModel,
 } from "./types";
-import { ResponseData } from "../../api/types";
+import { ResponseData, AppConfig } from "../../api/types";
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 
 // 获取网站内容信息
@@ -84,6 +83,7 @@ class CmsApiImpl {
   findCmsContentInfo(
     data: CmsContentInfoReq
   ): Promise<ResponseData<CmsContentInfoModel>> {
+    const config = getApp().globalData.config;
     data.tenant = data.tenant || config.tenant;
     grpc.clearEmpty(data);
     return mpx.xfetch.fetch({

package/src/api/dict/index.ts

@@ -1,6 +1,5 @@
-import { ResponseData } from "../../api/types";
+import { ResponseData, AppConfig } from "../../api/types";
 import { EnumEntryReq, EnumRes, DictEntryReq, DictEntryList } from "./types";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 
 class DictApiImpl {
@@ -31,6 +30,7 @@ class DictApiImpl {
     if (data) {
       data.hasEnable = data.enable !== undefined;
     }
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/dict/dict_entry/list/" + config.tenant,
       method: "GET",

package/src/api/files/index.ts

@@ -1,12 +1,12 @@
 import { FileInfo, FileBase64Req, FileDownInfo, FileWebReq } from "./types";
-import { ResponseData } from "../../api/types";
+import { ResponseData, AppConfig } from "../../api/types";
 import { db } from "../../utils/db";
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 
 class FileApi {
   baseApiUrl(): string {
+    const config = getApp().globalData.config;
     let currentBaseURL = config.baseUrl as string;
     // 使用 slice() 方法
     if (currentBaseURL.slice(-1) === "/") {
@@ -17,6 +17,7 @@ class FileApi {
 
   // 上传Url
   uploadUrl(): string {
+    const config = getApp().globalData.config;
     return this.baseApiUrl() + "/v1/file/upload?tenant=" + config.tenant;
   }
 
@@ -56,6 +57,7 @@ class FileApi {
     height: number = 0,
     type: string = "clip"
   ): string {
+    const config = getApp().globalData.config;
     return (
       this.baseApiUrl() +
       "/v1/file/image_id/" +
@@ -72,11 +74,13 @@ class FileApi {
 
   // Id 获取文件Full路径
   fileIdUrl(fileId?: string): string {
+    const config = getApp().globalData.config;
     return this.baseApiUrl() + "/v1/file/id/" + config.tenant + fileId;
   }
 
   // 上传文件
   uploadBase64File(base64: FileBase64Req): Promise<ResponseData<FileInfo>> {
+    const config = getApp().globalData.config;
     base64.tenant = config.tenant;
     grpc.clearEmpty(base64);
     return mpx.xfetch.fetch({

package/src/api/region/index.ts

@@ -1,7 +1,6 @@
 import { DictRegionList, DictRegionReq } from "./types";
-import { ResponseData } from "../../api/types";
+import { ResponseData, AppConfig } from "../../api/types";
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
 
 class RegionApiImpl {
@@ -11,6 +10,7 @@ class RegionApiImpl {
       query.hasEnable = query.enable !== undefined;
     }
     grpc.clearEmpty(query);
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/region/dict_region/list/" + config.tenant,
       method: "GET",

package/src/api/storage/index.ts

@@ -1,7 +1,6 @@
 import mpx from "@mpxjs/core";
-import { ResponseData } from "../../api/types";
+import { ResponseData, AppConfig } from "../../api/types";
 import { grpc } from "../../utils/grpc";
-import { config } from "../../utils/config";
 import {
   StorageOrganInfoReq,
   StorageOrganInfoList,
@@ -15,6 +14,7 @@ class StorageApiImpl {
     data: StorageOrganInfoReq
   ): Promise<ResponseData<StorageOrganInfoList>> {
     grpc.clearEmpty(data);
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: `/v1/storage/storage_organ/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
       method: "GET",
@@ -25,6 +25,7 @@ class StorageApiImpl {
   findStorageBrowserOrganList(
     data: StorageOrganInfoReq
   ): Promise<ResponseData<StorageOrganInfoList>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: `/v1/front/storage/storage_organ_browser/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
       method: "GET",
@@ -35,6 +36,7 @@ class StorageApiImpl {
   findStorageOrganInfoList(
     data: StorageOrganInfoReq
   ): Promise<ResponseData<StorageOrganInfoList>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: `/v1/storage/storage_organ_info/list/${config.tenant}?&serviceType[]=${data.serviceType}`,
       method: "GET",
@@ -46,6 +48,7 @@ class StorageApiImpl {
   updateStorageOrganBrowser(
     data: StorageOrganBrowserUpdateReq
   ): Promise<ResponseData<StorageOrganBrowserModel>> {
+    const config = getApp().globalData.config;
     data.tenant = config.tenant;
     grpc.clearEmpty(data);
     return mpx.xfetch.fetch({

package/src/app.mpx

@@ -28,6 +28,7 @@ createApp({
     "pages": [
       "./pages/index",
       "./pages/home",
+      "./pages/home2",
       "./pages/half-home",
       "./pages/basic-component",
       "./pages/tabbar/home",

package/src/components/auth-user/jmash-update-user.mpx

@@ -61,7 +61,6 @@
 
 <script lang="ts">
 import mpx, { createComponent } from '@mpxjs/core'
-import { config } from '../../utils/config'
 import { UpdateUserReq, UserInfo } from '../../api/auth/types'
 import { authApi } from '../../api/auth/index'
 import { fileApi } from '../../api/files/index';
@@ -97,10 +96,10 @@ createComponent({
     }
   },
   data: {
-    resourceUrl: config.resourceUrl + "/images",
-    imageUrl: config.baseUrl + "/v1/file/path/",
+    resourceUrl: getApp().globalData.config.resourceUrl + "/images",
+    imageUrl: getApp().globalData.config.baseUrl + "/v1/file/path/",
     userInfo: {} as UserInfo,
-    userStore: {} as any
+    userStore: {} as any,
   },
   ready() {
     this.userStore = useUserStore();
@@ -131,6 +130,7 @@ createComponent({
     // 更换手机号
     getPhoneNumberWechat(e: any) {
       console.log("getPhoneNumber", e);
+      const config = getApp().globalData.config;
       if (e.detail.errMsg === "getPhoneNumber:ok") {
         // 授权成功后,调用rbac模块接口 已登陆状态小程序更换绑定手机号
         authApi.replaceBindphone({
@@ -146,6 +146,7 @@ createComponent({
     },
     getPhoneNumberAli(e: any) {
       console.log("getPhoneNumber", e);
+      const config = getApp().globalData.config;
       // 支付宝小程序获取手机号
       my.getPhoneNumber({
         success: (res: any) => {

package/src/components/auth-user/jmash-update-user.web.mpx

@@ -45,7 +45,6 @@
 
 <script lang="ts">
 import mpx, { createComponent } from '@mpxjs/core'
-import { config } from '../../utils/config'
 import { UpdateUserReq, UserInfo } from '../../api/auth/types'
 import { authApi } from '../../api/auth/index'
 import { fileApi } from '../../api/files/index';
@@ -81,8 +80,8 @@ createComponent({
     }
   },
   data: {
-    resourceUrl: config.resourceUrl + "/images",
-    imageUrl: config.baseUrl + "/v1/file/path/",
+    resourceUrl: getApp().globalData.config.resourceUrl + "/images",
+    imageUrl: getApp().globalData.config.baseUrl + "/v1/file/path/",
     userInfo: {} as UserInfo,
     userStore: {} as any
   },
@@ -115,6 +114,7 @@ createComponent({
     // 更换手机号
     getPhoneNumberWechat(e: any) {
       console.log("getPhoneNumber", e);
+      const config = getApp().globalData.config;
       if (e.detail.errMsg === "getPhoneNumber:ok") {
         // 授权成功后,调用rbac模块接口 已登陆状态小程序更换绑定手机号
         authApi.replaceBindphone({
@@ -130,6 +130,7 @@ createComponent({
     },
     getPhoneNumberAli(e: any) {
       console.log("getPhoneNumber", e);
+      const config = getApp().globalData.config;
       // 支付宝小程序获取手机号
       my.getPhoneNumber({
         success: (res: any) => {

package/src/components/cms/jmash-cms-acticle-list.mpx

@@ -29,7 +29,6 @@
 <script lang="ts">
 import mpx, { createComponent, ref, onMounted } from "@mpxjs/core";
 import { EventBase } from "../../api/types";
-import { config } from '../../utils/config';
 import { cmsApi } from '../../api/cms';
 import { CmsInfoModel } from '../../api/cms/types';
 
@@ -67,6 +66,7 @@ createComponent({
         },
     },
     setup(props) {
+        let config = getApp().globalData.config;
         // 资源路径
         let resourceUrl = config.resourceUrl + '/images/';
         // 文章列表

package/src/components/cms/jmash-cms-article-item.mpx

@@ -58,7 +58,6 @@
 <script lang="ts">
 import mpx, { createComponent, ref, onMounted } from "@mpxjs/core";
 import { EventBase } from "../../api/types";
-import { config } from '../../utils/config';
 import { cmsApi } from '../../api/cms';
 import { CmsInfoModel } from '../../api/cms/types';
 
@@ -101,6 +100,7 @@ createComponent({
         },
     },
     setup(props) {
+        let config = getApp().globalData.config;
         // 资源路径
         let resourceUrl = config.resourceUrl + '/images';
         // 文章列表
@@ -127,6 +127,7 @@ createComponent({
     methods: {
         // 点击详情事件
         handleInfo(e: EventBase) {
+            let config = getApp().globalData.config;
             let item = e.currentTarget.dataset.item;
             mpx.navigateTo({
                 url: '/jmash/pages/cms/cms-article?siteId=' + this.siteId + '&infoId=' + item.infoId,

package/src/components/cms/jmash-cms-article-view.mpx

@@ -21,7 +21,6 @@
 <script lang="ts">
 import mpx, { createComponent } from "@mpxjs/core";
 import { EventBase } from "../../api/types";
-import { config } from '../../utils/config';
 
 createComponent({
     properties: {
@@ -67,6 +66,7 @@ createComponent({
         },
     },
     setup(props) {
+        let config = getApp().globalData.config;
         // 资源路径
         let resourceUrl = config.resourceUrl + '/images';
         return { resourceUrl }

package/src/components/cms/jmash-cms-like.mpx

@@ -30,7 +30,6 @@
 <script lang="ts">
 import { createComponent, ref, toRefs, watch, computed } from '@mpxjs/core'
 import { cmsApi } from '../../api/cms/index'
-import { config } from '../../utils/config';
 import { FrontLikeCreateReq } from '../../api/cms/types'
 import { EventBase } from '../../api/types'
 
@@ -53,6 +52,7 @@ createComponent({
         }
     },
     setup(props) {
+        let config = getApp().globalData.config;
         let browseCount = ref(0);
         let likeCount = ref(0);
         let isLikeStatus = ref(false);
@@ -86,6 +86,7 @@ createComponent({
     methods: {
         // 点赞/取消点赞
         handleLike(e: EventBase) {
+            let config = getApp().globalData.config;
             const tempData = {
                 // 用于检测重复请求的唯一字符串ID
                 requestId: Math.random() * 10 + "",

package/src/components/common/jmash-avatar-edit.mpx

@@ -10,7 +10,6 @@
 
 <script lang="ts">
 import mpx, { createComponent, ref } from "@mpxjs/core";
-import { config } from "../../utils/config";
 import { fileApi } from "../../api/files/index";
 import { EventBase } from "../../api/types";
 
@@ -47,6 +46,7 @@ createComponent({
         }
     },
     setup() {
+        let config = getApp().globalData.config;
         let resourceUrl = config.resourceUrl + "/images/icon_image/";
         // 默认头像图片
         let avatar = ref(resourceUrl + "/images/components/gray_head2x.png");

package/src/components/common/jmash-none-data.mpx

@@ -6,11 +6,11 @@
 </template>
 <script lang="ts">
 import { createComponent } from "@mpxjs/core"
-import { config } from "../../utils/config";
+
 
 createComponent({
   properties: {
-        // 图片与文本之间的间距
+    // 图片与文本之间的间距
     imgTextGap: {
       type: Number,
       value: 0
@@ -51,8 +51,8 @@ createComponent({
     }
   },
   setup() {
+    let config = getApp().globalData.config;
     let resourceUrl = config.resourceUrl + "/images/"
-
     return {
       resourceUrl
     }

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

@@ -15,7 +15,6 @@
 
 <script lang="ts">
 import { createComponent } from "@mpxjs/core"
-import { config } from "../../utils/config";
 
 createComponent({
     properties: {
@@ -57,6 +56,7 @@ createComponent({
         }
     },
     setup() {
+        let config = getApp().globalData.config;
         let resourceUrl = config.resourceUrl + "/images/icon_image/"
         let popupStyle = {
             mask: {

package/src/components/common/jmash-search.mpx

@@ -14,7 +14,6 @@
 
 <script lang="ts">
 import { createComponent } from "@mpxjs/core";
-import { config } from "../../utils/config";
 import { EventBase } from "../../api/types";
 
 createComponent({
@@ -64,6 +63,7 @@ createComponent({
         }
     },
     setup() {
+        let config = getApp().globalData.config;
         // 资源路径
         let resourceUrl = config.resourceUrl + "/images";
 

package/src/components/common/jmash-upload-picture.mpx

@@ -18,7 +18,6 @@
 
 <script lang="ts">
 import mpx, { createComponent, ref } from "@mpxjs/core";
-import { config } from "../../utils/config";
 import { EventBase } from "../../api/types";
 
 createComponent({
@@ -30,6 +29,7 @@ createComponent({
         }
     },
     setup() {
+        let config = getApp().globalData.config;
         // 资源路径
         let resourceUrl = config.resourceUrl + "/images/mall/";
         // 图片路径
@@ -66,6 +66,7 @@ createComponent({
             });
         },
         chooseWxHeadImage: function (type: any) {
+            let config = getApp().globalData.config;
             const token: string = mpx.getStorageSync("token") ? "Bearer " + mpx.getStorageSync("token") : "";
             mpx.chooseMedia({
                 count: this.limit,

package/src/packages/pages/auth/cms-protocol.mpx

@@ -8,8 +8,9 @@ import { createPage, ref, onLoad } from '@mpxjs/core'
 createPage({
     setup(props) {
         //console.log("123", props);
-        let siteId = ref(getApp().globalData.config.siteId);
-        let tenant = ref(getApp().globalData.config.tenant);
+        let config = getApp().globalData.config;
+        let siteId = ref(config.siteId);
+        let tenant = ref(config.tenant);
         let channelAlias = ref('');
         onLoad((options) => {
             console.log(options);

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

@@ -12,8 +12,9 @@ import { createPage, ref, onLoad } from '@mpxjs/core'
 
 createPage({
   setup(props) {
-    let resourceUrl = ref(getApp().globalData.config.resourceUrl);
-    let appName = ref(getApp().globalData.config.name);
+    let config = getApp().globalData.config;
+    let resourceUrl = ref(config.resourceUrl);
+    let appName = ref(config.name);
     let linkType = ref("redirectTo");
     let backurl = ref("/pages/home");
     onLoad((options) => {

package/src/packages/pages/cms/cms-article-list.mpx

@@ -25,12 +25,12 @@ import mpx, { createPage, ref, onLoad, onPullDownRefresh } from '@mpxjs/core'
 import { EventBase } from '../../../api/types';
 import { cmsApi } from '../../../api/cms';
 import { CmsInfoModel } from '../../../api/cms/types';
-import { config } from '../../../utils/config';
 
 createPage({
     setup(props) {
-        let organTenant = ref(getApp().globalData.config.tenant);
-        let siteId = ref(getApp().globalData.config.siteId);
+        let config = getApp().globalData.config;
+        let organTenant = ref(config.tenant);
+        let siteId = ref(config.siteId);
         let channelId = ref('');
         let channelAlias = ref('');
         let curPage = ref(1);
@@ -54,7 +54,7 @@ createPage({
         }
         onLoad((options) => {
             console.log("article-list", options);
-            siteId.value = options.siteId || getApp().globalData.config.siteId;
+            siteId.value = options.siteId || config.siteId;
             channelId.value = options.channelId || '';
             channelAlias.value = options.channelAlias || '';
             curPage.value = 1;
@@ -68,6 +68,7 @@ createPage({
     methods: {
         // 点击详情事件
         handleInfo(e: EventBase) {
+            let config = getApp().globalData.config;
             let item = e.currentTarget.dataset.item;
             mpx.navigateTo({
                 url: '/jmash/pages/cms/cms-article?siteId=' + this.siteId + '&infoId=' + item.infoId,

package/src/packages/pages/cms/cms-article.mpx

@@ -8,12 +8,13 @@ import { createPage, ref, onLoad } from '@mpxjs/core'
 createPage({
     setup(props) {
         //console.log("123", props);
-        let siteId = ref(getApp().globalData.config.siteId);
-        let tenant = ref(getApp().globalData.config.tenant);
+        let config = getApp().globalData.config;
+        let siteId = ref(config.siteId);
+        let tenant = ref(config.tenant);
         let infoId = ref('');
         onLoad((options) => {
             console.log(options);
-            siteId.value = options.siteId || getApp().globalData.config.siteId;
+            siteId.value = options.siteId || config.siteId;
             infoId.value = options.infoId || '';
         })
         return { siteId, tenant, infoId };

package/src/pages/home.mpx

@@ -10,10 +10,10 @@
 <script>
 import mpx, { createPage, onShow, ref } from '@mpxjs/core'
 import { useUserStore } from '../store/user'
-import { config } from '../utils/config';
 
 createPage({
   setup() {
+    let config = getApp().globalData.config;
     let userStore = useUserStore();
     //强制登录.
     onShow(() => {

package/src/pages/home2.mpx

@@ -0,0 +1,48 @@
+<template>
+  <view class="home-page">
+    <text>主页（全屏登录）</text>
+    <cms-acticle-list organTenant="xyvcard" siteId="{{ siteId }}" channelAlias="{{ channelAlias }}"></cms-acticle-list>
+    <cms-article-view title="企业动态" isInfo="{{ true }}" organTenant="xyvcard" siteId="{{ siteId }}"
+      channelAlias="{{ channelAlias }}" style="1"></cms-article-view>
+  </view>
+</template>
+
+<script>
+import { createPage, onShow, ref } from '@mpxjs/core'
+import { useUserStore } from '../store/user'
+
+createPage({
+  setup() {
+    let config = getApp().globalData.config;
+    let userStore = useUserStore();
+    //强制登录.
+    onShow(() => {
+      //检查登录并跳转登录
+      userStore.loginAC("/pages/home2", false).then((res) => {
+        console.log(res);
+      });
+    });
+    let siteId = ref(config.siteId);
+    let channelAlias = ref("gzdt");
+    return { siteId, channelAlias }
+  }
+})
+</script>
+
+<style lang="scss">
+.home-page {
+  padding: 40rpx;
+  text-align: center;
+  font-size: 32rpx;
+  color: #333;
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {
+    "cms-acticle-list": "../components/cms/jmash-cms-acticle-list",
+    "cms-article-view": "../components/cms/jmash-cms-article-view"
+  }
+}
+</script>

package/src/pages/tabbar/home.mpx

@@ -1,6 +1,7 @@
 <template>
   <view class="page-body">
-    <button type="default" bind:tap="toHomePage">主页（全屏登录）</button>
+    <button type="default" bind:tap="toHomePage">主页（全屏登录检查）</button>
+    <button type="default" bind:tap="toHome2Page">主页（全屏登录）</button>
     <button type="default" bind:tap="toHalfHomePage">主页（半屏登录）</button>
     <button type="default" bind:tap="toCompTestPage">组件演示</button>
     <button type="default" bind:tap="loginOut">退出</button>
@@ -28,6 +29,11 @@ createPage({
         url: '/pages/home'
       })
     },
+    toHome2Page() {
+      mpx.navigateTo({
+        url: '/pages/home2'
+      })
+    },
     toHalfHomePage() {
       mpx.navigateTo({
         url: '/pages/half-home'

package/src/store/user.ts

@@ -1,5 +1,4 @@
 import { defineStore } from "@mpxjs/pinia";
-import { config } from "../utils/config";
 import {
   LoginReq,
   PhoneRegisterReq,
@@ -43,7 +42,7 @@ export const useUserStore = defineStore("user", {
       if (this.checkLogin()) {
         return Promise.resolve(true);
       }
-
+      const config = getApp().globalData.config;
       // 2. 测试环境特殊配置 → 直接返回失败
       if (config.dev && config.testNewUser) {
         return Promise.reject("测试环境，要求用户登录！");
@@ -69,6 +68,7 @@ export const useUserStore = defineStore("user", {
       const toUrl = `${loginurl}?tabbar=${tabbar}&backurl=${encodeURIComponent(
         backurl
       )}`;
+      const config = getApp().globalData.config;
 
       // 3. 测试环境特殊处理
       if (config.dev && config.testNewUser) {
@@ -77,20 +77,21 @@ export const useUserStore = defineStore("user", {
       }
 
       // 4. 生产环境：执行静默登录
-      return this.silentLogin().then((res) => {
-        if (res.status) {
+      return this.silentLogin()
+        .then((res) => {
           // 静默登录成功
-          return true;
-        }
-        // 静默登录失败 → 跳转登录页
-        mpx.navigateTo({ url: toUrl });
-        return false;
-      });
+          return Promise.resolve(res.status);
+        })
+        .catch(() => {
+          mpx.navigateTo({ url: toUrl });
+          return Promise.resolve(false);
+        });
     },
 
     /** 静默登录 */
     silentLogin(): Promise<LoginRes> {
       const obj = __mpx_mode__ === "ali" ? { scopes: "auth_base" } : {};
+      const config = getApp().globalData.config;
       return mpx
         .login(obj as WechatMiniprogram.LoginOption)
         .then((res: any) => {
@@ -118,6 +119,7 @@ export const useUserStore = defineStore("user", {
       avatar: string = ""
     ): Promise<LoginRes> {
       const obj = __mpx_mode__ === "ali" ? { scopes: "auth_user" } : {};
+      const config = getApp().globalData.config;
       return mpx
         .login(obj as WechatMiniprogram.LoginOption)
         .then((res: any) => {

package/src/utils/request.ts

@@ -7,8 +7,6 @@ import mpx from "@mpxjs/core";
 import mpxFetch from "@mpxjs/fetch";
 mpx.use(mpxFetch);
 
-import { config as appconfig } from "../utils/config";
-
 let isRefreshing = false;
 type TokenCallBackFunc = (token: string) => void;
 let requests: TokenCallBackFunc[] = [];
@@ -17,6 +15,7 @@ let isLogout = false;
 
 mpx.xfetch.interceptors.request.use(function (config) {
   if (!config.url.startsWith("http")) {
+    const appconfig = getApp().globalData.config;
     config.url = appconfig.baseUrl + config.url;
   }
   //console.log("request:", config);
@@ -119,6 +118,7 @@ mpx.xfetch.interceptors.response.use(function (res) {
 
 //刷新Token
 function refreshToken(refreshToken: string) {
+  const appconfig = getApp().globalData.config;
   return mpx.xfetch.fetch<TokenModel>({
     url: appconfig.baseUrl + "/v1/front/rbac/auth/refresh_token",
     method: "POST",

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

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

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

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

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

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