diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue index 3bb91351..e7076c58 100644 --- a/src/components/core/d2-layout-main/index.vue +++ b/src/components/core/d2-layout-main/index.vue @@ -5,8 +5,8 @@
- - + +
@@ -65,24 +65,23 @@ export default { }, computed: { ...mapState({ - themeName: state => state.theme.name, - themeBackGroundImage: state => state.theme.backGroundImage + themeActive: state => state.d2admin.themeActive }), styleLayoutMainGroup () { return { - ...this.themeBackGroundImage ? { - backgroundImage: `url('${this.$assetsPublicPath}${this.themeBackGroundImage}')` + ...this.themeActive.backgroundImage ? { + backgroundImage: `url('${this.$assetsPublicPath}${this.themeActive.backgroundImage}')` } : {} } } }, mounted () { // 加载主题 - this.loadTheme() + this.d2adminThemeLoadFromLo() }, methods: { ...mapMutations([ - 'loadTheme' + 'd2adminThemeLoadFromLo' ]) } } diff --git a/src/components/core/d2-theme-list/index.vue b/src/components/core/d2-theme-list/index.vue index f4012227..239ad764 100644 --- a/src/components/core/d2-theme-list/index.vue +++ b/src/components/core/d2-theme-list/index.vue @@ -2,7 +2,11 @@ -
+
+