From 0519dcda8b6fb2914987f8d4d58e1d14bcf98dc3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 六月 2023 14:33:06 +0800
Subject: [PATCH] 2023-06-30

---
 src/index.js |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/index.js b/src/index.js
index 21fe5a0..04c69e3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,7 +8,7 @@
 import options, { styles } from '@/store/options.js'
 import '@/assets/css/main.scss'
 import '@/assets/css/action.scss'
-import '@/assets/css/minkeicon.css'
+// import '@/assets/css/minkeicon.css'
 import '@/assets/css/viewstyle.scss'
 
 if (window.location.href.indexOf('#/design') > -1) { // 缂栬緫椤甸潰鍒锋柊鏃讹紝璺宠浆鑷充富椤�
@@ -45,8 +45,6 @@
 }
 
 sessionStorage.removeItem('isEditState')
-sessionStorage.setItem('role_id', sessionStorage.getItem('localRole_id') || '')
-sessionStorage.setItem('dataM', sessionStorage.getItem('localDataM') || '')
 
 // 鏂扮郴缁熸枃浠剁疆浜巃dmin涓� ../options.json , { cache: 'no-cache'}
 
@@ -76,6 +74,7 @@
     GLOB.nginx = config.nginx + '' === 'true'
     GLOB.WXAppID = config.WXAppID || ''
     GLOB.WXminiAppID = config.WXminiAppID || ''
+    GLOB.WXNotice = config.WXNotice + '' === 'true'
     GLOB.accessToken = {}
     GLOB.mkHS = false
 
@@ -111,6 +110,9 @@
       // GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars'
 
       GLOB.mainSystemApi = 'https://sso.mk9h.cn/cloud/webapi/dostars'
+      if (!/^https/.test(window.location.protocol)) { // https杞崲
+        GLOB.mainSystemApi = 'http://sso.mk9h.cn/cloud/webapi/dostars'
+      }
 
       if (GLOB.watermark) {
         GLOB.dataFormat = true
@@ -135,6 +137,7 @@
 
     if (options.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
       GLOB.appkey = options.cakey
+      GLOB.WXNotice = false
     } else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
       GLOB.appkey = config.appkey
     } else if (options.sysType === 'local') { // 涓氬姟绯荤粺
@@ -146,6 +149,10 @@
         } else if (!/webapi\/dostars$/ig.test(systemApi)) {
           systemApi = systemApi.replace(/\/?$/, '/webapi/dostars')
         }
+
+        if (/^https/.test(window.location.protocol) && /^http:/.test(systemApi) && !GLOB.transfer) {
+          systemApi = systemApi.replace(/^http:/, 'https:')
+        }
       
         GLOB.mainSystemApi = systemApi
       }
@@ -154,6 +161,9 @@
     let _href = window.location.href.split('#')[0]
 
     let _systemMsg = localStorage.getItem(_href + 'system')
+
+    GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
+    let className = 'mk-blue-black'
 
     if (_systemMsg) {
       try {
@@ -171,7 +181,7 @@
         GLOB.webSite = _systemMsg.webSite
         GLOB.style = _systemMsg.style
         GLOB.showline = _systemMsg.showline || ''
-        GLOB.navBar = _systemMsg.navBar || ''
+        GLOB.navBar = _systemMsg.navBar || 'shutter'
         GLOB.appVersion = _systemMsg.app_version || ''
 
         if (GLOB.favicon) {
@@ -182,12 +192,19 @@
           document.getElementsByTagName('head')[0].appendChild(link)
         }
         if (GLOB.style && styles[GLOB.style]) {
-          document.body.className = styles[GLOB.style] + ' ' + (GLOB.showline === 'false' ? 'hidden-split-line' : '')
+          className = styles[GLOB.style] + ' ' + (GLOB.showline === 'false' ? 'hidden-split-line' : '')
         }
       } catch (e) {
         console.warn('Parse Failure')
       }
     }
+
+    // 涓嶄娇鐢ㄧ櫨鍙剁獥鎵撳紑鑿滃崟鏃讹紝鍘绘帀鍚堝苟鏍囪
+    if (GLOB.navBar !== 'shutter') {
+      localStorage.removeItem('collapse')
+    }
+
+    document.body.className = className
 
     if (/^https/.test(window.location.protocol)) { // https杞崲
       let meta = document.createElement('meta')
@@ -199,11 +216,7 @@
     document.title = GLOB.platTitle || ''
 
     if (config.filter === 'true' || (/^20\d{2}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) {
-      let html = document.getElementsByTagName('html')[0]
-      
-      if (html) {
-        html.style.filter = 'grayscale(100%)'
-      }
+      GLOB.filter = true
     }
 
     if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍￠獙鏄惁瀛樺湪寮�鍙戞潈闄�
@@ -213,11 +226,11 @@
       GLOB.baseurl = document.location.origin + '/' + GLOB.service
       GLOB.linkurl = GLOB.baseurl + 'index.html'
     } else {
-      GLOB.linkurl = ''
       GLOB.location = config.host
       GLOB.service = config.service
       GLOB.host = config.host.replace(/http(s)?:\/\//ig, '') + (config.service ? '_' + config.service.replace(/\//ig, '') : '')
       GLOB.baseurl = GLOB.location + '/' + GLOB.service
+      GLOB.linkurl = GLOB.baseurl + 'index.html'
     }
 
     let mark = sessionStorage.getItem('system_mark')
@@ -286,6 +299,7 @@
     })
 
     window.GLOB.CacheMap = new Map()     // 缂撳瓨閰嶇疆淇℃伅
+    window.GLOB.CacheVoucher = new Map() // 缂撳瓨鍑瘉淇℃伅
     window.GLOB.UserCacheMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夎缃�
     window.GLOB.CacheData = new Map()    // 瀛樺偍閫変腑鏁版嵁
 

--
Gitblit v1.8.0