From c45a375e5b4ce0e33c7fc8a1aecdad67d60acc9e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 三月 2021 15:09:06 +0800
Subject: [PATCH] 2021-03-01

---
 src/index.js |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/index.js b/src/index.js
index e03e548..a1f9912 100644
--- a/src/index.js
+++ b/src/index.js
@@ -45,7 +45,6 @@
   )
 }
 
-
 if (sessionStorage.getItem('loginError')) {
   try {
     let res = JSON.parse(sessionStorage.getItem('loginError'))
@@ -58,10 +57,12 @@
 sessionStorage.setItem('role_id', sessionStorage.getItem('localRole_id') || '')
 sessionStorage.setItem('dataM', sessionStorage.getItem('localDataM') || '')
 
-fetch(`./options.json`)
+// 娴嬭瘯绯荤粺鏂囦欢缃簬admin涓�
+
+fetch('./options.json')
   .then(response => response.json())
   .catch(() => {
-    console.warn('绯荤粺閰嶇疆淇℃伅鑾峰彇澶辫触锛岃鑱旂郴绠$悊鍛橈紒')
+    document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">绯荤粺閰嶇疆淇℃伅鑾峰彇澶辫触锛岃鑱旂郴绠$悊鍛橈紒</div>'
   })
   .then(config => {
     if (!config) return
@@ -136,6 +137,10 @@
 
     let _href = window.location.href.split('#')[0]
 
+    if (localStorage.getItem(_href + 'lang')) {
+      sessionStorage.setItem('lang', localStorage.getItem(_href + 'lang'))
+    }
+
     let _systemMsg = localStorage.getItem(_href + 'system')
 
     if (_systemMsg) {
@@ -154,6 +159,7 @@
         GLOB.webSite = _systemMsg.webSite
         GLOB.style = _systemMsg.style
         GLOB.showline = _systemMsg.showline || ''
+        GLOB.navBar = _systemMsg.navBar || 'sidemenu'
 
         if (GLOB.favicon) {
           let link = document.querySelector("link[rel*='icon']") || document.createElement('link')
@@ -181,7 +187,7 @@
     }
 
     if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍¢獙鏄惁瀛樺湪寮�鍙戞潈闄�
-      let _service = window.location.href.replace(/\/index.html(.*)|\/#(.*)/ig, '').replace(new RegExp(document.location.origin + '/?', 'ig'), '')
+      let _service = window.location.href.replace(/(\/admin)?\/index.html(.*)|(\/admin)?\/#(.*)/ig, '').replace(new RegExp(document.location.origin + '/?', 'ig'), '')
       GLOB.linkurl = _href
       if (!/index.html/ig.test(GLOB.linkurl)) {
         GLOB.linkurl = GLOB.linkurl + 'index.html'

--
Gitblit v1.8.0