From 3321427eb402a691fd2c8e48aecb86cad642da93 Mon Sep 17 00:00:00 2001
From: Allen <hotlcc@qq.com>
Date: Fri, 31 May 2024 11:18:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3tab=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BAquery=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=8E=9F=E5=85=88=E9=87=87=E7=94=A8params=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=97=B6=E5=AF=BC=E8=87=B4=E4=B8=BB=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DefaultLayoutWithVerticalNav.vue          |  8 +++----
 src/layouts/components/UserProfile.vue        |  2 +-
 src/pages/setting.vue                         | 10 +++++++--
 src/pages/subscribe-movie.vue                 | 10 +++++++--
 src/pages/subscribe-tv.vue                    | 10 +++++++--
 src/router/index.ts                           | 22 +++++++++----------
 src/views/plugin/PluginCardListView.vue       | 10 +++++++--
 7 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/layouts/components/DefaultLayoutWithVerticalNav.vue b/src/layouts/components/DefaultLayoutWithVerticalNav.vue
index 7c12b219..95ae0138 100644
--- a/src/layouts/components/DefaultLayoutWithVerticalNav.vue
+++ b/src/layouts/components/DefaultLayoutWithVerticalNav.vue
@@ -85,14 +85,14 @@ const superUser = store.state.auth.superUser
         :item="{
           title: '电影',
           icon: 'mdi-movie-check-outline',
-          to: '/subscribe-movie/mysub',
+          to: '/subscribe-movie?tab=mysub',
         }"
       />
       <VerticalNavLink
         :item="{
           title: '电视剧',
           icon: 'mdi-television-classic',
-          to: '/subscribe-tv/mysub',
+          to: '/subscribe-tv?tab=mysub',
         }"
       />
       <VerticalNavLink
@@ -144,7 +144,7 @@ const superUser = store.state.auth.superUser
         :item="{
           title: '插件',
           icon: 'mdi-apps',
-          to: '/plugins/installed',
+          to: '/plugins?tab=installed',
         }"
       />
       <VerticalNavLink
@@ -160,7 +160,7 @@ const superUser = store.state.auth.superUser
         :item="{
           title: '设定',
           icon: 'mdi-cog',
-          to: '/setting/account',
+          to: '/setting?tab=account',
         }"
       />
     </template>
diff --git a/src/layouts/components/UserProfile.vue b/src/layouts/components/UserProfile.vue
index 5c2cbd2a..2fdf7f20 100644
--- a/src/layouts/components/UserProfile.vue
+++ b/src/layouts/components/UserProfile.vue
@@ -89,7 +89,7 @@ const avatar = store.state.auth.avatar
         <VDivider class="my-2" />
 
         <!-- 👉 Profile -->
-        <VListItem v-if="superUser" link to="setting">
+        <VListItem v-if="superUser" link @click="router.push('/setting?tab=account')">
           <template #prepend>
             <VIcon class="me-2" icon="mdi-account-outline" size="22" />
           </template>
diff --git a/src/pages/setting.vue b/src/pages/setting.vue
index 81d6b8e3..5f2fc40b 100644
--- a/src/pages/setting.vue
+++ b/src/pages/setting.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { useRoute } from 'vue-router'
+import router from '@/router'
 import AccountSettingAccount from '@/views/setting/AccountSettingAccount.vue'
 import AccountSettingNotification from '@/views/setting/AccountSettingNotification.vue'
 import AccountSettingSite from '@/views/setting/AccountSettingSite.vue'
@@ -13,7 +14,7 @@ import AccountSettingDirectory from '@/views/setting/AccountSettingDirectory.vue
 
 const route = useRoute()
 
-const activeTab = ref(route.params.tab)
+const activeTab = ref(route.query.tab)
 
 // tabs
 const tabs = [
@@ -68,12 +69,17 @@ const tabs = [
     tab: 'about',
   },
 ]
+
+// 跳转tab
+function jumpTab(tab: string) {
+  router.push("/setting?tab=" + tab)
+}
 </script>
 
 <template>
   <div>
     <VTabs v-model="activeTab" show-arrows class="v-tabs-pill">
-      <VTab v-for="item in tabs" :key="item.icon" :value="item.tab" :to="'/setting/' + item.tab">
+      <VTab v-for="item in tabs" :key="item.icon" :value="item.tab" @click="jumpTab(item.tab)">
         <VIcon size="20" start :icon="item.icon" />
         {{ item.title }}
       </VTab>
diff --git a/src/pages/subscribe-movie.vue b/src/pages/subscribe-movie.vue
index 044605db..db9dbcdc 100644
--- a/src/pages/subscribe-movie.vue
+++ b/src/pages/subscribe-movie.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import SubscribeListView from '@/views/subscribe/SubscribeListView.vue'
 import SubscribePopularView from '@/views/subscribe/SubscribePopularView.vue'
+import router from '@/router'
 
 const route = useRoute()
 
@@ -17,13 +18,18 @@ const tabs = [
 ]
 
 // 当前标签
-const activeTab = ref(route.params.tab)
+const activeTab = ref(route.query.tab)
+
+// 跳转tab
+function jumpTab(tab: string) {
+  router.push("/subscribe-movie?tab=" + tab)
+}
 </script>
 
 <template>
   <div>
     <VTabs v-model="activeTab">
-      <VTab v-for="item in tabs" :value="item.tab" :to="'/subscribe-movie/' + item.tab">
+      <VTab v-for="item in tabs" :value="item.tab" @click="jumpTab(item.tab)">
         <span class="mx-5">{{ item.title }}</span>
       </VTab>
     </VTabs>
diff --git a/src/pages/subscribe-tv.vue b/src/pages/subscribe-tv.vue
index edf9acf1..c007fce5 100644
--- a/src/pages/subscribe-tv.vue
+++ b/src/pages/subscribe-tv.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import SubscribeListView from '@/views/subscribe/SubscribeListView.vue'
 import SubscribePopularView from '@/views/subscribe/SubscribePopularView.vue'
+import router from '@/router'
 
 const route = useRoute()
 
@@ -17,13 +18,18 @@ const tabs = [
 ]
 
 // 当前标签
-const activeTab = ref(route.params.tab)
+const activeTab = ref(route.query.tab)
+
+// 跳转tab
+function jumpTab(tab: string) {
+  router.push("/subscribe-tv?tab=" + tab)
+}
 </script>
 
 <template>
   <div>
     <VTabs v-model="activeTab">
-      <VTab v-for="item in tabs" :value="item.tab" :to="'/subscribe-tv/' + item.tab">
+      <VTab v-for="item in tabs" :value="item.tab" @click="jumpTab(item.tab)">
         <span class="mx-5">{{ item.title }}</span>
       </VTab>
     </VTabs>
diff --git a/src/router/index.ts b/src/router/index.ts
index 14d37606..90d9d04e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -20,14 +20,14 @@ const router = createRouter({
       component: () => import('../layouts/default.vue'),
       children: [
         {
-          path: 'dashboard',
+          path: '/dashboard',
           component: () => import('../pages/dashboard.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'ranking',
+          path: '/ranking',
           component: () => import('../pages/ranking.vue'),
           meta: {
             keepAlive: true,
@@ -35,63 +35,63 @@ const router = createRouter({
           },
         },
         {
-          path: 'resource',
+          path: '/resource',
           component: () => import('../pages/resource.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'subscribe-movie/:tab',
+          path: '/subscribe-movie',
           component: () => import('../pages/subscribe-movie.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'subscribe-tv/:tab',
+          path: '/subscribe-tv',
           component: () => import('../pages/subscribe-tv.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'calendar',
+          path: '/calendar',
           component: () => import('../pages/calendar.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'downloading',
+          path: '/downloading',
           component: () => import('../pages/downloading.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'history',
+          path: '/history',
           component: () => import('../pages/history.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'site',
+          path: '/site',
           component: () => import('../pages/site.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'plugins/:tab',
+          path: '/plugins',
           component: () => import('../pages/plugin.vue'),
           meta: {
             requiresAuth: true,
           },
         },
         {
-          path: 'setting/:tab',
+          path: '/setting',
           component: () => import('../pages/setting.vue'),
           meta: {
             requiresAuth: true,
diff --git a/src/views/plugin/PluginCardListView.vue b/src/views/plugin/PluginCardListView.vue
index bc503e2b..4957dd1a 100644
--- a/src/views/plugin/PluginCardListView.vue
+++ b/src/views/plugin/PluginCardListView.vue
@@ -9,6 +9,7 @@ import noImage from '@images/logos/plugin.png'
 import { useDisplay } from 'vuetify'
 import { isNullOrEmptyObject } from '@/@core/utils'
 import { useDefer } from '@/@core/utils/dom'
+import router from '@/router'
 
 const route = useRoute()
 
@@ -19,7 +20,7 @@ const display = useDisplay()
 let deferApp = (_: number) => true
 
 // 当前标签
-const activeTab = ref(route.params.tab)
+const activeTab = ref(route.query.tab)
 
 // 标签页
 const tabs = [
@@ -320,6 +321,11 @@ function handleRepoUrl(url: string | undefined) {
   return url.replace('https://github.com/', '').replace('https://raw.githubusercontent.com/', '')
 }
 
+// 跳转tab
+function jumpTab(tab: string) {
+  router.push("/plugins?tab=" + tab)
+}
+
 // 加载时获取数据
 onBeforeMount(async () => {
   await refreshData()
@@ -330,7 +336,7 @@ onBeforeMount(async () => {
 <template>
   <div>
     <VTabs v-model="activeTab">
-      <VTab v-for="item in tabs" :value="item.tab" :to="'/plugins/' + item.tab">
+      <VTab v-for="item in tabs" :value="item.tab" @click="jumpTab(item.tab)">
         <span class="mx-5">{{ item.title }}</span>
       </VTab>
     </VTabs>