From 96989af7e330a08d376002b0759705a477039f61 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 19 十月 2023 19:46:41 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/index.js |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/index.js b/src/index.js
index 6b2b01e..06e1685 100644
--- a/src/index.js
+++ b/src/index.js
@@ -123,10 +123,6 @@
       GLOB.mainSystemApi = ''
     }
 
-    if (/#\/hs$/.test(window.location.href)) { // hs涓嬩笉鎵撳嵃鑴氭湰
-      GLOB.debugger = false
-    }
-
     if (GLOB.sysType !== 'cloud') {
       if (config.appkey === options.cakey) {
         document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">涓嶅彲浣跨敤浜戠appkey锛岃鑱旂郴绠$悊鍛橈紒</div>'
@@ -155,6 +151,18 @@
         }
       
         GLOB.mainSystemApi = systemApi
+      }
+    }
+
+    if (/#\/hs$/.test(window.location.href)) { // hs涓嬩笉鎵撳嵃鑴氭湰
+      GLOB.debugger = false
+
+      if (GLOB.mainSystemApi) {
+        GLOB.localSystemApi = GLOB.mainSystemApi
+        GLOB.mainSystemApi = ''
+      }
+      if (GLOB.cloudServiceApi) {
+        GLOB.mainSystemApi = GLOB.cloudServiceApi
       }
     }
 
@@ -246,7 +254,6 @@
     let lang = localStorage.getItem(_href + 'lang') || (config.defaultLang !== 'en-US' ? 'zh-CN' : 'en-US')
     sessionStorage.setItem('lang', lang)
 
-    GLOB.mkThdMenus = [] // 涓夌骇鑿滃崟
     GLOB.mkActions = {}  // 鎸夐挳鏉冮檺闆�
 
     Object.defineProperty(GLOB, 'appId', {
@@ -314,6 +321,7 @@
     window.GLOB.CacheData = new Map()    // 瀛樺偍閫変腑鏁版嵁
     window.GLOB.SearchBox = new Map()    // 瀛樺偍鎼滅储鏉′欢
     window.GLOB.SyncData = new Map()     // 瀛樺偍鍚屾鏌ヨ鏁版嵁
+    window.GLOB.mkThdMenus = new Map()   // 涓夌骇鑿滃崟
 
     render(Route)
   })

--
Gitblit v1.8.0