From 96cf231cbd0b7f6e97ae4965488476ac87970a0c Mon Sep 17 00:00:00 2001
From: Frost-ZX <30585462+Frost-ZX@users.noreply.github.com>
Date: Sun, 23 May 2021 23:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B1=9E=E6=80=A7=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/About.vue       | 10 +++++-----
 src/views/Home.vue        | 10 +++++-----
 src/views/Settings.vue    | 10 +++++-----
 src/views/Tools.vue       | 28 ++++++++++++++--------------
 src/views/ToolsDetail.vue | 16 ++++++++--------
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/views/About.vue b/src/views/About.vue
index d2b11b4..edf184d 100644
--- a/src/views/About.vue
+++ b/src/views/About.vue
@@ -42,6 +42,11 @@
 <script>
 export default {
     name: 'About',
+    beforeRouteEnter(to, from, next) {
+        next(vm => {
+            vm.utils.changeTitle('关于');
+        });
+    },
     data() {
         return {
             navLinks: this.$root.navLinks,
@@ -51,11 +56,6 @@ export default {
             }
         }
     },
-    beforeRouteEnter(to, from, next) {
-        next(vm => {
-            vm.utils.changeTitle('关于');
-        });
-    }
 }
 </script>
 
diff --git a/src/views/Home.vue b/src/views/Home.vue
index a1c6bfa..cd40bf3 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -120,6 +120,11 @@ export default {
     components: {
         Icon
     },
+    beforeRouteEnter(to, from, next) {
+        next(vm => {
+            vm.utils.changeTitle();
+        });
+    },
     data() {
         return {
             config: this.$root.config.storage,
@@ -165,11 +170,6 @@ export default {
             }
         }
     },
-    beforeRouteEnter(to, from, next) {
-        next(vm => {
-            vm.utils.changeTitle();
-        });
-    },
     methods: {
 
         /** 
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index f33a978..4eb1e0f 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -35,17 +35,17 @@
 <script>
 export default {
     name: 'Settings',
+    beforeRouteEnter(to, from, next) {
+        next(vm => {
+            vm.utils.changeTitle('设置');
+        });
+    },
     data() {
         return {
             config: this.$root.config.storage,
             utils: this.$root.utils
         }
     },
-    beforeRouteEnter(to, from, next) {
-        next(vm => {
-            vm.utils.changeTitle('设置');
-        });
-    },
     methods: {
 
         /**
diff --git a/src/views/Tools.vue b/src/views/Tools.vue
index 7a6b0ef..717de39 100644
--- a/src/views/Tools.vue
+++ b/src/views/Tools.vue
@@ -49,6 +49,20 @@ import navTools from '@/assets/js/navTools.js';
 
 export default {
     name: 'Tools',
+    beforeRouteEnter(to, from, next) {
+        next(vm => {
+            var route = vm.$route;
+
+            // 判断进入的路由
+            if (route.name == 'ToolsDetail') {
+                // 进入：工具内容页面
+                vm.detailOpen(route.params.category, route.params.name);
+            } else {
+                // 进入：工具列表页面
+                vm.utils.changeTitle('小工具');
+            }
+        });
+    },
     data() {
         return {
             utils: this.$root.utils,
@@ -147,20 +161,6 @@ export default {
         }
 
     },
-    beforeRouteEnter(to, from, next) {
-        next(vm => {
-            var route = vm.$route;
-
-            // 判断进入的路由
-            if (route.name == 'ToolsDetail') {
-                // 进入：工具内容页面
-                vm.detailOpen(route.params.category, route.params.name);
-            } else {
-                // 进入：工具列表页面
-                vm.utils.changeTitle('小工具');
-            }
-        });
-    }
 }
 </script>
 
diff --git a/src/views/ToolsDetail.vue b/src/views/ToolsDetail.vue
index 0007878..28d38ef 100644
--- a/src/views/ToolsDetail.vue
+++ b/src/views/ToolsDetail.vue
@@ -9,13 +9,6 @@ import navTools from '@/assets/js/navTools.js';
 
 export default {
     name: 'ToolsDetail',
-    data() {
-        return {
-            utils: this.$root.utils,
-            toolList: navTools,
-            toolElem: null
-        }
-    },
     beforeRouteEnter(to, from, next) {
         next(vm => {
             var params = vm.$route.params;
@@ -49,7 +42,14 @@ export default {
                 return elem;
             });
         });
-    }
+    },
+    data() {
+        return {
+            utils: this.$root.utils,
+            toolList: navTools,
+            toolElem: null
+        }
+    },
 }
 </script>