From 3c85845946304a5a0bd16281b5da1ff49d32738a Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 30 Jul 2023 11:13:42 +0800
Subject: [PATCH] fix person page

---
 src/pages/browse.vue                      | 4 ----
 src/pages/person.vue                      | 8 ++------
 src/views/discover/MediaDetailView.vue    | 4 ++--
 src/views/discover/PersonCardListView.vue | 9 +++++++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/pages/browse.vue b/src/pages/browse.vue
index 9b50c959..48bccc45 100644
--- a/src/pages/browse.vue
+++ b/src/pages/browse.vue
@@ -13,9 +13,6 @@ const route = useRoute()
 // 标题
 const title = route.query?.title?.toString()
 
-// 副标题
-const subtitle = route.query?.subtitle?.toString()
-
 // 计算API路径
 function getApiPath(paths: string[] | string) {
   if (Array.isArray(paths))
@@ -31,7 +28,6 @@ function getApiPath(paths: string[] | string) {
       <div class="min-w-0 flex-1 mx-0">
         <h2 class="mb-4 truncate text-2xl font-bold leading-7 text-gray-100 sm:overflow-visible sm:text-4xl sm:leading-9 md:mb-0" data-testid="page-header">
           <span class="text-moviepilot">{{ title }}</span>
-          <span class="text-sm">{{ subtitle }}</span>
         </h2>
       </div>
     </div>
diff --git a/src/pages/person.vue b/src/pages/person.vue
index 9b50c959..7f2b6157 100644
--- a/src/pages/person.vue
+++ b/src/pages/person.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import MediaCardListView from '@/views/discover/MediaCardListView.vue'
+import PersonCardListView from '@/views/discover/PersonCardListView.vue'
 
 // 输入参数
 const props = defineProps({
@@ -13,9 +13,6 @@ const route = useRoute()
 // 标题
 const title = route.query?.title?.toString()
 
-// 副标题
-const subtitle = route.query?.subtitle?.toString()
-
 // 计算API路径
 function getApiPath(paths: string[] | string) {
   if (Array.isArray(paths))
@@ -31,11 +28,10 @@ function getApiPath(paths: string[] | string) {
       <div class="min-w-0 flex-1 mx-0">
         <h2 class="mb-4 truncate text-2xl font-bold leading-7 text-gray-100 sm:overflow-visible sm:text-4xl sm:leading-9 md:mb-0" data-testid="page-header">
           <span class="text-moviepilot">{{ title }}</span>
-          <span class="text-sm">{{ subtitle }}</span>
         </h2>
       </div>
     </div>
-    <MediaCardListView
+    <PersonCardListView
       :apipath="getApiPath(props.paths || '')"
       :params="route.query"
     />
diff --git a/src/views/discover/MediaDetailView.vue b/src/views/discover/MediaDetailView.vue
index 65ee550c..90dbc459 100644
--- a/src/views/discover/MediaDetailView.vue
+++ b/src/views/discover/MediaDetailView.vue
@@ -89,7 +89,7 @@ onBeforeMount(() => {
         <PersonCardSlideView :apipath="`tmdb/credits/${mediaDetail.tmdb_id}/${mediaProps.type}`">
           <template #title="{ loaded }">
             <div v-if="loaded" class="slider-header">
-              <RouterLink :to="`/browse/tmdb/credits/${mediaDetail.tmdb_id}/${mediaProps.type}?title=演员阵容`" class="slider-title">
+              <RouterLink :to="`/person/tmdb/credits/${mediaDetail.tmdb_id}/${mediaProps.type}?title=演员阵容`" class="slider-title">
                 <span>演员阵容</span>
                 <VIcon icon="mdi-arrow-right-circle-outline" class="ms-1" />
               </RouterLink>
@@ -101,7 +101,7 @@ onBeforeMount(() => {
         <MediaCardSlideView :apipath="`tmdb/recommend/${mediaDetail.tmdb_id}/${mediaProps.type}`">
           <template #title="{ loaded }">
             <div v-if="loaded" class="slider-header">
-              <RouterLink :to="`/browse/tmdb/recommend/${mediaDetail.tmdb_id}/${mediaProps.type}?title=推荐&subtitle=${mediaDetail.title}`" class="slider-title">
+              <RouterLink :to="`/browse/tmdb/recommend/${mediaDetail.tmdb_id}/${mediaProps.type}?title=推荐`" class="slider-title">
                 <span>推荐</span>
                 <VIcon icon="mdi-arrow-right-circle-outline" class="ms-1" />
               </RouterLink>
diff --git a/src/views/discover/PersonCardListView.vue b/src/views/discover/PersonCardListView.vue
index b8fee41e..1f71f326 100644
--- a/src/views/discover/PersonCardListView.vue
+++ b/src/views/discover/PersonCardListView.vue
@@ -7,6 +7,7 @@ import NoDataFound from '@/components/NoDataFound.vue'
 // 输入参数
 const props = defineProps({
   apipath: String,
+  params: Object as PropType<{ [key: string]: any }>,
 })
 
 // 判断是否有滚动条
@@ -73,7 +74,11 @@ async function fetchData({ done }: { done: any }) {
     else {
       // 加载一次
       // 请求API
-      currData.value = await api.get(props.apipath)
+      currData.value = await api.get(props.apipath, {
+        params: {
+          page: page.value,
+        },
+      })
 
       // 标计为已请求完成
       isRefreshed.value = true
@@ -133,7 +138,7 @@ async function fetchData({ done }: { done: any }) {
       <PersonCard
         v-for="data in dataList"
         :key="data.id"
-        :media="data"
+        :person="data"
       />
     </div>
     <NoDataFound