From a5c1ded4e3e6d5ab8a71595ad016aef3727d74ba Mon Sep 17 00:00:00 2001
From: RYAN0UP <ryan0up@RYAN0UPs-MacBook-Air.local>
Date: Thu, 11 Apr 2019 00:23:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=BC=80=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E8=AE=BE=E7=BD=AE=E6=8E=89=E5=B8=A7=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Exception/ExceptionPage.vue |  2 +-
 src/permission.js                          |  2 +-
 src/views/exception/ExceptionPage.vue      |  2 +-
 src/views/interface/ThemeList.vue          | 18 ++++++++++++------
 src/views/page/PageList.vue                |  1 -
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/Exception/ExceptionPage.vue b/src/components/Exception/ExceptionPage.vue
index 45044b4c3..2cde53691 100644
--- a/src/components/Exception/ExceptionPage.vue
+++ b/src/components/Exception/ExceptionPage.vue
@@ -31,7 +31,7 @@ export default {
   },
   methods: {
     handleToHome() {
-      this.$router.push({ name: 'dashboard' })
+      this.$router.push({ name: 'Dashboard' })
     }
   }
 }
diff --git a/src/permission.js b/src/permission.js
index ce3486735..d37766522 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -17,7 +17,7 @@ router.beforeEach((to, from, next) => {
   if (Vue.ls.get(ACCESS_TOKEN)) {
     /* has token */
     if (to.path === '/user/login') {
-      next({ path: '/dashboard' })
+      next({ path: '/Dashboard' })
       NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {
diff --git a/src/views/exception/ExceptionPage.vue b/src/views/exception/ExceptionPage.vue
index 45044b4c3..2cde53691 100644
--- a/src/views/exception/ExceptionPage.vue
+++ b/src/views/exception/ExceptionPage.vue
@@ -31,7 +31,7 @@ export default {
   },
   methods: {
     handleToHome() {
-      this.$router.push({ name: 'dashboard' })
+      this.$router.push({ name: 'Dashboard' })
     }
   }
 }
diff --git a/src/views/interface/ThemeList.vue b/src/views/interface/ThemeList.vue
index 47393758a..81fcc2d5d 100644
--- a/src/views/interface/ThemeList.vue
+++ b/src/views/interface/ThemeList.vue
@@ -119,6 +119,7 @@
 <script>
 import { PageView } from '@/layouts'
 import themeApi from '@/api/theme'
+import { setTimeout } from 'timers'
 
 export default {
   components: {
@@ -154,12 +155,15 @@ export default {
       })
     },
     settingDrawer(themeId) {
-      themeApi.fetchConfiguration(themeId).then(response => {
-        this.visible = true
-        this.themeConfiguration = response.data.data
-        this.loadSettings()
-        this.getThemeProperty(themeId)
-      })
+      this.visible = true
+      var that = this
+      setTimeout(function() {
+        themeApi.fetchConfiguration(themeId).then(response => {
+          that.themeConfiguration = response.data.data
+          that.loadSettings()
+          that.getThemeProperty(themeId)
+        })
+      }, 500)
     },
     activeTheme(theme) {
       themeApi.active(theme).then(response => {
@@ -190,6 +194,8 @@ export default {
     },
     onClose() {
       this.visible = false
+      this.themeConfiguration = {}
+      this.themeProperty = {}
     }
   }
 }
diff --git a/src/views/page/PageList.vue b/src/views/page/PageList.vue
index 0ac614cd4..0a84365bd 100644
--- a/src/views/page/PageList.vue
+++ b/src/views/page/PageList.vue
@@ -15,7 +15,6 @@
       </a-col>
     </a-row>
   </div>
-  </div>
 </template>
 
 <script>