From 21f22026582ae4ed24669c433d1f433d7a61135b Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 29 Jun 2018 11:39:37 +0800 Subject: [PATCH] no message Former-commit-id: 52d865e779f351aaf2d997ce8e6ffd21d86137ba [formerly 52d865e779f351aaf2d997ce8e6ffd21d86137ba [formerly 52d865e779f351aaf2d997ce8e6ffd21d86137ba [formerly 52d865e779f351aaf2d997ce8e6ffd21d86137ba [formerly 2fa6b0e38fb02edbe3e60769246e2c17644430e9 [formerly 2c5805e77e36984c4223260702bcae5c192099f1]]]]] Former-commit-id: 38153766c1c1af0b795597b1e26d2a8ddcaff71c Former-commit-id: 04bdb951f0de941e54b2a816c03217d8c9549ce8 Former-commit-id: f8b9a67da5782072b59066ba51890d396caa86b4 [formerly 81555a3d4c79740f2d6e121d19af66025384089d] Former-commit-id: 3bb86c0e2f5a9c317a4bda23e6f4455d874e22fb Former-commit-id: 91a3c0cad0a76d1739ef5a932b4d4e14908b49dd Former-commit-id: 73eef8bdf0c07819f1b952068728cc592e14736a Former-commit-id: 54de3cd9214c91a039edcf7e9cfc750b508d28ac Former-commit-id: 2de01843691d0a074972ce48da498943c289f7b1 --- src/components/core/d2-layout-main/index.vue | 15 +++++++------- src/components/core/d2-theme-list/index.vue | 12 +++++++---- src/libs/db.js | 12 +++++++++++ src/mock/login/index.js | 1 + src/pages/core/login/index.vue | 5 +---- src/store/modules/d2admin.js | 21 +++++++++++++++++++- 6 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 src/libs/db.js 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 @@ -
+
+