From 30a1d7c71a053e43eee2cd37d99861696c6e7147 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:22:01 +0800
Subject: [PATCH] no message

Former-commit-id: 2abfbd6e94052d07f85634f475442288b28bccc8 [formerly 2abfbd6e94052d07f85634f475442288b28bccc8 [formerly 2abfbd6e94052d07f85634f475442288b28bccc8 [formerly 2abfbd6e94052d07f85634f475442288b28bccc8 [formerly f13339f93def6bd6950951a8f55c060b77a55ba1 [formerly ccb30639df081f493bbc37c3265e295da38e7d6f]]]]]
Former-commit-id: 367c7b9ef13f571a327fe59c332b31fc7c68aeff
Former-commit-id: 6a04cd021c861a399249fe7ffa0fcde74f6e4309
Former-commit-id: 9ebfb32347efd07d0adbd3664c49f4ae4bf2c366 [formerly b3c413cccd29f4c8c17c1820500304628d1a4da5]
Former-commit-id: 3d1a3ab3d41580b9882869006d520d2e6db85ea1
Former-commit-id: e9758df27bfe06c6ca6c70caac07bdae9f833054
Former-commit-id: 8a9941a0718ddf61583c3d21596b1c7dd4dd9bb3
Former-commit-id: 7a15a08cde23e51dcc814fa878b57c5b4272c22b
Former-commit-id: 9be0087752755f36602ce9ba04d8e421d32a7da5
---
 src/store/modules/d2admin.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 8e3d4383..392f2e5a 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -241,7 +241,11 @@ export default {
      */
     d2adminThemeLoad (state) {
       const themeActiveName = db.get('themeActiveName').find({uuid: util.uuid()}).value()
-      this.commit('d2adminThemeSet', themeActiveName.value || state.themeList[0].name)
+      if (themeActiveName) {
+        this.commit('d2adminThemeSet', themeActiveName.value)
+      } else {
+        this.commit('d2adminThemeSet', state.themeList[0].name)
+      }
     }
   }
 }