From 4f6a11fd7c46f137f7bf00c075323f3a82a1cf36 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Tue, 16 Sep 2025 04:25:02 +0000
Subject: [PATCH 1/2] Refactor subscribe views to use VChipGroup for sorting

Co-authored-by: jxxghp <jxxghp@qq.com>
---
 src/views/subscribe/SubscribePopularView.vue | 94 +++++++++++---------
 src/views/subscribe/SubscribeShareView.vue   | 40 ++++++---
 2 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/src/views/subscribe/SubscribePopularView.vue b/src/views/subscribe/SubscribePopularView.vue
index 525fde63..60288dfd 100644
--- a/src/views/subscribe/SubscribePopularView.vue
+++ b/src/views/subscribe/SubscribePopularView.vue
@@ -219,56 +219,66 @@ async function fetchData({ done }: { done: any }) {
     
     <div class="flex justify-start align-center mb-3">
       <div class="mr-5">
-        <VLabel>{{ t('tmdb.rating') }}</VLabel>
+        <VLabel>{{ t('tmdb.rating') }} & {{ t('subscribe.minSubscribers') }}</VLabel>
       </div>
-      <VSlider
-        v-model="filterParams.min_rating"
-        thumb-label
-        max="10"
-        min="0"
-        :step="0.1"
-        class="align-center"
-        hide-details
-        style="width: 200px;"
-      >
-        <template v-slot:append>
-          <span class="ml-2 text-body-2">- 10</span>
-        </template>
-      </VSlider>
-    </div>
-    
-    <div class="flex justify-start align-center mb-3">
-      <div class="mr-5">
-        <VLabel>{{ t('subscribe.minSubscribers') }}</VLabel>
+      <div class="flex align-center">
+        <VSlider
+          v-model="filterParams.min_rating"
+          thumb-label
+          max="10"
+          min="0"
+          :step="1"
+          class="align-center"
+          hide-details
+          style="width: 200px;"
+        >
+          <template v-slot:append>
+            <span class="ml-2 text-body-2">- 10</span>
+          </template>
+        </VSlider>
+        <VTextField
+          v-model="filterParams.min_sub"
+          variant="outlined"
+          density="compact"
+          type="number"
+          hide-details
+          single-line
+          min="1"
+          style="width: 120px; margin-left: 20px;"
+        />
       </div>
-      <VTextField
-        v-model="filterParams.min_sub"
-        variant="outlined"
-        density="compact"
-        type="number"
-        hide-details
-        single-line
-        min="1"
-        style="width: 120px;"
-      />
     </div>
     
     <div class="flex justify-start align-center">
       <div class="mr-5">
         <VLabel>{{ t('tmdb.sort') }}</VLabel>
       </div>
-      <VSelect
-        v-model="filterParams.sort_type"
-        :items="[
-          { title: t('tmdb.sortType.time'), value: 'time' },
-          { title: t('tmdb.sortType.count'), value: 'count' },
-          { title: t('tmdb.sortType.rating'), value: 'rating' }
-        ]"
-        variant="outlined"
-        density="compact"
-        hide-details
-        style="width: 150px;"
-      />
+      <VChipGroup v-model="filterParams.sort_type">
+        <VChip
+          :color="filterParams.sort_type == 'time' ? 'primary' : ''"
+          filter
+          tile
+          value="time"
+        >
+          {{ t('tmdb.sortType.time') }}
+        </VChip>
+        <VChip
+          :color="filterParams.sort_type == 'count' ? 'primary' : ''"
+          filter
+          tile
+          value="count"
+        >
+          {{ t('tmdb.sortType.count') }}
+        </VChip>
+        <VChip
+          :color="filterParams.sort_type == 'rating' ? 'primary' : ''"
+          filter
+          tile
+          value="rating"
+        >
+          {{ t('tmdb.sortType.rating') }}
+        </VChip>
+      </VChipGroup>
     </div>
   </div>
 
diff --git a/src/views/subscribe/SubscribeShareView.vue b/src/views/subscribe/SubscribeShareView.vue
index 7252876d..3cd6c2fe 100644
--- a/src/views/subscribe/SubscribeShareView.vue
+++ b/src/views/subscribe/SubscribeShareView.vue
@@ -245,7 +245,7 @@ function removeData(id: number) {
         thumb-label
         max="10"
         min="0"
-        :step="0.1"
+        :step="1"
         class="align-center"
         hide-details
         style="width: 200px;"
@@ -260,18 +260,32 @@ function removeData(id: number) {
       <div class="mr-5">
         <VLabel>{{ t('tmdb.sort') }}</VLabel>
       </div>
-      <VSelect
-        v-model="filterParams.sort_type"
-        :items="[
-          { title: t('tmdb.sortType.time'), value: 'time' },
-          { title: t('tmdb.sortType.count'), value: 'count' },
-          { title: t('tmdb.sortType.rating'), value: 'rating' }
-        ]"
-        variant="outlined"
-        density="compact"
-        hide-details
-        style="width: 150px;"
-      />
+      <VChipGroup v-model="filterParams.sort_type">
+        <VChip
+          :color="filterParams.sort_type == 'time' ? 'primary' : ''"
+          filter
+          tile
+          value="time"
+        >
+          {{ t('tmdb.sortType.time') }}
+        </VChip>
+        <VChip
+          :color="filterParams.sort_type == 'count' ? 'primary' : ''"
+          filter
+          tile
+          value="count"
+        >
+          {{ t('tmdb.sortType.count') }}
+        </VChip>
+        <VChip
+          :color="filterParams.sort_type == 'rating' ? 'primary' : ''"
+          filter
+          tile
+          value="rating"
+        >
+          {{ t('tmdb.sortType.rating') }}
+        </VChip>
+      </VChipGroup>
     </div>
   </div>
 

From d1a656db82801eeb3386c2a55b7abf03eb3ec821 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Tue, 16 Sep 2025 04:25:38 +0000
Subject: [PATCH 2/2] Refactor: Move sort filter to top in subscribe views

Co-authored-by: jxxghp <jxxghp@qq.com>
---
 src/views/subscribe/SubscribePopularView.vue | 64 ++++++++++----------
 src/views/subscribe/SubscribeShareView.vue   | 64 ++++++++++----------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/views/subscribe/SubscribePopularView.vue b/src/views/subscribe/SubscribePopularView.vue
index 60288dfd..084326f7 100644
--- a/src/views/subscribe/SubscribePopularView.vue
+++ b/src/views/subscribe/SubscribePopularView.vue
@@ -199,6 +199,38 @@ async function fetchData({ done }: { done: any }) {
 <template>
   <!-- 筛选器 -->
   <div class="px-3 mb-4">
+    <div class="flex justify-start align-center mb-3">
+      <div class="mr-5">
+        <VLabel>{{ t('tmdb.sort') }}</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.sort_type">
+        <VChip
+          :color="filterParams.sort_type == 'time' ? 'primary' : ''"
+          filter
+          tile
+          value="time"
+        >
+          {{ t('tmdb.sortType.time') }}
+        </VChip>
+        <VChip
+          :color="filterParams.sort_type == 'count' ? 'primary' : ''"
+          filter
+          tile
+          value="count"
+        >
+          {{ t('tmdb.sortType.count') }}
+        </VChip>
+        <VChip
+          :color="filterParams.sort_type == 'rating' ? 'primary' : ''"
+          filter
+          tile
+          value="rating"
+        >
+          {{ t('tmdb.sortType.rating') }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    
     <div class="flex justify-start align-center mb-3">
       <div class="mr-5">
         <VLabel>{{ t('tmdb.genre') }}</VLabel>
@@ -248,38 +280,6 @@ async function fetchData({ done }: { done: any }) {
         />
       </div>
     </div>
-    
-    <div class="flex justify-start align-center">
-      <div class="mr-5">
-        <VLabel>{{ t('tmdb.sort') }}</VLabel>
-      </div>
-      <VChipGroup v-model="filterParams.sort_type">
-        <VChip
-          :color="filterParams.sort_type == 'time' ? 'primary' : ''"
-          filter
-          tile
-          value="time"
-        >
-          {{ t('tmdb.sortType.time') }}
-        </VChip>
-        <VChip
-          :color="filterParams.sort_type == 'count' ? 'primary' : ''"
-          filter
-          tile
-          value="count"
-        >
-          {{ t('tmdb.sortType.count') }}
-        </VChip>
-        <VChip
-          :color="filterParams.sort_type == 'rating' ? 'primary' : ''"
-          filter
-          tile
-          value="rating"
-        >
-          {{ t('tmdb.sortType.rating') }}
-        </VChip>
-      </VChipGroup>
-    </div>
   </div>
 
   <LoadingBanner v-if="!isRefreshed" class="mt-12" />
diff --git a/src/views/subscribe/SubscribeShareView.vue b/src/views/subscribe/SubscribeShareView.vue
index 3cd6c2fe..95d18526 100644
--- a/src/views/subscribe/SubscribeShareView.vue
+++ b/src/views/subscribe/SubscribeShareView.vue
@@ -218,6 +218,38 @@ function removeData(id: number) {
 <template>
   <!-- 筛选器 -->
   <div class="px-3 mb-4">
+    <div class="flex justify-start align-center mb-3">
+      <div class="mr-5">
+        <VLabel>{{ t('tmdb.sort') }}</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.sort_type">
+        <VChip
+          :color="filterParams.sort_type == 'time' ? 'primary' : ''"
+          filter
+          tile
+          value="time"
+        >
+          {{ t('tmdb.sortType.time') }}
+        </VChip>
+        <VChip
+          :color="filterParams.sort_type == 'count' ? 'primary' : ''"
+          filter
+          tile
+          value="count"
+        >
+          {{ t('tmdb.sortType.count') }}
+        </VChip>
+        <VChip
+          :color="filterParams.sort_type == 'rating' ? 'primary' : ''"
+          filter
+          tile
+          value="rating"
+        >
+          {{ t('tmdb.sortType.rating') }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    
     <div class="flex justify-start align-center mb-3">
       <div class="mr-5">
         <VLabel>{{ t('tmdb.genre') }}</VLabel>
@@ -255,38 +287,6 @@ function removeData(id: number) {
         </template>
       </VSlider>
     </div>
-    
-    <div class="flex justify-start align-center">
-      <div class="mr-5">
-        <VLabel>{{ t('tmdb.sort') }}</VLabel>
-      </div>
-      <VChipGroup v-model="filterParams.sort_type">
-        <VChip
-          :color="filterParams.sort_type == 'time' ? 'primary' : ''"
-          filter
-          tile
-          value="time"
-        >
-          {{ t('tmdb.sortType.time') }}
-        </VChip>
-        <VChip
-          :color="filterParams.sort_type == 'count' ? 'primary' : ''"
-          filter
-          tile
-          value="count"
-        >
-          {{ t('tmdb.sortType.count') }}
-        </VChip>
-        <VChip
-          :color="filterParams.sort_type == 'rating' ? 'primary' : ''"
-          filter
-          tile
-          value="rating"
-        >
-          {{ t('tmdb.sortType.rating') }}
-        </VChip>
-      </VChipGroup>
-    </div>
   </div>
 
   <VPageContentTitle v-if="keyword" :title="`${t('common.search')}：${keyword}`" />