From 48e5609de6a7efcfd321328f2bf6585eaa67971d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 21 Jul 2018 15:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 29320beda7962a9bdd7b816711a200cf4b123693 [formerly 5e3b94af52b52855a13e40dd3e57d078ee88faa7] [formerly 29320beda7962a9bdd7b816711a200cf4b123693 [formerly 5e3b94af52b52855a13e40dd3e57d078ee88faa7] [formerly 29320beda7962a9bdd7b816711a200cf4b123693 [formerly 5e3b94af52b52855a13e40dd3e57d078ee88faa7] [formerly 5e3b94af52b52855a13e40dd3e57d078ee88faa7 [formerly cf81fad6a18200eb4cc3d116adc4f371ca62345c [formerly 9e5279d6743448982207108202f31b12d734aeca]]]]]
Former-commit-id: e6fac7d328737be1e3281a5ef1abc0162e678826
Former-commit-id: ff317984c43b732c167b2246a181dbb76823082f
Former-commit-id: 478994a61c34d6ffe5a456f1ba1b98cc8ea76d61 [formerly ea358f6a160e128c827678473d06233676a39f2c]
Former-commit-id: 0b229b5c1e8ee1687bc524046e87c97b58ecc896
Former-commit-id: 4fbea3ce8f0e8e770dad602d9d24926868058d2b
Former-commit-id: 515f93c78d80e5a763084a75bc98fa1fc72bca44
Former-commit-id: bc8eab4de8fb8a22eecfc68d90942ceb26baa5f0
Former-commit-id: 4d7261ac6c8e236e8c67dc5ceda204307bb27df4
---
 src/layout/header-aside/layout.vue          | 4 ++--
 src/pages/demo/playground/theme/index.vue   | 2 +-
 src/store/modules/d2admin.js.REMOVED.git-id | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index 9f4ac2a2..1f9078c4 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -38,7 +38,7 @@
           </div>
           <div class="d2-theme-container-main-body">
             <transition name="fade-transverse">
-              <keep-alive :include="d2adminKeepAliveList">
+              <keep-alive :include="d2adminKeepAliveInclude">
                 <router-view/>
               </keep-alive>
             </transition>
@@ -87,7 +87,7 @@ export default {
     }),
     ...mapGetters([
       'themeActiveSetting',
-      'd2adminKeepAliveList'
+      'd2adminKeepAliveInclude'
     ]),
     /**
      * @description 最外层容器的背景图片样式
diff --git a/src/pages/demo/playground/theme/index.vue b/src/pages/demo/playground/theme/index.vue
index 89a76a70..f150fe83 100644
--- a/src/pages/demo/playground/theme/index.vue
+++ b/src/pages/demo/playground/theme/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container type="full" class="page">
+  <d2-container type="card" class="page">
     <template slot="header">主题</template>
     <el-table :data="themeList" v-bind="table">
       <el-table-column prop="name" align="center" width="260"/>
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 16934579..566981fa 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-036efa02a01b2165111fbf85c475eb625e962c2c
\ No newline at end of file
+9b37757b1e1f0804e087ece373fd000c0d815ce3
\ No newline at end of file