From bd96fecf4b6e41bfc10df2943faf20afddb8a998 Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Wed, 21 Feb 2024 16:03:34 +0800
Subject: [PATCH] fix video collect detail

---
 src/App.vue                                |  10 +-
 src/router/index.ts                        |   7 +-
 src/router/manage.ts                       |   1 -
 src/router/user.ts                         | 108 ++++++++++-----------
 src/views/manage/QuestionBoxManageView.vue |   2 +-
 5 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9f88998..ec1738c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,11 @@
 <template>
-  <NConfigProvider :theme-overrides="themeOverrides" :theme="theme" style="height: 100vh" :locale="zhCN" :date-locale="dateZhCN">
+  <NConfigProvider
+    :theme-overrides="themeOverrides"
+    :theme="theme"
+    style="height: 100vh"
+    :locale="zhCN"
+    :date-locale="dateZhCN"
+  >
     <NMessageProvider>
       <NNotificationProvider>
         <NDialogProvider>
@@ -58,7 +64,7 @@ import TempComponent from './components/TempComponent.vue'
 const route = useRoute()
 
 const layout = computed(() => {
-  if (route.path.startsWith('/user')) {
+  if (route.path.startsWith('/user') || route.name == 'user' || route.path.startsWith('/@')) {
     document.title = route.meta.title + ' · ' + route.params.id + ' · VTsuru'
     return 'viewer'
   } else if (route.path.startsWith('/manage')) {
diff --git a/src/router/index.ts b/src/router/index.ts
index fe88bf9..b174d02 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -86,9 +86,14 @@ const routes: Array<RouteRecordRaw> = [
     },
   },
   manage,
-  user,
   obs,
   open_live,
+  {
+    path: '/@:id',
+    name: 'user',
+    alias: '/user/:id',
+    children: user,
+  },
   {
     path: '/:pathMatch(.*)*',
     name: 'notfound',
diff --git a/src/router/manage.ts b/src/router/manage.ts
index 57e9612..d6bcae6 100644
--- a/src/router/manage.ts
+++ b/src/router/manage.ts
@@ -80,7 +80,6 @@ export default //管理页面
       component: () => import('@/views/manage/VideoCollectDetailView.vue'),
       meta: {
         title: '详情 · 视频征集',
-        keepAlive: true,
         parent: 'manage-videoCollect',
       },
     },
diff --git a/src/router/user.ts b/src/router/user.ts
index 50e8d97..63cd4ed 100644
--- a/src/router/user.ts
+++ b/src/router/user.ts
@@ -1,62 +1,58 @@
-export default {
-  path: '/user/:id',
-  name: 'user',
-  children: [
-    {
-      path: '',
-      name: 'user-index',
-      component: () => import('@/views/view/UserIndexView.vue'),
-      meta: {
-        title: '主页',
-        keepAlive: true,
-      },
+export default [
+  {
+    path: '',
+    name: 'user-index',
+    component: () => import('@/views/view/UserIndexView.vue'),
+    meta: {
+      title: '主页',
+      keepAlive: true,
     },
-    {
-      path: 'song-list',
-      name: 'user-songList',
-      component: () => import('@/views/view/SongListView.vue'),
-      meta: {
-        title: '歌单',
-        keepAlive: true,
-      },
+  },
+  {
+    path: 'song-list',
+    name: 'user-songList',
+    component: () => import('@/views/view/SongListView.vue'),
+    meta: {
+      title: '歌单',
+      keepAlive: true,
     },
-    {
-      path: 'question-box',
-      name: 'user-questionBox',
-      component: () => import('@/views/view/QuestionBoxView.vue'),
-      meta: {
-        title: '提问箱',
-        keepAlive: true,
-      },
+  },
+  {
+    path: 'question-box',
+    name: 'user-questionBox',
+    component: () => import('@/views/view/QuestionBoxView.vue'),
+    meta: {
+      title: '提问箱',
+      keepAlive: true,
     },
-    {
-      path: 'schedule',
-      name: 'user-schedule',
-      component: () => import('@/views/view/ScheduleView.vue'),
-      meta: {
-        title: '日程',
-        keepAlive: true,
-      },
-      children: [
-        {
-          path: 'ics',
-          name: 'user-schedule-ics',
-          component: () => import('@/views/view/ScheduleView.vue'),
-          beforeEnter(to: any) {
-            // 直接重定向到外部 URL
-            window.location.href = 'https://vtsuru.live/api/schedule/get-ics?id=' + to.query.id
-          },
+  },
+  {
+    path: 'schedule',
+    name: 'user-schedule',
+    component: () => import('@/views/view/ScheduleView.vue'),
+    meta: {
+      title: '日程',
+      keepAlive: true,
+    },
+    children: [
+      {
+        path: 'ics',
+        name: 'user-schedule-ics',
+        component: () => import('@/views/view/ScheduleView.vue'),
+        beforeEnter(to: any) {
+          // 直接重定向到外部 URL
+          window.location.href = 'https://vtsuru.live/api/schedule/get-ics?id=' + to.query.id
         },
-      ],
-    },
-    {
-      path: 'goods',
-      name: 'user-goods',
-      component: () => import('@/views/pointViews/PointGoodsView.vue'),
-      meta: {
-        title: '积分兑换',
-        keepAlive: true,
       },
+    ],
+  },
+  {
+    path: 'goods',
+    name: 'user-goods',
+    component: () => import('@/views/pointViews/PointGoodsView.vue'),
+    meta: {
+      title: '积分兑换',
+      keepAlive: true,
     },
-  ],
-}
+  },
+]
diff --git a/src/views/manage/QuestionBoxManageView.vue b/src/views/manage/QuestionBoxManageView.vue
index f52518b..4ca20c4 100644
--- a/src/views/manage/QuestionBoxManageView.vue
+++ b/src/views/manage/QuestionBoxManageView.vue
@@ -60,7 +60,7 @@ const replyMessage = ref()
 const showSettingCard = ref(true)
 
 const shareCardRef = ref()
-const shareUrl = computed(() => 'https://vtsuru.live/user/' + accountInfo.value?.name + '/question-box')
+const shareUrl = computed(() => 'https://vtsuru.live/@' + accountInfo.value?.name + '/question-box')
 
 let isRevieveGetted = false
 let isSendGetted = false