From b0dfd2f7605a38d7d31d60d09aba20823c4c53db Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 23:41:14 +0800
Subject: [PATCH] no message

Former-commit-id: 3b7c4afe114d493dc5e3d7b5a402f3644a53aae6
Former-commit-id: 31e98f23a8e1a8332ca8d6987bb4a15bbe79f1d9
Former-commit-id: 024177b8670be44b3a8ef44fb00c0bec9a5a5069
---
 .../image/logo/github-banner.png.REMOVED.git-id       |  1 -
 src/assets/image/logo/header-dev.png.REMOVED.git-id   |  1 -
 src/assets/image/logo/header-test.png.REMOVED.git-id  |  1 -
 src/assets/image/logo/header.png.REMOVED.git-id       |  1 -
 src/assets/image/logo/header@1x.png.REMOVED.git-id    |  1 -
 src/components/core/d2-layout-main/index.vue          | 11 ++++++++---
 src/store/modules/theme.js                            |  4 ++--
 .../d2/preview.png.REMOVED.git-id}                    |  0
 .../star/preview.png.REMOVED.git-id}                  |  0
 9 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 src/assets/image/logo/github-banner.png.REMOVED.git-id
 delete mode 100644 src/assets/image/logo/header-dev.png.REMOVED.git-id
 delete mode 100644 src/assets/image/logo/header-test.png.REMOVED.git-id
 delete mode 100644 src/assets/image/logo/header.png.REMOVED.git-id
 delete mode 100644 src/assets/image/logo/header@1x.png.REMOVED.git-id
 rename static/image/{theme-preview/d2@2x.png.REMOVED.git-id => theme/d2/preview.png.REMOVED.git-id} (100%)
 rename static/image/{theme-preview/star@2x.png.REMOVED.git-id => theme/star/preview.png.REMOVED.git-id} (100%)

diff --git a/src/assets/image/logo/github-banner.png.REMOVED.git-id b/src/assets/image/logo/github-banner.png.REMOVED.git-id
deleted file mode 100644
index 8b778a2b..00000000
--- a/src/assets/image/logo/github-banner.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-d37095e66cfdce9f355275f0b0a92d6ac646c2af
\ No newline at end of file
diff --git a/src/assets/image/logo/header-dev.png.REMOVED.git-id b/src/assets/image/logo/header-dev.png.REMOVED.git-id
deleted file mode 100644
index bc39778b..00000000
--- a/src/assets/image/logo/header-dev.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3fcdead32f4159d2c1a90ce6442632dc64e672a5
\ No newline at end of file
diff --git a/src/assets/image/logo/header-test.png.REMOVED.git-id b/src/assets/image/logo/header-test.png.REMOVED.git-id
deleted file mode 100644
index 25213f59..00000000
--- a/src/assets/image/logo/header-test.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-5d8b6bdb850f8f23d983ed2e18518c7fad31ca00
\ No newline at end of file
diff --git a/src/assets/image/logo/header.png.REMOVED.git-id b/src/assets/image/logo/header.png.REMOVED.git-id
deleted file mode 100644
index e78ecb52..00000000
--- a/src/assets/image/logo/header.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-762198f6b192d9faef94d5eab316518f842f9c88
\ No newline at end of file
diff --git a/src/assets/image/logo/header@1x.png.REMOVED.git-id b/src/assets/image/logo/header@1x.png.REMOVED.git-id
deleted file mode 100644
index e78ecb52..00000000
--- a/src/assets/image/logo/header@1x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-762198f6b192d9faef94d5eab316518f842f9c88
\ No newline at end of file
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 6493b856..3c2b711c 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -3,8 +3,8 @@
     <!-- 顶栏 -->
     <el-header>
       <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-        <img v-if="collapse" src="@/assets/image/logo/header-icon-only.png">
-        <img v-else src="@/assets/image/logo/header.png">
+        <img v-if="collapse" :src="`/static/image/theme/${themeName}/logo/icon-only.png`">
+        <img v-else :src="`/static/image/theme/${themeName}/logo/all.png`">
       </div>
       <div class="toggle-aside-btn" @click="collapse = !collapse">
         <d2-icon name="bars"/>
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { mapMutations } from 'vuex'
+import { mapState, mapMutations } from 'vuex'
 export default {
   name: 'd2-layout-main',
   components: {
@@ -46,6 +46,11 @@ export default {
       asideWidthCollapse: '65px'
     }
   },
+  computed: {
+    ...mapState({
+      themeName: state => state.theme.name
+    })
+  },
   mounted () {
     // 加载主题
     this.loadTheme()
diff --git a/src/store/modules/theme.js b/src/store/modules/theme.js
index 5eae0945..293ecd0e 100644
--- a/src/store/modules/theme.js
+++ b/src/store/modules/theme.js
@@ -6,12 +6,12 @@ export default {
       {
         name: 'd2admin 经典',
         value: 'd2',
-        preview: '/static/image/theme-preview/d2@2x.png'
+        preview: '/static/image/theme/d2/preview.png'
       },
       {
         name: '流星',
         value: 'star',
-        preview: '/static/image/theme-preview/star@2x.png'
+        preview: '/static/image/theme/star/preview.png'
       }
     ],
     name: ''
diff --git a/static/image/theme-preview/d2@2x.png.REMOVED.git-id b/static/image/theme/d2/preview.png.REMOVED.git-id
similarity index 100%
rename from static/image/theme-preview/d2@2x.png.REMOVED.git-id
rename to static/image/theme/d2/preview.png.REMOVED.git-id
diff --git a/static/image/theme-preview/star@2x.png.REMOVED.git-id b/static/image/theme/star/preview.png.REMOVED.git-id
similarity index 100%
rename from static/image/theme-preview/star@2x.png.REMOVED.git-id
rename to static/image/theme/star/preview.png.REMOVED.git-id