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: { /**