From 161103b915379d2095ef1b52be0f8718c96ad873 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 29 Jun 2018 16:30:21 +0800
Subject: [PATCH] no message
Former-commit-id: 4f21a388154fc84178f2fe9f6432e9847e66d42f [formerly 4f21a388154fc84178f2fe9f6432e9847e66d42f [formerly 4f21a388154fc84178f2fe9f6432e9847e66d42f [formerly 4f21a388154fc84178f2fe9f6432e9847e66d42f [formerly 47bdfac098d82d0fc4978fd2e38c3968ef11270a [formerly 5d9df173748d78de9441de504121db3dad88f2f8]]]]]
Former-commit-id: a1a847c02413cf4d73e8463f488bdc37322789e5
Former-commit-id: 0fb80330d9bf8df9f7e6152812ba263321c2f1f5
Former-commit-id: d2d92295eb22e67fe4067832f6f5fe3a96968600 [formerly a274e3f2a84aa6c50c1cafbafeafaf129451f483]
Former-commit-id: 8e267950cca8fe90337bc67baa98d70770f71c80
Former-commit-id: db5eede445820e7d0544e0b314e0762cc8c8802c
Former-commit-id: 635a5e0353aba826cc5a026f7c9fce8e549da6bb
Former-commit-id: d67729d583afb714d1869e3b64b5449c37644c14
Former-commit-id: e3e483cc87698393b487a0644b8da9d2ca5225f1
---
src/menu/index.js.REMOVED.git-id | 2 +-
src/pages/demo/playground/index/index.vue | 5 +++++
src/pages/demo/playground/theme/index.vue | 5 +++++
src/router/index.js.REMOVED.git-id | 2 +-
src/store/modules/d2admin.js | 2 +-
5 files changed, 13 insertions(+), 3 deletions(-)
create mode 100644 src/pages/demo/playground/index/index.vue
create mode 100644 src/pages/demo/playground/theme/index.vue
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index fab04121..ac28dac6 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-2e6ccfa1782d7025eddfb44cbf547879838b5328
\ No newline at end of file
+d4f0036326f9ce90761ba90c5820b23597a17acf
\ No newline at end of file
diff --git a/src/pages/demo/playground/index/index.vue b/src/pages/demo/playground/index/index.vue
new file mode 100644
index 00000000..14d5c9b9
--- /dev/null
+++ b/src/pages/demo/playground/index/index.vue
@@ -0,0 +1,5 @@
+
+
+ index
+
+
diff --git a/src/pages/demo/playground/theme/index.vue b/src/pages/demo/playground/theme/index.vue
new file mode 100644
index 00000000..aba9e958
--- /dev/null
+++ b/src/pages/demo/playground/theme/index.vue
@@ -0,0 +1,5 @@
+
+
+ theme
+
+
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index bb59490e..bf82d0ad 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-15dd11698b562040218e9cdcdb8ca1c36b59bae3
\ No newline at end of file
+c9378013fa752f66b111cdb42adbeeb434473df0
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 5bdb28c8..097ef913 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -31,7 +31,7 @@ export default {
*/
d2adminThemeSet (state, themeActiveValue) {
// 从列表里找到需要激活的主题的数据
- const theme = state.themeList.find(e => e.value === themeActiveValue)
+ const theme = state.themeList.find(e => e.value === themeActiveValue) || state.themeList[0]
// 设置 state
state.themeActive = theme
// 设置 dom