Merge branch 'master' of https://github.com/halo-dev/halo-admin

halo-dev · Jun 12, 2019 · b4875a1 · b4875a1
2 parents cf735a4 + 4c0a72e
commit b4875a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/views/interface/ThemeList.vue b/src/views/interface/ThemeList.vue
@@ -462,12 +462,16 @@ export default {
     },
     handleFetching() {
       this.fetchButtonLoading = true
-      themeApi.fetching(this.fetchingUrl).then(response => {
-        this.$message.success('拉取成功！')
-        this.uploadVisible = false
-        this.fetchButtonLoading = false
-        this.loadThemes()
-      })
+      themeApi
+        .fetching(this.fetchingUrl)
+        .then(response => {
+          this.$message.success('拉取成功！')
+          this.uploadVisible = false
+          this.loadThemes()
+        })
+        .finally(() => {
+          this.fetchButtonLoading = false
+        })
     },
     handleReload() {
       themeApi.reload().then(response => {

diff --git a/src/views/system/About.vue b/src/views/system/About.vue
@@ -14,6 +14,7 @@
                   <ul>
                     <li>版本：{{ environments.version }}</li>
                     <li>数据库：{{ environments.database }}</li>
+                    <li>运行模式：{{ environments.mode }}</li>
                     <li>启动时间：{{ environments.startTime | moment }}</li>
                   </ul>
                   <a