From 24e716df5d09793b65a8071b4d65b18f169850f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 7 Jul 2022 12:51:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2=E5=90=8E=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                | 2 +-
 src/store/modules/settings.js    | 8 ++++----
 src/views/settings/Interface.vue | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/public/index.html b/public/index.html
index 4a3909af3..4a3443601 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,7 +9,7 @@
     <meta http-equiv="Cache" content="no-cache">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title><%= webpackConfig.name %></title>
-    <link rel="stylesheet" href="<%= BASE_URL %>theme/index.css">
+    <link rel="stylesheet" href="<%= BASE_URL %>theme/element-ui.css">
   </head>
   <body>
     <noscript>
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index bb3f0cc5c..a434c2876 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,7 +1,7 @@
 import defaultSettings from '@/settings'
 import { getPublicSettings } from '@/api/settings'
 import { writeNewStyle, getIndexStyle } from '@/utils/theme/index'
-import { matchColor, defaultThemeColor } from '@/utils/theme/color'
+import { defaultThemeColor } from '@/utils/theme/color'
 
 const { showSettings, fixedHeader, sidebarLogo, tagsView } = defaultSettings
 
@@ -22,9 +22,9 @@ const mutations = {
     }
   },
   SET_PUBLIC_SETTINGS: (state, settings) => {
-    const color = settings.INTERFACE?.theme
+    const color = settings?.INTERFACE?.theme_info?.colors?.['--color-primary']
     state.publicSettings = settings
-    state.themeColor = matchColor[color] || defaultThemeColor
+    state.themeColor = color || defaultThemeColor
 
     if (settings['XPACK_ENABLED']) {
       state.hasValidLicense = settings['XPACK_LICENSE_IS_VALID']
@@ -60,8 +60,8 @@ const actions = {
           // 动态修改Title
           document.title = data['INTERFACE']['login_title']
         }
-        commit('SET_PUBLIC_SETTINGS', data)
         getIndexStyle().then(() => {
+          commit('SET_PUBLIC_SETTINGS', data)
           writeNewStyle(state.themeColor)
         })
         resolve(response)
diff --git a/src/views/settings/Interface.vue b/src/views/settings/Interface.vue
index 2249cf0cb..5c756c504 100644
--- a/src/views/settings/Interface.vue
+++ b/src/views/settings/Interface.vue
@@ -30,7 +30,6 @@ import { Page } from '@/layout/components'
 import { IBox, UploadField } from '@/components'
 import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm'
 import { getInterfaceInfo, updateInterface, restoreInterface } from '@/api/interface'
-import { matchColor, defaultThemeColor } from '@/utils/theme/color'
 
 export default {
   name: 'InterfaceSettings',
@@ -59,10 +58,10 @@ export default {
         },
         theme: {
           on: {
-            change: ([value]) => {
-              const color = matchColor[value] || defaultThemeColor
-              this.$store.dispatch('settings/changeThemeStyle', color)
-            }
+            // change: ([value]) => {
+            //   const color = matchColor[value] || defaultThemeColor
+            //   this.$store.dispatch('settings/changeThemeStyle', color)
+            // }
           }
         },
         login_image: {
