From 80f516a6589cce7a771dc071fb016142395c2719 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 18:33:05 +0800
Subject: [PATCH] 2023-08-15

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

diff --git a/src/index.js b/src/index.js
index 206bf3e..ba1082c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,9 +1,7 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
 import Route from './router'
-import { Provider } from 'react-redux'
 import md5 from 'md5'
-import store from '@/store'
 import * as serviceWorker from './serviceWorker'
 import options, { styles } from '@/store/options.js'
 import '@/assets/css/main.scss'
@@ -23,9 +21,7 @@
 
 const render = Component => {
   ReactDOM.render(
-    <Provider store={store}>
-      <Component/>
-    </Provider>,
+    <Component/>,
     document.getElementById('root')
   )
 }
@@ -59,7 +55,10 @@
     GLOB.WXNotice = config.WXNotice + '' === 'true'
     GLOB.accessToken = {}
     GLOB.mkHS = false
+    GLOB.debugger = false
+    GLOB.dataFormat = false
     GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
+    GLOB.style = 'bg_black_style_blue'
 
     GLOB.sysType = options.sysType
     if (GLOB.sysType !== 'cloud') {
@@ -93,6 +92,7 @@
       }
     } else if (GLOB.sysType === 'local') {
       GLOB.probation = true
+      GLOB.debugger = true
       GLOB.systemType = ''
 
       // GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars'
@@ -109,8 +109,6 @@
       GLOB.systemType = ''
       GLOB.mainSystemApi = ''
     }
-
-    GLOB.debugger = GLOB.sysType === 'local' && GLOB.systemType !== 'production'
 
     if (/#\/hs$/.test(window.location.href)) { // hs涓嬩笉鎵撳嵃鑴氭湰
       GLOB.debugger = false
@@ -165,7 +163,7 @@
         GLOB.mainlogo = _systemMsg.mainlogo
         GLOB.doclogo = _systemMsg.doclogo
         GLOB.webSite = _systemMsg.webSite
-        GLOB.style = _systemMsg.style
+        GLOB.style = _systemMsg.style || 'bg_black_style_blue'
         GLOB.showline = _systemMsg.showline || ''
         GLOB.navBar = _systemMsg.navBar || 'shutter'
         GLOB.appVersion = _systemMsg.app_version || ''
@@ -177,17 +175,12 @@
           link.href = GLOB.favicon
           document.getElementsByTagName('head')[0].appendChild(link)
         }
-        if (GLOB.style && styles[GLOB.style]) {
+        if (styles[GLOB.style]) {
           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
@@ -217,6 +210,7 @@
       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'
+      GLOB.dataFormat = false
     }
 
     let mark = sessionStorage.getItem('system_mark')

--
Gitblit v1.8.0