From 3aa8842c4c5f5f1b720b06cdc27876f0736f7bc6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 18 Aug 2018 10:09:34 +0800
Subject: [PATCH] setting.theme.list

Former-commit-id: 64fae64373352ba20bec75a31d4efcfb9c41c0d9 [formerly 64fae64373352ba20bec75a31d4efcfb9c41c0d9 [formerly 64fae64373352ba20bec75a31d4efcfb9c41c0d9 [formerly 64fae64373352ba20bec75a31d4efcfb9c41c0d9 [formerly 7fe4a9f1a9dcd05bfa0dcd9cb59ae055259fc57a [formerly 043e62b28695f61476f743f718b14213c14c0221]]]]]
Former-commit-id: a58ce67cf2dad895ca3e7ba23da271a1d6e57f41
Former-commit-id: c45b3fddb81844925d7f4c2fcfb49f32ab22fa90
Former-commit-id: faed2900b12d2510cbe2f01c0a97be38d75f5416 [formerly b588d0a3209cb47034671b767d63387a8984a5af]
Former-commit-id: 9310a28da5854431cbf26bce3246737da0f8aba6
Former-commit-id: be20de4b72feeb68510d3c5be0cd4f38a18a9a67
Former-commit-id: 5d0d11d39f07481e9bfc4af2b17395a72c6ef718
Former-commit-id: 12f30a189b49504cbf57ded6e519a487994fd459
Former-commit-id: 03f4426c2f32a05a6ab4ae3abe2e55333bb35d98
---
 src/assets/style/theme/list.js             | 29 --------------------
 src/setting.js                             | 32 ++++++++++++++++++++++
 src/store/modules/d2admin/modules/theme.js |  7 +++--
 3 files changed, 36 insertions(+), 32 deletions(-)
 delete mode 100644 src/assets/style/theme/list.js

diff --git a/src/assets/style/theme/list.js b/src/assets/style/theme/list.js
deleted file mode 100644
index c2c4a2e6..00000000
--- a/src/assets/style/theme/list.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export default [
-  {
-    title: 'd2admin 经典',
-    name: 'd2',
-    preview: 'image/theme/d2/preview@2x.png'
-  },
-  {
-    title: '紫罗兰',
-    name: 'violet',
-    preview: 'image/theme/violet/preview@2x.png'
-  },
-  {
-    title: '简约线条',
-    name: 'line',
-    backgroundImage: 'image/theme/line/bg.jpg',
-    preview: 'image/theme/line/preview@2x.png'
-  },
-  {
-    title: '流星',
-    name: 'star',
-    backgroundImage: 'image/theme/star/bg.jpg',
-    preview: 'image/theme/star/preview@2x.png'
-  },
-  {
-    title: 'Tomorrow Night Blue (vsCode)',
-    name: 'tomorrow-night-blue',
-    preview: 'image/theme/tomorrow-night-blue/preview@2x.png'
-  }
-]
diff --git a/src/setting.js b/src/setting.js
index 4995c1c8..a88a6a2f 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -22,6 +22,38 @@ const setting = {
   // 侧边栏默认折叠状态
   menu: {
     asideCollapse: false
+  },
+  // 注册的主题
+  theme: {
+    list: [
+      {
+        title: 'd2admin 经典',
+        name: 'd2',
+        preview: 'image/theme/d2/preview@2x.png'
+      },
+      {
+        title: '紫罗兰',
+        name: 'violet',
+        preview: 'image/theme/violet/preview@2x.png'
+      },
+      {
+        title: '简约线条',
+        name: 'line',
+        backgroundImage: 'image/theme/line/bg.jpg',
+        preview: 'image/theme/line/preview@2x.png'
+      },
+      {
+        title: '流星',
+        name: 'star',
+        backgroundImage: 'image/theme/star/bg.jpg',
+        preview: 'image/theme/star/preview@2x.png'
+      },
+      {
+        title: 'Tomorrow Night Blue (vsCode)',
+        name: 'tomorrow-night-blue',
+        preview: 'image/theme/tomorrow-night-blue/preview@2x.png'
+      }
+    ]
   }
 }
 
diff --git a/src/store/modules/d2admin/modules/theme.js b/src/store/modules/d2admin/modules/theme.js
index e887d2ff..d6b4677b 100644
--- a/src/store/modules/d2admin/modules/theme.js
+++ b/src/store/modules/d2admin/modules/theme.js
@@ -1,12 +1,13 @@
-import list from '@/assets/style/theme/list.js'
+// 设置文件
+import setting from '@/setting.js'
 
 export default {
   namespaced: true,
   state: {
     // 主题
-    list,
+    list: setting.theme.list,
     // 现在激活的主题 这应该是一个名字 不是对象
-    activeName: list[0].name
+    activeName: setting.theme.list[0].name
   },
   getters: {
     /**