From 54a0cfd03ff8859784e4aee2ae3d2302b7f48dbe Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Sat, 14 Oct 2023 14:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E5=92=A8=E8=AE=AF?=
 =?UTF-8?q?=E9=A1=B5=E8=B7=AF=E7=94=B1=E8=B7=AF=E5=BE=84=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../t-news.vue => pages/common/News.vue}      | 10 ++++----
 src/router/modules/main.ts                    | 24 ++++++++++---------
 src/router/modules/sub.ts                     |  8 +------
 3 files changed, 19 insertions(+), 23 deletions(-)
 rename src/{views/t-news.vue => pages/common/News.vue} (97%)

diff --git a/src/views/t-news.vue b/src/pages/common/News.vue
similarity index 97%
rename from src/views/t-news.vue
rename to src/pages/common/News.vue
index a52c017d..09855591 100644
--- a/src/views/t-news.vue
+++ b/src/pages/common/News.vue
@@ -112,11 +112,11 @@
 import { onBeforeMount, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
-import showSnackbar from "../components/func/snackbar";
-import ToChannel from "../components/overlay/to-channel.vue";
-import ToLoading from "../components/overlay/to-loading.vue";
-import Mys from "../plugins/Mys";
-import { createPost } from "../utils/TGWindow";
+import showSnackbar from "../../components/func/snackbar";
+import ToChannel from "../../components/overlay/to-channel.vue";
+import ToLoading from "../../components/overlay/to-loading.vue";
+import Mys from "../../plugins/Mys";
+import { createPost } from "../../utils/TGWindow";
 
 // 类型定义
 enum NewsType {
diff --git a/src/router/modules/main.ts b/src/router/modules/main.ts
index 5300107c..fc77c512 100644
--- a/src/router/modules/main.ts
+++ b/src/router/modules/main.ts
@@ -1,13 +1,14 @@
 /**
  * @file router modules main.ts
  * @description 主路由模块
- * @since Beta v0.3.2
+ * @since Beta v0.3.3
  */
 
 import Achievements from "../../pages/common/Achievements.vue";
 import Announcements from "../../pages/common/Announcements.vue";
 import Config from "../../pages/common/Config.vue";
 import Home from "../../pages/common/Home.vue";
+import News from "../../pages/common/News.vue";
 import Test from "../../pages/common/Test.vue";
 
 const mainRoutes = [
@@ -17,9 +18,14 @@ const mainRoutes = [
     component: Home,
   },
   {
-    path: "/test",
-    name: "测试页",
-    component: Test,
+    path: "/announcements",
+    name: "公告",
+    component: Announcements,
+  },
+  {
+    path: "/news/:gid",
+    name: "咨讯",
+    component: News,
   },
   {
     path: "/achievements/:app?",
@@ -27,19 +33,15 @@ const mainRoutes = [
     component: Achievements,
   },
   {
-    path: "/announcements",
-    name: "公告",
-    component: Announcements,
+    path: "/test",
+    name: "测试页",
+    component: Test,
   },
   {
     path: "/config",
     name: "设置",
     component: Config,
   },
-  {
-    path: "/home",
-    redirect: "/",
-  },
 ];
 
 export default mainRoutes;
diff --git a/src/router/modules/sub.ts b/src/router/modules/sub.ts
index b2fdb308..2cd21c8c 100644
--- a/src/router/modules/sub.ts
+++ b/src/router/modules/sub.ts
@@ -1,13 +1,12 @@
 /**
  * @file router modules sub.ts
  * @description 子路由模块，用于二级窗口
- * @since Alpha v0.1.2
+ * @since Beta v0.3.3
  */
 
 import TAnnoJson from "../../views/t-anno-json.vue";
 import TAnno from "../../views/t-anno.vue";
 import TLottery from "../../views/t-lottery.vue";
-import TNews from "../../views/t-news.vue";
 import TPostJson from "../../views/t-post-json.vue";
 import TPost from "../../views/t-post.vue";
 
@@ -22,11 +21,6 @@ const subRoutes = [
     name: "游戏内公告（JSON）",
     component: TAnnoJson,
   },
-  {
-    path: "/news/:gid",
-    name: "咨讯",
-    component: TNews,
-  },
   {
     path: "/post_detail/:post_id",
     name: "帖子详情",