From 31ec63f0419895876cbaba99637a884a32d33d0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 10:31:45 +0800
Subject: [PATCH] 2021-09-01

---
 src/index.js |   49 +++++++++++++++++++------------------------------
 1 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/index.js b/src/index.js
index e03e548..d6c0ef7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -45,37 +45,37 @@
   )
 }
 
-
 if (sessionStorage.getItem('loginError')) {
   try {
     let res = JSON.parse(sessionStorage.getItem('loginError'))
     console.info(res.request)
     console.info(res.response)
-  } catch {}
+  } catch (e) {}
 }
 sessionStorage.removeItem('isEditState')
 sessionStorage.removeItem('loginError')
 sessionStorage.setItem('role_id', sessionStorage.getItem('localRole_id') || '')
 sessionStorage.setItem('dataM', sessionStorage.getItem('localDataM') || '')
 
-fetch(`./options.json`)
+// 鏂扮郴缁熸枃浠剁疆浜巃dmin涓� ../options.json , { cache: 'no-cache'}
+
+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
-    
+
     let GLOB = {}
     GLOB.appId = config.appId || ''
     GLOB.lineColor = config.lineColor || ''
-    GLOB.filter = config.filter || ''
+    GLOB.licenseKey = config.licenseKey || ''
 
     if (config.externalDatabase !== false && config.externalDatabase !== 'false' && config.externalDatabase !== undefined) {
       GLOB.externalDatabase = config.externalDatabase ? `[${config.externalDatabase}]..` : ''
     } else {
       GLOB.externalDatabase = null
-
     }
 
     // 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝ｅ紡绯荤粺
@@ -105,24 +105,6 @@
       }
       if (config.mainSystemApi) {
         let systemApi = config.mainSystemApi
-      
-        // if (/^(http|https):\/\//ig.test(systemApi)) {
-        //   let _systemApi = /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(systemApi)
-      
-        //   systemApi = _systemApi ? _systemApi[0] : ''
-        // } else {
-        //   systemApi = ''
-        // }
-      
-        // // 涓氬姟绯荤粺杩炴帴浜戠鏃讹紝鏍煎紡鍖栧鐞�
-        // if (systemApi && systemApi === /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(options.cloudServiceApi)[0]) {
-        //   GLOB.dataFormat = true
-        // }
-      
-        // if (systemApi) {
-        //   systemApi = systemApi + '/webapi/dostars'
-        // }
-
         // 涓氬姟绯荤粺涓嶅厑璁歌繛鎺ヤ簯绔紝涓氬姟绯荤粺杩炴帴sso.mk9h.cn鏃讹紝鏁版嵁铏氬寲澶勭悊
         if (systemApi && systemApi.indexOf('cloud.mk9h.cn') > -1) {
           systemApi = ''
@@ -135,6 +117,12 @@
     }
 
     let _href = window.location.href.split('#')[0]
+
+    if (localStorage.getItem(_href + 'lang')) {
+      sessionStorage.setItem('lang', localStorage.getItem(_href + 'lang'))
+    } else {
+      sessionStorage.setItem('lang', config.defaultLang !== 'en-US' ? 'zh-CN' : 'en-US')
+    }
 
     let _systemMsg = localStorage.getItem(_href + 'system')
 
@@ -154,6 +142,7 @@
         GLOB.webSite = _systemMsg.webSite
         GLOB.style = _systemMsg.style
         GLOB.showline = _systemMsg.showline || ''
+        GLOB.navBar = _systemMsg.navBar || ''
 
         if (GLOB.favicon) {
           let link = document.querySelector("link[rel*='icon']") || document.createElement('link')
@@ -165,14 +154,14 @@
         if (GLOB.style && styles[GLOB.style]) {
           document.body.className = styles[GLOB.style] + ' ' + (GLOB.showline === 'false' ? 'hidden-split-line' : '')
         }
-      } catch {
+      } catch (e) {
         console.warn('Parse Failure')
       }
     }
 
     document.title = GLOB.platTitle || ''
 
-    if (GLOB.filter === 'true') {
+    if (config.filter === 'true') {
       let html = document.getElementsByTagName('html')[0]
       
       if (html) {
@@ -181,7 +170,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'
@@ -189,8 +178,8 @@
       GLOB.service = _service ? _service + '/' : ''
     } else {
       GLOB.linkurl = ''
-      GLOB.location = 'http://qingqiumarket.cn'
-      GLOB.service = 'mkwms/'
+      GLOB.location = config.host
+      GLOB.service = config.service
     }
 
     Object.defineProperty(GLOB, 'appId', {

--
Gitblit v1.8.0