From 5c5d3d8598741e9a2798eaea82900b6b01861e3d Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 5 Feb 2026 11:59:53 +0800
Subject: [PATCH] sc

---
 src/App.vue                 | 17 ++++++++++++++---
 src/store/modules/tenant.js |  4 +++-
 src/utils/constant.js       |  4 +++-
 src/utils/request.js        | 14 +++++++++-----
 src/utils/storage.js        | 38 ++++++++++++++++++-------------------
 5 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d8e75a6..d91820c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,10 @@
 <script setup>
   import config from './config'
+  import  constant  from '@/utils/constant'
   import { getToken } from '@/utils/auth'
   import { useConfigStore } from '@/store'
   import { useUserStore } from '@/store'
+  import storage from '@/utils/storage'
 
   import { getCurrentInstance } from "vue"
   import { useTenantStore } from '@/store'
@@ -16,18 +18,27 @@
 
   // 初始化应用
   function initApp() {
+    // 获取页面加载时传递的参数
+    const query = uni.getLaunchOptionsSync().query || {}
     // 初始化应用配置
-    initConfig()
+    initConfig(query)
     // 检查用户登录状态
     //#ifdef H5
     checkLogin()
     //#endif
   }
 
-  function initConfig() {
+  function initConfig(query) {
+    // 存储页面传递的参数到storage
+    if (query.tenantId) {
+      storage.set(constant.tenantId, query.tenantId)
+    }
+    if (query.instanceId) {
+      storage.set(constant.instanceId, query.instanceId)
+    }
     useConfigStore().setConfig(config)
     // 初始化租户信息
-    useTenantStore().getTenant({ id: config.tenantId })
+    useTenantStore().getTenant()
   }
 
   function checkLogin() {
diff --git a/src/store/modules/tenant.js b/src/store/modules/tenant.js
index 7f9a220..d1cbe07 100644
--- a/src/store/modules/tenant.js
+++ b/src/store/modules/tenant.js
@@ -15,8 +15,10 @@ export const useTenantStore = defineStore('tenant', () => {
   };
 
   const getTenant = () => {
+    // 按照顺序获取tenantId：1. storage 2. config
+    const tenantId = storage.get(constant.tenantId) || config.appInfo.tenantId;
     return new Promise(resolve => {
-      getTenantInfo({ id: config.appInfo.tenantId }).then(res => {
+      getTenantInfo({ id: tenantId }).then(res => {
         if (!isEmpty(res.data)) {
           SET_TENANT_INFO(res.data);
         }
diff --git a/src/utils/constant.js b/src/utils/constant.js
index f0bb78b..1b1871a 100644
--- a/src/utils/constant.js
+++ b/src/utils/constant.js
@@ -4,7 +4,9 @@ const constant = {
   name: 'user_name',
   roles: 'user_roles',
   permissions: 'user_permissions',
-  tenantInfo: 'tenant_info'
+  tenantInfo: 'tenant_info',
+  instanceId: 'instance_id',
+  tenantId: 'tenant_id'
 };
 
 export default constant;
diff --git a/src/utils/request.js b/src/utils/request.js
index d5cd746..27ae6c4 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,20 +1,25 @@
 import config from '@/config';
+import constant from '@/utils/constant';
 import { getToken } from '@/utils/auth';
 import errorCode from '@/utils/errorCode';
 import { useUserStore } from '@/store/modules/user';
 import { toast, showConfirm, tansParams } from '@/utils/common';
+import storage from '@/utils/storage';
 
 let timeout = 10000;
 const baseUrl = config.baseUrl;
-const tenantId = config.appInfo.tenantId;
-const instanceId = config.appInfo.instanceId;
+const configAppInfo = config.appInfo;
 
 const request = config => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false;
   config.header = config.header || {};
-  config.header['tenant-id'] = tenantId || 10001;
-  config.header['instance-id'] = instanceId || 1038;
+  // 按照顺序获取tenantId：1. storage 2. config
+  const tenantId = storage.get(constant.tenantId) || configAppInfo.tenantId || 10001;
+  // 按照顺序获取instanceId：1. storage 2. config
+  const instanceId = storage.get(constant.instanceId) || configAppInfo.instanceId || 1038;
+  config.header['tenant-id'] = tenantId;
+  config.header['instance-id'] = instanceId;
   if (getToken() && !isToken) {
     config.header['Authorization'] = 'Bearer ' + getToken();
   }
@@ -59,7 +64,6 @@ const request = config => {
         resolve(res.data);
       })
       .catch(error => {
-        debugger;
         let { message } = error;
         if (message === 'Network Error') {
           message = '后端接口连接异常';
diff --git a/src/utils/storage.js b/src/utils/storage.js
index b22adeb..fd9cef0 100644
--- a/src/utils/storage.js
+++ b/src/utils/storage.js
@@ -1,32 +1,32 @@
-import constant from './constant'
+import constant from './constant';
 
 // 存储变量名
-let storageKey = 'storage_data'
+let storageKey = 'storage_data';
 
 // 存储节点变量名
-let storageNodeKeys = [constant.avatar, constant.id, constant.name, constant.roles, constant.permissions]
+let storageNodeKeys = [constant.avatar, constant.id, constant.name, constant.roles, constant.permissions, constant.instanceId, constant.tenantId];
 
 const storage = {
-  set: function(key, value) {
+  set: function (key, value) {
     if (storageNodeKeys.indexOf(key) != -1) {
-      let tmp = uni.getStorageSync(storageKey)
-      tmp = tmp ? tmp : {}
-      tmp[key] = value
-      uni.setStorageSync(storageKey, tmp)
+      let tmp = uni.getStorageSync(storageKey);
+      tmp = tmp ? tmp : {};
+      tmp[key] = value;
+      uni.setStorageSync(storageKey, tmp);
     }
   },
-  get: function(key) {
-    let storageData = uni.getStorageSync(storageKey) || {}
-    return storageData[key] || ""
+  get: function (key) {
+    let storageData = uni.getStorageSync(storageKey) || {};
+    return storageData[key] || '';
   },
-  remove: function(key) {
-    let storageData = uni.getStorageSync(storageKey) || {}
-    delete storageData[key]
-    uni.setStorageSync(storageKey, storageData)
+  remove: function (key) {
+    let storageData = uni.getStorageSync(storageKey) || {};
+    delete storageData[key];
+    uni.setStorageSync(storageKey, storageData);
   },
-  clean: function() {
-    uni.removeStorageSync(storageKey)
+  clean: function () {
+    uni.removeStorageSync(storageKey);
   }
-}
+};
 
-export default storage
+export default storage;