feat：为TMDB排序和风格字典添加类型定义，优化过滤参数的逻辑，确保参数有效性

feat：优化TheMovieDbView组件的watch逻辑，分离类型和过滤参数的监听，确保列表刷新更高效
更新 package.json
2026-05-08 09:12:43 +08:00 · 2025-02-09 22:21:43 +08:00 · 2025-02-09 22:00:38 +08:00 · 2025-02-09 11:59:53 +08:00 · 2025-02-09 11:57:46 +08:00 · 2025-02-09 11:55:40 +08:00
64 changed files with 2008 additions and 778 deletions
--- a/index.html
+++ b/index.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en"
+  style="overflow: hidden auto; min-block-size: calc(100% + env(safe-area-inset-top) + env(safe-area-inset-bottom));background: var(--initial-loader-bg, #fff);">

 <head>
  <meta http-equiv="pragma" content="no-cache">
@@ -29,9 +30,17 @@
  <meta name="HandheldFriendly" content="True" />
  <meta name="MobileOptimized" content="320" />
  <link rel="stylesheet" type="text/css" href="/loader.css" />
+  <script>
+    const loaderColor = localStorage.getItem('materio-initial-loader-bg') || '#FFFFFF'
+    if (loaderColor)
+      document.documentElement.style.setProperty('--initial-loader-bg', loaderColor)
+    const primaryColor = localStorage.getItem('materio-initial-loader-color') || '#9155FD'
+    if (primaryColor)
+      document.documentElement.style.setProperty('--initial-loader-color', primaryColor)
+  </script>
 </head>

-<body>
+<body style="margin: 0;">
  <div id="loading-bg">
    <div class="loading-logo">
      <!-- Logo -->
@@ -146,16 +155,6 @@
  </div>
  <div id="app"></div>
  <script type="module" src="/src/main.ts"></script>
-  <script>
-    const loaderColor = localStorage.getItem('materio-initial-loader-bg') || '#FFFFFF'
-    const primaryColor = localStorage.getItem('materio-initial-loader-color') || '#9155FD'
-
-    if (loaderColor)
-      document.documentElement.style.setProperty('--initial-loader-bg', loaderColor)
-
-    if (primaryColor)
-      document.documentElement.style.setProperty('--initial-loader-color', primaryColor)
-  </script>
 </body>

-</html>
+</html>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "moviepilot",
-  "version": "2.2.2",
+  "version": "2.2.8",
  "private": true,
  "bin": "dist/service.js",
  "scripts": {
--- a/public/loader.css
+++ b/public/loader.css
@@ -1,16 +1,6 @@
-body {
-  margin: 0;
-}
-
-html {
-  overflow: hidden auto;
-  background: var(--initial-loader-bg, #fff);
-  min-block-size: calc(100% + env(safe-area-inset-top) + env(safe-area-inset-bottom));
-}
-
 #loading-bg {
-  position: absolute;
-  z-index: 999;
+  position: fixed;
+  z-index: 9999;
  display: block;
  background: var(--initial-loader-bg, #fff);
  block-size: 100vh;
@@ -82,4 +72,4 @@ html {
    opacity: 1;
    transform: rotate(1turn);
  }
-}
+}
--- a/src/@core/components/ThemeSwitcher.vue
+++ b/src/@core/components/ThemeSwitcher.vue
@@ -5,6 +5,7 @@ import type { ThemeSwitcherTheme } from '@layouts/types'
 import api from '@/api'
 import { checkPrefersColorSchemeIsDark } from '@/@core/utils'
 import { useToast } from 'vue-toast-notification'
+import { saveLocalTheme } from '../utils/theme'

 // 显示器宽度
 const display = useDisplay()
@@ -102,8 +103,7 @@ function updateTheme() {
  savedTheme.value = theme
  themeTransition()
  // 保存主题到本地
-  localStorage.setItem('theme', theme)
-  localStorage.setItem('materio-initial-loader-bg', globalTheme.current.value.colors.background)
+  saveLocalTheme(theme, globalTheme)
 }

 // 切换主题
@@ -209,7 +209,7 @@ onMounted(() => {
    </VList>
  </VMenu>
  <!-- 自定义 CSS -- -->
-  <VDialog v-model="cssDialog" persistent max-width="50rem" scrollable :fullscreen="!display.mdAndUp.value">
+  <VDialog v-if="cssDialog" v-model="cssDialog" persistent max-width="50rem" scrollable :fullscreen="!display.mdAndUp.value">
    <VCard title="自定义主题风格">
      <DialogCloseBtn @click="cssDialog = false" />
      <VDivider />
--- a/src/@core/utils/dom.ts
+++ b/src/@core/utils/dom.ts
@@ -10,8 +10,7 @@ export function useDefer(maxFrameCount = 1) {
  const refreshFrameCount = () => {
    requestAnimationFrame(() => {
      frameCount.value++
-      if (frameCount.value < maxFrameCount)
-        refreshFrameCount()
+      if (frameCount.value < maxFrameCount) refreshFrameCount()
    })
  }
  refreshFrameCount()
@@ -19,3 +18,9 @@ export function useDefer(maxFrameCount = 1) {
    return frameCount.value >= showInFrameCount
  }
 }
+
+export function ensureRenderComplete(callback: () => void) {
+  requestAnimationFrame(() => {
+    requestAnimationFrame(callback)
+  })
+}
--- a/src/@core/utils/formatters.ts
+++ b/src/@core/utils/formatters.ts
@@ -153,3 +153,12 @@ export function formatDateDifference(dateString: string): string {
  if (!dateString) return ''
  return dayjs(dateString).fromNow()
 }
+
+// 格式化评份，如为10及以下的数按原值显示，否则格式化为xxM、xxK显示
+export function formatRating(rating: number): string {
+  if (!rating) return ''
+  if (rating <= 10) return rating.toString()
+  if (rating < 1000) return rating.toLocaleString()
+  if (rating < 1000 * 1000) return `${(rating / 1000).toFixed(1)}K`
+  return `${(rating / 1000 / 1000).toFixed(1)}M`
+}
--- a/src/@core/utils/theme.ts
+++ b/src/@core/utils/theme.ts
@@ -0,0 +1,6 @@
+export function saveLocalTheme(name: string, theme: any) {
+  // 存储主题到本地
+  localStorage.setItem('theme', name)
+  localStorage.setItem('materio-initial-loader-bg', theme.current.value.colors.background)
+  localStorage.setItem('materio-initial-loader-color', theme.current.value.colors.primary)
+}
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,15 +1,16 @@
 <script lang="ts" setup>
 import { useTheme } from 'vuetify'
 import { checkPrefersColorSchemeIsDark } from '@/@core/utils'
-
-const { global: globalTheme } = useTheme()
+import { ensureRenderComplete, removeEl } from './@core/utils/dom'

 // 生效主题
-async function setTheme() {
-  let themeValue = localStorage.getItem('theme') || 'light'
-  const autoTheme = checkPrefersColorSchemeIsDark() ? 'dark' : 'light'
-  globalTheme.name.value = themeValue === 'auto' ? autoTheme : themeValue
-}
+const { global: globalTheme } = useTheme()
+let themeValue = localStorage.getItem('theme') || 'light'
+const autoTheme = checkPrefersColorSchemeIsDark() ? 'dark' : 'light'
+globalTheme.name.value = themeValue === 'auto' ? autoTheme : themeValue
+
+// 显示状态
+const show = ref(false)

 // ApexCharts 全局配置
 declare global {
@@ -41,14 +42,24 @@ if (window.Apex) {
  }
 }

-// 页面加载时，加载当前用户数据
-onBeforeMount(async () => {
-  setTheme()
+onMounted(() => {
+  ensureRenderComplete(() => {
+    nextTick(() => {
+      setTimeout(() => {
+        // 移除加载动画
+        removeEl('#loading-bg')
+        // 将background属性从html的style中移除
+        document.documentElement.style.removeProperty('background')
+        // 显示页面
+        show.value = true
+      }, 1500)
+    })
+  })
 })
 </script>

 <template>
-  <VApp>
+  <VApp v-show="show">
    <RouterView />
  </VApp>
 </template>
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -14,6 +14,10 @@ export interface Subscribe {
  tmdbid: number
  // 豆瓣ID
  doubanid?: string
+  // Bangumi ID
+  bangumiid?: string
+  // 其它媒体ID
+  mediaid?: string
  // 季号
  season?: number
  // 海报
@@ -208,6 +212,10 @@ export interface MediaInfo {
  bangumi_id?: string
  // 合集ID
  collection_id?: number
+  // 其它媒体ID前缀
+  mediaid_prefix?: string
+  // 其它媒体ID值
+  media_id?: string
  // 媒体原语种
  original_language?: string
  // 媒体原发行标题
@@ -280,6 +288,24 @@ export interface MediaInfo {
  names?: string[]
 }

+// 季信息
+export interface MediaSeason {
+  // 上映日期
+  air_date?: string
+  // 总集数
+  episode_count?: number
+  // 季名称
+  name?: string
+  // 描述
+  overview?: string
+  // 海报
+  poster_path?: string
+  // 季号
+  season_number?: number
+  // 评分
+  vote_average?: number
+}
+
 // TMDB季信息
 export interface TmdbSeason {
  // 上映日期
@@ -1204,3 +1230,25 @@ export interface TransferQueue {
    state: string
  }[]
 }
+
+// 探索的数据源
+export interface DiscoverSource {
+  // 数据源名称
+  name: string
+  // 媒体ID的前缀，不含:
+  mediaid_prefix: string
+  // 媒体数据源API地址
+  api_path: string
+  // 过滤参数
+  filter_params: { [key: string]: any }
+  // 过滤参数UI配置
+  filter_ui: RenderProps[]
+}
+
+// 推荐的数据源
+export interface RecommendSource {
+  // 数据源名称
+  name: string
+  // 媒体数据源API地址
+  api_path: string
+}
--- a/src/assets/images/logos/bangumi_title.png
+++ b/src/assets/images/logos/bangumi_title.png
--- a/src/assets/images/logos/douban_title.png
+++ b/src/assets/images/logos/douban_title.png
--- a/src/assets/images/logos/tmdb_title.svg
+++ b/src/assets/images/logos/tmdb_title.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 273.42 35.52"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" y1="17.76" x2="273.42" y2="17.76" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#90cea1"/><stop offset="0.56" stop-color="#3cbec9"/><stop offset="1" stop-color="#00b3e5"/></linearGradient></defs><title>Asset 3</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M191.85,35.37h63.9A17.67,17.67,0,0,0,273.42,17.7h0A17.67,17.67,0,0,0,255.75,0h-63.9A17.67,17.67,0,0,0,174.18,17.7h0A17.67,17.67,0,0,0,191.85,35.37ZM10.1,35.42h7.8V6.92H28V0H0v6.9H10.1Zm28.1,0H46V8.25h.1L55.05,35.4h6L70.3,8.25h.1V35.4h7.8V0H66.45l-8.2,23.1h-.1L50,0H38.2ZM89.14.12h11.7a33.56,33.56,0,0,1,8.08,1,18.52,18.52,0,0,1,6.67,3.08,15.09,15.09,0,0,1,4.53,5.52,18.5,18.5,0,0,1,1.67,8.25,16.91,16.91,0,0,1-1.62,7.58,16.3,16.3,0,0,1-4.38,5.5,19.24,19.24,0,0,1-6.35,3.37,24.53,24.53,0,0,1-7.55,1.15H89.14Zm7.8,28.2h4a21.66,21.66,0,0,0,5-.55A10.58,10.58,0,0,0,110,26a8.73,8.73,0,0,0,2.68-3.35,11.9,11.9,0,0,0,1-5.08,9.87,9.87,0,0,0-1-4.52,9.17,9.17,0,0,0-2.63-3.18A11.61,11.61,0,0,0,106.22,8a17.06,17.06,0,0,0-4.68-.63h-4.6ZM133.09.12h13.2a32.87,32.87,0,0,1,4.63.33,12.66,12.66,0,0,1,4.17,1.3,7.94,7.94,0,0,1,3,2.72,8.34,8.34,0,0,1,1.15,4.65,7.48,7.48,0,0,1-1.67,5,9.13,9.13,0,0,1-4.43,2.82V17a10.28,10.28,0,0,1,3.18,1,8.51,8.51,0,0,1,2.45,1.85,7.79,7.79,0,0,1,1.57,2.62,9.16,9.16,0,0,1,.55,3.2,8.52,8.52,0,0,1-1.2,4.68,9.32,9.32,0,0,1-3.1,3A13.38,13.38,0,0,1,152.32,35a22.5,22.5,0,0,1-4.73.5h-14.5Zm7.8,14.15h5.65a7.65,7.65,0,0,0,1.78-.2,4.78,4.78,0,0,0,1.57-.65,3.43,3.43,0,0,0,1.13-1.2,3.63,3.63,0,0,0,.42-1.8A3.3,3.3,0,0,0,151,8.6a3.42,3.42,0,0,0-1.23-1.13A6.07,6.07,0,0,0,148,6.9a9.9,9.9,0,0,0-1.85-.18h-5.3Zm0,14.65h7a8.27,8.27,0,0,0,1.83-.2,4.67,4.67,0,0,0,1.67-.7,3.93,3.93,0,0,0,1.23-1.3,3.8,3.8,0,0,0,.47-1.95,3.16,3.16,0,0,0-.62-2,4,4,0,0,0-1.58-1.18,8.23,8.23,0,0,0-2-.55,15.12,15.12,0,0,0-2.05-.15h-5.9Z"/></g></g></svg>
--- a/src/components/cards/CustomRuleCard.vue
+++ b/src/components/cards/CustomRuleCard.vue
@@ -104,7 +104,7 @@ function onClose() {
        <VImg :src="filter_svg" cover class="mt-7" max-width="3rem" />
      </VCardText>
    </VCard>
-    <VDialog v-model="ruleInfoDialog" scrollable max-width="40rem" persistent>
+    <VDialog v-if="ruleInfoDialog" v-model="ruleInfoDialog" scrollable max-width="40rem" persistent>
      <VCard :title="`${props.rule.id} - 配置`" class="rounded-t">
        <DialogCloseBtn v-model="ruleInfoDialog" />
        <VDivider />
--- a/src/components/cards/DownloaderCard.vue
+++ b/src/components/cards/DownloaderCard.vue
@@ -172,7 +172,7 @@ onUnmounted(() => {
        </div>
      </VCardText>
    </VCard>
-    <VDialog v-model="downloaderInfoDialog" scrollable max-width="40rem" persistent>
+    <VDialog v-if="downloaderInfoDialog" v-model="downloaderInfoDialog" scrollable max-width="40rem" persistent>
      <VCard :title="`${props.downloader.name} - 配置`" class="rounded-t">
        <DialogCloseBtn v-model="downloaderInfoDialog" />
        <VDivider />
--- a/src/components/cards/FilterRuleGroupCard.vue
+++ b/src/components/cards/FilterRuleGroupCard.vue
@@ -220,7 +220,7 @@ function onClose() {
        <VImg :src="filter_group_svg" cover class="mt-10" max-width="3rem" />
      </VCardText>
    </VCard>
-    <VDialog v-model="groupInfoDialog" scrollable max-width="80rem" persistent>
+    <VDialog v-if="groupInfoDialog" v-model="groupInfoDialog" scrollable max-width="80rem" persistent>
      <VCard :title="`${props.group.name} - 配置`" class="rounded-t">
        <DialogCloseBtn v-model="groupInfoDialog" />
        <VDivider />
--- a/src/components/cards/LibraryCard.vue
+++ b/src/components/cards/LibraryCard.vue
@@ -91,7 +91,17 @@ async function drawImages(imageList: string[]) {
    const img = new Image()
    img.setAttribute('crossorigin', 'anonymous')
    img.src = imgSrc
-    await new Promise(resolve => (img.onload = resolve))
+    try {
+      await new Promise<void>((resolve, reject) => {
+        img.onload = () => resolve()
+        img.onerror = () => reject(new Error(`Failed to load image: ${imgSrc}`))
+      })
+    } catch (error) {
+      console.error(error)
+      ctx.fillStyle = '#e5e7eb'
+      ctx.fillRect(MARGIN_WIDTH * index + POSTER_WIDTH * (index - 1), MARGIN_HEIGHT, POSTER_WIDTH, POSTER_HEIGHT)
+      return
+    }

    const x = MARGIN_WIDTH * index + POSTER_WIDTH * (index - 1)
    const y = MARGIN_HEIGHT
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -2,10 +2,10 @@
 import type { PropType, Ref } from 'vue'
 import { useToast } from 'vue-toast-notification'
 import SubscribeEditDialog from '../dialog/SubscribeEditDialog.vue'
-import { formatSeason } from '@/@core/utils/formatters'
+import { formatSeason, formatRating } from '@/@core/utils/formatters'
 import api from '@/api'
 import { doneNProgress, startNProgress } from '@/api/nprogress'
-import type { MediaInfo, NotExistMediaInfo, Subscribe, TmdbSeason } from '@/api/types'
+import type { MediaInfo, NotExistMediaInfo, Subscribe, MediaSeason } from '@/api/types'
 import router, { registerAbortController } from '@/router'
 import noImage from '@images/no-image.jpeg'
 import tmdbImage from '@images/logos/tmdb.png'
@@ -55,10 +55,10 @@ const subscribeEditDialog = ref(false)
 const subscribeId = ref<number>()

 // 季详情
-const seasonInfos = ref<TmdbSeason[]>([])
+const seasonInfos = ref<MediaSeason[]>([])

 // 选中的订阅季
-const seasonsSelected = ref<TmdbSeason[]>([])
+const seasonsSelected = ref<MediaSeason[]>([])

 // 来源角标字典
 const sourceIconDict: { [key: string]: any } = {
@@ -77,7 +77,8 @@ const observer = ref<IntersectionObserver | null>(null)
 function getMediaId() {
  if (props.media?.tmdb_id) return `tmdb:${props.media?.tmdb_id}`
  else if (props.media?.douban_id) return `douban:${props.media?.douban_id}`
-  else return `bangumi:${props.media?.bangumi_id}`
+  else if (props.media?.bangumi_id) return `bangumi:${props.media?.bangumi_id}`
+  else return `${props.media?.mediaid_prefix}:${props.media?.media_id}`
 }

 // 订阅弹窗选择的多季
@@ -97,11 +98,10 @@ function getChipColor(type: string) {

 // 添加订阅处理
 async function handleAddSubscribe() {
-  if (props.media?.type === '电视剧' && props.media?.tmdb_id) {
-    // TMDB电视剧
-    // 查询TMDB所有季信息
+  if (props.media?.type === '电视剧') {
+    // 查询所有季信息
    await getMediaSeasons()
-    if (!seasonInfos.value) {
+    if (!seasonInfos.value || seasonInfos.value.length === 0) {
      $toast.error(`${props.media?.title} 查询剧集信息失败！`)
      return
    }
@@ -117,11 +117,6 @@ async function handleAddSubscribe() {
      seasonsSelected.value = []
      subscribeSeasonDialog.value = true
    }
-  } else if (props.media?.type === '电视剧') {
-    // 豆瓣电视剧，只会有一季
-    const season = props.media?.season ?? 1
-    // 添加订阅
-    addSubscribe(season)
  } else {
    // 电影
    addSubscribe()
@@ -146,6 +141,7 @@ async function addSubscribe(season = 0) {
      tmdbid: props.media?.tmdb_id,
      doubanid: props.media?.douban_id,
      bangumiid: props.media?.bangumi_id,
+      mediaid: props.media?.media_id ? `${props.media?.mediaid_prefix}:${props.media?.media_id}` : '',
      season,
      best_version,
    })
@@ -293,11 +289,20 @@ async function checkSeasonsNotExists() {

 // 查询TMDB的所有季信息
 async function getMediaSeasons() {
+  startNProgress()
  try {
-    seasonInfos.value = await api.get(`tmdb/seasons/${props.media?.tmdb_id}`)
+    seasonInfos.value = await api.get('media/seasons', {
+      params: {
+        mediaid: getMediaId(),
+        title: props.media?.title,
+        year: props.media?.year,
+        season: props.media?.season,
+      },
+    })
  } catch (error) {
    console.error(error)
  }
+  doneNProgress()
 }

 // 查询订阅弹窗规则
@@ -361,6 +366,8 @@ function goMediaDetail(isHovering = false) {
        path: '/media',
        query: {
          mediaid: getMediaId(),
+          title: props.media?.title,
+          year: props.media?.year,
          type: props.media?.type,
        },
      })
@@ -376,6 +383,8 @@ function handleSearch() {
      keyword: getMediaId(),
      type: props.media?.type,
      area: 'title',
+      title: props.media?.title,
+      year: props.media?.year,
      season: props.media?.season,
    },
  })
@@ -527,7 +536,7 @@ function onRemoveSubscribe() {
            :class="getChipColor('rating')"
            class="absolute right-2 top-2 bg-opacity-80 shadow-md text-white font-bold"
          >
-            {{ props.media?.vote_average }}
+            {{ formatRating(props.media?.vote_average) }}
          </VChip>
          <!--来源图标-->
          <VAvatar
@@ -535,7 +544,7 @@ function onRemoveSubscribe() {
            density="compact"
            class="absolute bottom-1 right-1"
            tile
-            v-if="!hover.isHovering && isImageLoaded && props.media?.source"
+            v-if="!hover.isHovering && isImageLoaded && props.media?.source && !imageLoadError"
          >
            <VImg cover :src="sourceIconDict[props.media?.source]" class="shadow-lg" />
          </VAvatar>
--- a/src/components/cards/MediaServerCard.vue
+++ b/src/components/cards/MediaServerCard.vue
@@ -185,7 +185,7 @@ onMounted(() => {
        <VImg :src="getIcon" cover class="mt-7 me-3" max-width="3rem" min-width="3rem" />
      </VCardText>
    </VCard>
-    <VDialog v-model="mediaServerInfoDialog" scrollable max-width="40rem" persistent>
+    <VDialog v-if="mediaServerInfoDialog" v-model="mediaServerInfoDialog" scrollable max-width="40rem" persistent>
      <VCard :title="`${props.mediaserver.name} - 配置`" class="rounded-t">
        <DialogCloseBtn v-model="mediaServerInfoDialog" />
        <VDivider />
--- a/src/components/cards/NotificationChannelCard.vue
+++ b/src/components/cards/NotificationChannelCard.vue
@@ -7,7 +7,7 @@ import synologychat_image from '@images/logos/synologychat.png'
 import slack_image from '@images/logos/slack.webp'
 import chrome_image from '@images/logos/chrome.png'
 import { useToast } from 'vue-toast-notification'
-import { cloneDeep } from "lodash"
+import { cloneDeep } from 'lodash'

 // 定义输入
 const props = defineProps({
@@ -132,7 +132,7 @@ function onClose() {
        <VImg :src="getIcon" cover class="mt-7 me-3" max-width="3rem" />
      </VCardText>
    </VCard>
-    <VDialog v-model="notificationInfoDialog" scrollable max-width="40rem" persistent>
+    <VDialog v-if="notificationInfoDialog" v-model="notificationInfoDialog" scrollable max-width="40rem" persistent>
      <VCard :title="`${props.notification.name} - 配置`" class="rounded-t">
        <DialogCloseBtn v-model="notificationInfoDialog" />
        <VDivider />
--- a/src/components/cards/PluginCard.vue
+++ b/src/components/cards/PluginCard.vue
@@ -485,7 +485,13 @@ watch(
    </VHover>

    <!-- 插件配置页面 -->
-    <VDialog v-model="pluginConfigDialog" scrollable max-width="60rem" :fullscreen="!display.mdAndUp.value">
+    <VDialog
+      v-if="pluginConfigDialog"
+      v-model="pluginConfigDialog"
+      scrollable
+      max-width="60rem"
+      :fullscreen="!display.mdAndUp.value"
+    >
      <VCard :title="`${props.plugin?.plugin_name} - 配置`" class="rounded-t">
        <DialogCloseBtn v-model="pluginConfigDialog" />
        <VDivider />
@@ -503,7 +509,13 @@ watch(
    </VDialog>

    <!-- 插件数据页面 -->
-    <VDialog v-model="pluginInfoDialog" scrollable max-width="80rem" :fullscreen="!display.mdAndUp.value">
+    <VDialog
+      v-if="pluginInfoDialog"
+      v-model="pluginInfoDialog"
+      scrollable
+      max-width="80rem"
+      :fullscreen="!display.mdAndUp.value"
+    >
      <VCard :title="`${props.plugin?.plugin_name}`" class="rounded-t">
        <DialogCloseBtn v-model="pluginInfoDialog" />
        <VCardText class="min-h-40">
--- a/src/components/cards/PosterCard.vue
+++ b/src/components/cards/PosterCard.vue
@@ -48,7 +48,6 @@ function goPlay(isHovering: boolean | null = false) {
          'transition transform-cpu duration-300 scale-105 shadow-lg': hover.isHovering,
          'ring-1': isImageLoaded,
        }"
-        @click.stop="goPlay(hover.isHovering)"
      >
        <VImg
          aspect-ratio="2/3"
@@ -79,7 +78,7 @@ function goPlay(isHovering: boolean | null = false) {
          v-show="hover.isHovering || imageLoadError"
          class="w-full h-full flex flex-col flex-wrap justify-end align-left text-white absolute bottom-0 cursor-pointer pa-2 pb-5"
          style="background: linear-gradient(rgba(45, 55, 72, 40%) 0%, rgba(45, 55, 72, 90%) 100%)"
-          @click.stop=""
+          @click.stop="goPlay(hover.isHovering)"
        >
          <span class="font-bold">{{ props.media?.subtitle }}</span>
          <h1 class="mb-1 text-white font-extrabold text-xl line-clamp-2 overflow-hidden text-ellipsis ...">
--- a/src/components/cards/SubscribeCard.vue
+++ b/src/components/cards/SubscribeCard.vue
@@ -142,12 +142,22 @@ async function editSubscribeDialog() {
  subscribeEditDialog.value = true
 }

+// 获得mediaid
+function getMediaId() {
+  if (props.media?.tmdbid) return `tmdb:${props.media?.tmdbid}`
+  else if (props.media?.doubanid) return `douban:${props.media?.doubanid}`
+  else if (props.media?.bangumiid) return `bangumi:${props.media?.bangumiid}`
+  else return props.media?.mediaid
+}
+
 // 查看媒体详情
 async function viewMediaDetail() {
  router.push({
    path: '/media',
    query: {
-      mediaid: `${props.media?.tmdbid ? `tmdb:${props.media?.tmdbid}` : `douban:${props.media?.doubanid}`}`,
+      mediaid: getMediaId(),
+      title: props.media?.name,
+      year: props.media?.year,
      type: props.media?.type,
    },
  })
--- a/src/components/cards/SubscribeShareCard.vue
+++ b/src/components/cards/SubscribeShareCard.vue
@@ -54,12 +54,20 @@ const posterUrl = computed(() => {
  return url
 })

+// 获得mediaid
+function getMediaId() {
+  if (props.media?.tmdbid) return `tmdb:${props.media?.tmdbid}`
+  else if (props.media?.doubanid) return `douban:${props.media?.doubanid}`
+}
+
 // 查看媒体详情
 async function viewMediaDetail() {
  router.push({
    path: '/media',
    query: {
-      mediaid: `${props.media?.tmdbid ? `tmdb:${props.media?.tmdbid}` : `douban:${props.media?.doubanid}`}`,
+      mediaid: getMediaId(),
+      title: props.media?.name,
+      year: props.media?.year,
      type: props.media?.type,
    },
  })
@@ -73,18 +81,16 @@ function showForkSubscribe() {
 // 完成复用订阅
 function finishForkSubscribe(subid: number) {
  subscribeId.value = subid
-  forkSubscribeDialog.value=false
+  forkSubscribeDialog.value = false
  subscribeEditDialog.value = true
 }

 // 删除订阅分享时处理
 function doDelete() {
-  forkSubscribeDialog.value=false
+  forkSubscribeDialog.value = false
  // 通知父组件刷新
  emit('delete')
 }
-
-
 </script>

 <template>
--- a/src/components/dialog/ForkSubscribeDialog.vue
+++ b/src/components/dialog/ForkSubscribeDialog.vue
@@ -26,6 +26,58 @@ const processing = ref(false)
 // 删除中
 const deleting = ref(false)

+// 是否折叠
+const isExpanded = ref(false)
+
+// follow用户列表
+const followUsers = ref<string[]>([])
+
+// 当前用户是否已follow
+const isFollowed = computed(() => followUsers.value.includes(props.media?.share_uid || ''))
+
+// 折叠展开
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+// 加载follow用户列表
+async function queryFollowUsers() {
+  try {
+    const result: { [key: string]: any } = await api.get('system/setting/FollowSubscribers')
+    followUsers.value = result.data?.value ?? []
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+// follow用户
+async function followUser() {
+  try {
+    const result: { [key: string]: any } = await api.post(`subscribe/follow?share_uid=${props.media?.share_uid}`)
+    if (result.success) {
+      queryFollowUsers()
+    }
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+// unfollow用户
+async function unfollowUser() {
+  try {
+    const result: { [key: string]: any } = await api.delete('subscribe/follow', {
+      params: {
+        share_uid: props.media?.share_uid,
+      },
+    })
+    if (result.success) {
+      queryFollowUsers()
+    }
+  } catch (error) {
+    console.log(error)
+  }
+}
+
 // 计算海报图片地址
 const posterUrl = computed(() => {
  const url = props.media?.poster
@@ -35,12 +87,20 @@ const posterUrl = computed(() => {
  return url
 })

+// 获得mediaid
+function getMediaId() {
+  if (props.media?.tmdbid) return `tmdb:${props.media?.tmdbid}`
+  else if (props.media?.doubanid) return `douban:${props.media?.doubanid}`
+}
+
 // 查看媒体详情
 async function viewMediaDetail() {
  router.push({
    path: '/media',
    query: {
-      mediaid: `${props.media?.tmdbid ? `tmdb:${props.media?.tmdbid}` : `douban:${props.media?.doubanid}`}`,
+      mediaid: getMediaId(),
+      title: props.media?.name,
+      year: props.media?.year,
      type: props.media?.type,
    },
  })
@@ -97,9 +157,13 @@ async function doDelete() {
    doneNProgress()
  }
 }
+
+onMounted(() => {
+  queryFollowUsers()
+})
 </script>
 <template>
-  <VDialog max-width="40rem">
+  <VDialog max-width="40rem" scrollable>
    <VCard>
      <DialogCloseBtn @click="emit('close')" />
      <VCardText>
@@ -123,11 +187,13 @@ async function doDelete() {
            </div>
            <div class="flex-grow">
              <VCardItem>
-                <VCardTitle class="text-center text-md-left">
+                <VCardTitle
+                  class="text-center text-md-left break-words whitespace-break-spaces line-clamp-2 overflow-hidden text-ellipsis"
+                >
                  {{ props.media?.share_title }}
                </VCardTitle>
                <VCardSubtitle
-                  class="text-center text-md-left break-words whitespace-break-spaces line-clamp-2 overflow-hidden text-ellipsis ..."
+                  class="text-center text-md-left break-words whitespace-break-spaces line-clamp-4 overflow-hidden text-ellipsis"
                >
                  {{ props.media?.share_comment }}
                </VCardSubtitle>
@@ -144,9 +210,12 @@ async function doDelete() {
                      <span class="text-body-1"> {{ media?.keyword }}</span>
                    </VListItemTitle>
                  </VListItem>
-                  <VListItem class="ps-0" v-if="media?.custom_words">
+                  <VListItem class="ps-0" v-if="media?.custom_words" @click.stop="toggleExpand">
                    <VListItemTitle
-                      class="text-center text-md-left break-words whitespace-break-spaces line-clamp-10 overflow-hidden text-ellipsis ..."
+                      class="text-center text-md-left break-words whitespace-break-spaces"
+                      :class="{
+                        'line-clamp-4 overflow-hidden text-ellipsis': !isExpanded,
+                      }"
                    >
                      <span class="font-weight-medium">识别词：</span>
                      <span class="text-body-1"> {{ media?.custom_words }}</span>
@@ -162,7 +231,7 @@ async function doDelete() {
                      prepend-icon="mdi-heart"
                      :loading="processing"
                    >
-                      添加到我的订阅
+                      订阅
                    </VBtn>
                    <VBtn
                      v-if="props.media?.share_uid && props.media?.share_uid === globalSettings.USER_UNIQUE_ID"
@@ -175,6 +244,24 @@ async function doDelete() {
                    >
                      取消分享
                    </VBtn>
+                    <VBtn
+                      v-else-if="isFollowed && props.media?.share_uid"
+                      color="warning"
+                      @click="unfollowUser"
+                      prepend-icon="mdi-account-remove"
+                      class="ms-2"
+                    >
+                      取消关注
+                    </VBtn>
+                    <VBtn
+                      v-else-if="props.media?.share_uid"
+                      @click="followUser"
+                      color="info"
+                      prepend-icon="mdi-account-plus"
+                      class="ms-2"
+                    >
+                      关注
+                    </VBtn>
                  </div>
                  <div class="text-xs mt-2" v-if="props.media?.count">
                    <VIcon icon="mdi-fire" />共 {{ props.media?.count?.toLocaleString() }} 次复用
--- a/src/components/dialog/SiteResourceDialog.vue
+++ b/src/components/dialog/SiteResourceDialog.vue
@@ -99,7 +99,7 @@ onMounted(() => {
 })
 </script>
 <template>
-  <VDialog max-width="80rem" scrollable z-index="1010" :fullscreen="!display.mdAndUp.value">
+  <VDialog max-width="80rem" scrollable :fullscreen="!display.mdAndUp.value">
    <VCard :title="`浏览 - ${props.site?.name}`">
      <DialogCloseBtn @click="emit('close')" />
      <VDivider />
--- a/src/components/dialog/UserAddEditDialog.vue
+++ b/src/components/dialog/UserAddEditDialog.vue
@@ -362,7 +362,7 @@ onMounted(() => {
            </VCol>
          </VRow>
          <VDivider class="my-10">
-            <span>消息账号绑定</span>
+            <span>账号绑定</span>
          </VDivider>
          <VRow>
            <VCol cols="12" md="6">
@@ -395,6 +395,9 @@ onMounted(() => {
                label="SynologyChat用户"
              />
            </VCol>
+            <VCol cols="12" md="6">
+              <VTextField v-model="userForm.settings.douban_userid" density="comfortable" clearable label="豆瓣用户" />
+            </VCol>
          </VRow>
        </VForm>
      </VCardText>
--- a/src/components/filebrowser/FileToolbar.vue
+++ b/src/components/filebrowser/FileToolbar.vue
@@ -169,7 +169,7 @@ const sortIcon = computed(() => {
        </IconBtn>
      </template>
    </VTooltip>
-    <VDialog v-model="newFolderPopper" max-width="50rem">
+    <VDialog v-if="newFolderPopper" v-model="newFolderPopper" max-width="50rem">
      <template #activator="{ props }">
        <IconBtn v-bind="props">
          <VTooltip text="新建文件夹">
--- a/src/components/misc/FilterOption.vue
+++ b/src/components/misc/FilterOption.vue
@@ -0,0 +1,7 @@
+<script lang="ts" setup>
+defineProps<{ title: string }>()
+</script>
+<template>
+  <VListSubheader>{{ title }}</VListSubheader>
+  <VListItem><slot /></VListItem>
+</template>
--- a/src/components/render/DashboardRender.vue
+++ b/src/components/render/DashboardRender.vue
@@ -6,10 +6,21 @@ import { type PropType } from 'vue'
 const elementProps = defineProps({
  config: Object as PropType<RenderProps>,
 })
+// key
+const componentKey = ref(0)
+
+onActivated(() => {
+  componentKey.value++
+})
 </script>

 <template>
-  <Component :is="elementProps.config?.component" v-if="!elementProps.config?.html" v-bind="elementProps.config?.props">
+  <Component
+    :key="componentKey"
+    :is="elementProps.config?.component"
+    v-if="!elementProps.config?.html"
+    v-bind="elementProps.config?.props"
+  >
    {{ elementProps.config?.text }}
    <template v-for="(content, name) in elementProps.config?.slots || []" :key="name" v-slot:[name]="{ _props }">
      <slot :name="name" v-bind="_props">
@@ -23,6 +34,7 @@ const elementProps = defineProps({
    />
  </Component>
  <Component
+    :key="componentKey"
    :is="elementProps.config?.component"
    v-if="elementProps.config?.html"
    v-bind="elementProps.config?.props"
--- a/src/components/render/FormRender.vue
+++ b/src/components/render/FormRender.vue
@@ -16,6 +16,9 @@ defineProps<{
 const parseProps = (rawProps: Record<string, any>, model: Record<string, any>) => {
  const parsedProps: Record<string, any> = {}

+  const isExpression = (value: string) => value.startsWith('{{') && value.endsWith('}}')
+  const extractExpression = (value: string) => value.slice(2, -2).trim()
+
  for (const [key, value] of Object.entries(rawProps)) {
    if (key === 'modelvalue') {
      // 将 modelvalue 转换为 v-model:value 的形式
@@ -23,22 +26,44 @@ const parseProps = (rawProps: Record<string, any>, model: Record<string, any>) =
      parsedProps['onUpdate:value'] = (newValue: any) => {
        model[value] = newValue
      }
-    } else if (key === 'model') {
+    } else if (['model', 'v-model'].includes(key)) {
      // 处理 v-model
      parsedProps['modelValue'] = model[value]
      parsedProps['onUpdate:modelValue'] = (newValue: any) => {
        model[value] = newValue
      }
-    } else if (key.startsWith('model:')) {
+    } else if (['show', 'v-show'].includes(key)) {
+      // 处理 v-show，实现显示隐藏
+      const expression = isExpression(value) ? extractExpression(value) : value
+      const isVisible = new Function('model', `with(model) { return ${expression} }`)(model)
+      // 动态设置 style.display
+      if (!parsedProps.style) {
+        parsedProps.style = {}
+      }
+      parsedProps.style.display = isVisible ? '' : 'none'
+    } else if (key.startsWith('model:') || key.startsWith('v-model:')) {
      // 处理 v-model:<prop>
-      const propName = key.replace('model:', '')
+      const propName = key.split(':')[1]
      parsedProps[propName] = model[value]
      parsedProps[`onUpdate:${propName}`] = (newValue: any) => {
        model[value] = newValue
      }
+    } else if (key.startsWith('on')) {
+      // 处理事件监听，值是函数的代码
+      const eventName = key.replace('on', '').toLowerCase()
+      parsedProps[eventName] = new Function('model', `with(model) { return ${value} }`)(model)
    } else {
-      // 普通属性直接赋值
-      parsedProps[key] = typeof value === 'string' && value in model ? model[value] : value
+      // 如果是表达式，需要绑定
+      if (typeof value === 'string' && isExpression(value)) {
+        const expression = extractExpression(value)
+        parsedProps[key] = new Function('model', `with(model) { return ${expression} }`)(model)
+      } else if (typeof value === 'string' && value in model) {
+        // 如果是数据模型的属性，直接绑定
+        parsedProps[key] = model[value]
+      } else {
+        // 其他情况直接赋值
+        parsedProps[key] = value
+      }
    }
  }

--- a/src/layouts/components/DefaultLayout.vue
+++ b/src/layouts/components/DefaultLayout.vue
@@ -64,7 +64,7 @@ onMounted(() => {
          <VIcon icon="mdi-menu" />
        </IconBtn>
        <!-- 👉 Back Button -->
-        <IconBtn v-if="appMode && display.mdAndDown.value" class="ms-n2" @click="goBack">
+        <IconBtn v-if="appMode" class="ms-n2" @click="goBack">
          <VIcon icon="mdi-arrow-left" size="32" />
        </IconBtn>
        <!-- 👉 Search Bar -->
--- a/src/layouts/components/Footer.vue
+++ b/src/layouts/components/Footer.vue
@@ -10,7 +10,7 @@ const route = useRoute()
 const activeState = computed(() => {
  return {
    home: route.path === '/dashboard',
-    ranking: route.path === '/ranking',
+    recommend: route.path === '/recommend',
    movie: route.path === '/subscribe/movie',
    tv: route.path === '/subscribe/tv',
    apps: route.path === '/apps',
@@ -31,8 +31,8 @@ const activeState = computed(() => {
        <VIcon v-if="activeState.home" size="28">mdi-home</VIcon>
        <VIcon v-else size="28">mdi-home-outline</VIcon>
      </VBtn>
-      <VBtn to="/ranking" :ripple="false">
-        <VIcon v-if="activeState.ranking" size="28">mdi-star</VIcon>
+      <VBtn to="/recommend" :ripple="false">
+        <VIcon v-if="activeState.recommend" size="28">mdi-star</VIcon>
        <VIcon v-else size="28">mdi-star-outline</VIcon>
      </VBtn>
      <VBtn to="/subscribe/movie" :ripple="false">
@@ -64,4 +64,3 @@ const activeState = computed(() => {
  background-color: transparent !important;
 }
 </style>
-}
--- a/src/layouts/components/UserProfile.vue
+++ b/src/layouts/components/UserProfile.vue
@@ -156,7 +156,7 @@ const userLevel = computed(() => store.state.auth.level)
  <!-- 用户认证对话框 -->
  <UserAuthDialog v-if="siteAuthDialog" v-model="siteAuthDialog" @done="siteAuthDone" @close="siteAuthDialog = false" />
  <!-- 重启确认对话框 -->
-  <VDialog v-model="restartDialog" max-width="25rem">
+  <VDialog v-if="restartDialog" v-model="restartDialog" max-width="25rem">
    <VCard>
      <VCardItem>
        <div class="flex items-center justify-center mt-3">
--- a/src/main.ts
+++ b/src/main.ts
@@ -17,7 +17,6 @@ import { PerfectScrollbarPlugin } from 'vue3-perfect-scrollbar'
 import { CronVuetify } from '@vue-js-cron/vuetify'

 // 4. 工具函数和其他辅助模块
-import { removeEl } from './@core/utils/dom'
 import { fetchGlobalSettings } from './api'
 import { isPWA } from './@core/utils/navigator'

@@ -114,5 +113,4 @@ initializeApp().then(() => {
      },
    })
    .mount('#app')
-    .$nextTick(() => removeEl('#loading-bg'))
 })
--- a/src/pages/browse.vue
+++ b/src/pages/browse.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import api from '@/api'
 import MediaCardListView from '@/views/discover/MediaCardListView.vue'
 import PersonCardListView from '@/views/discover/PersonCardListView.vue'

--- a/src/pages/dashboard.vue
+++ b/src/pages/dashboard.vue
@@ -340,7 +340,7 @@ onDeactivated(() => {
  />

  <!-- 弹窗，根据配置生成选项 -->
-  <VDialog v-model="dialog" max-width="35rem" scrollable>
+  <VDialog v-if="dialog" v-model="dialog" max-width="35rem" scrollable>
    <VCard>
      <VCardItem>
        <VCardTitle>设置仪表板</VCardTitle>
--- a/src/pages/discover.vue
+++ b/src/pages/discover.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import { DiscoverTabs } from '@/router/menu'
+import router from '@/router'
+import TheMovieDbView from '@/views/discover/TheMovieDbView.vue'
+import DoubanView from '@/views/discover/DoubanView.vue'
+import BangumiView from '@/views/discover/BangumiView.vue'
+import ExtraSourceView from '@/views/discover/ExtraSourceView.vue'
+import { DiscoverSource } from '@/api/types'
+import api from '@/api'
+
+const route = useRoute()
+const activeTab = ref(route.query.tab)
+
+function jumpTab(tab: string) {
+  router.push('/subscribe/discover?tab=' + tab)
+}
+
+// 额外的数据源
+const extraDiscoverSources = ref<DiscoverSource[]>([])
+
+// 加载额外的发现数据源
+async function loadExtraDiscoverSources() {
+  try {
+    extraDiscoverSources.value = await api.get('discover/source')
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+onMounted(async () => {
+  await loadExtraDiscoverSources()
+})
+</script>
+
+<template>
+  <div>
+    <VTabs v-model="activeTab" show-arrows>
+      <VTab v-for="item in DiscoverTabs" :value="item.tab" @to="jumpTab(item.tab)">
+        <div class="min-w-24">
+          {{ item.title }}
+        </div>
+      </VTab>
+      <VTab
+        v-for="item in extraDiscoverSources"
+        :key="item.mediaid_prefix"
+        :value="item.mediaid_prefix"
+        @to="jumpTab(item.mediaid_prefix)"
+      >
+        <div class="min-w-24">
+          {{ item.name }}
+        </div>
+      </VTab>
+    </VTabs>
+
+    <VWindow v-model="activeTab" class="mt-5 disable-tab-transition" :touch="false">
+      <VWindowItem value="themoviedb">
+        <transition name="fade-slide" appear>
+          <div>
+            <TheMovieDbView />
+          </div>
+        </transition>
+      </VWindowItem>
+      <VWindowItem value="douban">
+        <transition name="fade-slide" appear>
+          <div>
+            <DoubanView />
+          </div>
+        </transition>
+      </VWindowItem>
+      <VWindowItem value="bangumi">
+        <transition name="fade-slide" appear>
+          <div>
+            <BangumiView />
+          </div>
+        </transition>
+      </VWindowItem>
+      <VWindowItem v-for="item in extraDiscoverSources" :key="item.mediaid_prefix" :value="item.mediaid_prefix">
+        <transition name="fade-slide" appear>
+          <div>
+            <ExtraSourceView :source="item" />
+          </div>
+        </transition>
+      </VWindowItem>
+    </VWindow>
+  </div>
+</template>
--- a/src/pages/downloading.vue
+++ b/src/pages/downloading.vue
@@ -35,7 +35,7 @@ onMounted(async () => {
  <div v-if="downloaders.length > 0">
    <VTabs v-model="activeTab">
      <VTab v-for="item in downloaders" :value="item.name" @to="jumpTab(item.name)">
-        <span class="mx-5">{{ item.name }}</span>
+        <span class="min-w-24">{{ item.name }}</span>
      </VTab>
    </VTabs>

--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -9,6 +9,7 @@ import logo from '@images/logo.png'
 import { useTheme } from 'vuetify'
 import { checkPrefersColorSchemeIsDark } from '@/@core/utils'
 import { urlBase64ToUint8Array } from '@/@core/utils/navigator'
+import { saveLocalTheme } from '@/@core/utils/theme'

 const { global: globalTheme } = useTheme()

@@ -85,8 +86,7 @@ async function setTheme() {
  const autoTheme = checkPrefersColorSchemeIsDark() ? 'dark' : 'light'
  globalTheme.name.value = themeValue === 'auto' ? autoTheme : themeValue
  // 存储主题到本地
-  localStorage.setItem('theme', themeValue)
-  localStorage.setItem('materio-initial-loader-bg', globalTheme.current.value.colors.background)
+  saveLocalTheme(themeValue, globalTheme)
 }

 // 订阅推送通知
--- a/src/pages/media.vue
+++ b/src/pages/media.vue
@@ -9,13 +9,16 @@ const mediaid = route.query?.mediaid?.toString()

 // 类型
 const type = route.query?.type?.toString()
+
+// 标题
+const title = route.query?.title?.toString()
+
+// 年份
+const year = route.query?.year?.toString()
 </script>

 <template>
  <div>
-    <MediaDetailView
-      :mediaid="mediaid"
-      :type="type"
-    />
+    <MediaDetailView :mediaid="mediaid" :type="type" :title="title" :year="year" />
  </div>
 </template>
--- a/src/pages/ranking.vue
+++ b/src/pages/ranking.vue
@@ -1,78 +0,0 @@
-<script setup lang="ts">
-import MediaCardSlideView from '@/views/discover/MediaCardSlideView.vue'
-
-const viewList = reactive<{ apipath: string; linkurl: string; title: string }[]>([
-  {
-    apipath: 'tmdb/trending',
-    linkurl: '/browse/tmdb/trending?title=流行趋势',
-    title: '流行趋势',
-  },
-  {
-    apipath: 'douban/showing',
-    linkurl: '/browse/douban/showing?title=正在热映',
-    title: '正在热映',
-  },
-  {
-    apipath: 'bangumi/calendar',
-    linkurl: '/browse/bangumi/calendar?title=Bangumi每日放送',
-    title: 'Bangumi每日放送',
-  },
-  {
-    apipath: 'tmdb/movies',
-    linkurl: '/browse/tmdb/movies?title=TMDB热门电影',
-    title: 'TMDB热门电影',
-  },
-  {
-    apipath: 'tmdb/tvs?with_original_language=zh|en|ja|ko',
-    linkurl: '/browse/tmdb/tvs??with_original_language=zh|en|ja|ko&title=TMDB热门电视剧',
-    title: 'TMDB热门电视剧',
-  },
-  {
-    apipath: 'douban/movie_hot',
-    linkurl: '/browse/douban/movie_hot?title=豆瓣热门电影',
-    title: '豆瓣热门电影',
-  },
-  {
-    apipath: 'douban/tv_hot',
-    linkurl: '/browse/douban/tv_hot?title=豆瓣热门电视剧',
-    title: '豆瓣热门电视剧',
-  },
-  {
-    apipath: 'douban/tv_animation',
-    linkurl: '/browse/douban/tv_animation?title=豆瓣热门动漫',
-    title: '豆瓣热门动漫',
-  },
-  {
-    apipath: 'douban/movies',
-    linkurl: '/browse/douban/movies?title=豆瓣最新电影',
-    title: '豆瓣最新电影',
-  },
-  {
-    apipath: 'douban/tvs',
-    linkurl: '/browse/douban/tvs?title=豆瓣最新电视剧',
-    title: '豆瓣最新电视剧',
-  },
-  {
-    apipath: 'douban/movie_top250',
-    linkurl: '/browse/douban/movie_top250?title=电影TOP250',
-    title: '豆瓣电影TOP250',
-  },
-  {
-    apipath: 'douban/tv_weekly_chinese',
-    linkurl: '/browse/douban/tv_weekly_chinese?title=豆瓣国产剧集榜',
-    title: '豆瓣国产剧集榜',
-  },
-  {
-    apipath: 'douban/tv_weekly_global',
-    linkurl: '/browse/douban/tv_weekly_global?title=豆瓣全球剧集榜',
-    title: '豆瓣全球剧集榜',
-  },
-])
-
-</script>
-
-<template>
-  <div>
-    <MediaCardSlideView v-for="(item, index) in viewList" :key="index" v-bind="item" />
-  </div>
-</template>
--- a/src/pages/recommend.vue
+++ b/src/pages/recommend.vue
@@ -0,0 +1,192 @@
+<script setup lang="ts">
+import api from '@/api'
+import { RecommendSource } from '@/api/types'
+import MediaCardSlideView from '@/views/discover/MediaCardSlideView.vue'
+import { useDisplay } from 'vuetify'
+
+// APP
+const display = useDisplay()
+const appMode = inject('pwaMode') && display.mdAndDown.value
+
+const viewList = reactive<{ apipath: string; linkurl: string; title: string }[]>([
+  {
+    apipath: 'recommend/tmdb_trending',
+    linkurl: '/browse/recommend/tmdb_trending?title=流行趋势',
+    title: '流行趋势',
+  },
+  {
+    apipath: 'recommend/douban_showing',
+    linkurl: '/browse/recommend/douban_showing?title=正在热映',
+    title: '正在热映',
+  },
+  {
+    apipath: 'bangumi/calendar',
+    linkurl: '/browse/bangumi/calendar?title=Bangumi每日放送',
+    title: 'Bangumi每日放送',
+  },
+  {
+    apipath: 'recommend/tmdb_movies',
+    linkurl: '/browse/recommend/tmdb_movies?title=TMDB热门电影',
+    title: 'TMDB热门电影',
+  },
+  {
+    apipath: 'recommend/tmdb_tvs?with_original_language=zh|en|ja|ko',
+    linkurl: '/browse/recommend/tmdb_tvs??with_original_language=zh|en|ja|ko&title=TMDB热门电视剧',
+    title: 'TMDB热门电视剧',
+  },
+  {
+    apipath: 'recommend/douban_movie_hot',
+    linkurl: '/browse/recommend/douban_movie_hot?title=豆瓣热门电影',
+    title: '豆瓣热门电影',
+  },
+  {
+    apipath: 'recommend/douban_tv_hot',
+    linkurl: '/browse/recommend/douban_tv_hot?title=豆瓣热门电视剧',
+    title: '豆瓣热门电视剧',
+  },
+  {
+    apipath: 'recommend/douban_tv_animation',
+    linkurl: '/browse/recommend/douban_tv_animation?title=豆瓣热门动漫',
+    title: '豆瓣热门动漫',
+  },
+  {
+    apipath: 'recommend/douban_movies',
+    linkurl: '/browse/recommend/douban_movies?title=豆瓣最新电影',
+    title: '豆瓣最新电影',
+  },
+  {
+    apipath: 'recommend/douban_tvs',
+    linkurl: '/browse/recommend/douban_tvs?title=豆瓣最新电视剧',
+    title: '豆瓣最新电视剧',
+  },
+  {
+    apipath: 'recommend/douban_movie_top250',
+    linkurl: '/browse/recommend/douban_movie_top250?title=电影TOP250',
+    title: '豆瓣电影TOP250',
+  },
+  {
+    apipath: 'recommend/douban_tv_weekly_chinese',
+    linkurl: '/browse/recommend/douban_tv_weekly_chinese?title=豆瓣国产剧集榜',
+    title: '豆瓣国产剧集榜',
+  },
+  {
+    apipath: 'recommend/douban_tv_weekly_global',
+    linkurl: '/browse/recommend/douban_tv_weekly_global?title=豆瓣全球剧集榜',
+    title: '豆瓣全球剧集榜',
+  },
+])
+
+// 计算启用的视图
+const enabledViews = computed(() => viewList.filter(item => enableConfig.value[item.title]))
+
+// 榜单启用配置， 以title为key
+const enableConfig = ref<{ [key: string]: boolean }>({
+  ...Object.fromEntries(viewList.map(item => [item.title, true])),
+})
+
+// 弹窗
+const dialog = ref(false)
+
+// 额外的数据源
+const extraRecommendSources = ref<RecommendSource[]>([])
+
+// 加载额外的发现数据源
+async function loadExtraRecommendSources() {
+  try {
+    extraRecommendSources.value = await api.get('recommend/source')
+    if (extraRecommendSources.value.length > 0) {
+      viewList.push(
+        ...extraRecommendSources.value.map(source => ({
+          apipath: source.api_path,
+          linkurl: `/browse/recommend/${source.api_path}?title=${source.name}`,
+          title: source.name,
+        })),
+      )
+    }
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+// 加载面板配置
+async function loadConfig() {
+  // 显示配置
+  const local_enable = localStorage.getItem('MP_RECOMMEND')
+  if (local_enable) {
+    enableConfig.value = JSON.parse(local_enable)
+  } else {
+    const response = await api.get('/user/config/Recommend')
+    if (response && response.data && response.data.value) {
+      enableConfig.value = response.data.value
+      localStorage.setItem('MP_RECOMMEND', JSON.stringify(response.data.value))
+    }
+  }
+}
+
+// 设置项目
+async function saveConfig() {
+  // 启用配置
+  const enableString = JSON.stringify(enableConfig.value)
+  localStorage.setItem('MP_RECOMMEND', enableString)
+
+  // 保存到服务端
+  try {
+    await api.post('/user/config/Recommend', enableConfig.value)
+  } catch (error) {
+    console.error(error)
+  }
+  dialog.value = false
+}
+
+onBeforeMount(async () => {
+  await loadConfig()
+})
+
+onMounted(async () => {
+  await loadExtraRecommendSources()
+})
+</script>
+
+<template>
+  <div>
+    <MediaCardSlideView v-for="item in enabledViews" :key="item.title" v-bind="item" />
+    <!-- 弹窗，根据配置生成选项 -->
+    <VDialog v-if="dialog" v-model="dialog" max-width="35rem" scrollable>
+      <VCard>
+        <VCardItem>
+          <VCardTitle>设置推荐榜单</VCardTitle>
+        </VCardItem>
+        <VDivider />
+        <VCardText>
+          <VRow>
+            <VCol v-for="item in viewList" :key="item.title" cols="6" md="4" sm="4">
+              <VCheckbox v-model="enableConfig[item.title]" :label="item.title" />
+            </VCol>
+          </VRow>
+        </VCardText>
+        <VDivider />
+        <VCardText class="pt-5 text-end">
+          <VSpacer />
+          <VBtn variant="outlined" color="secondary" class="me-4" @click="dialog = false"> 关闭 </VBtn>
+          <VBtn @click="saveConfig">
+            <template #prepend>
+              <VIcon icon="mdi-content-save" />
+            </template>
+            保存
+          </VBtn>
+        </VCardText>
+      </VCard>
+    </VDialog>
+  </div>
+  <!-- 底部操作按钮 -->
+  <VFab
+    icon="mdi-text-box-edit"
+    location="bottom"
+    size="x-large"
+    fixed
+    app
+    appear
+    @click="dialog = true"
+    :class="{ 'mb-12': appMode }"
+  />
+</template>
--- a/src/pages/resource.vue
+++ b/src/pages/resource.vue
@@ -2,8 +2,8 @@
 import NoDataFound from '@/components/NoDataFound.vue'
 import api from '@/api'
 import type { Context } from '@/api/types'
-import TorrentCardListView from '@/views/discover/TorrentCardListView.vue'
-import TorrentRowListView from '@/views/discover/TorrentRowListView.vue'
+import TorrentCardListView from '@/views/torrent/TorrentCardListView.vue'
+import TorrentRowListView from '@/views/torrent/TorrentRowListView.vue'
 import { useDisplay } from 'vuetify'

 // APP
@@ -22,6 +22,12 @@ const type = route.query?.type?.toString() ?? ''
 // 搜索字段
 const area = route.query?.area?.toString() ?? ''

+// 搜索标题
+const title = route.query?.title?.toString() ?? ''
+
+// 搜索年份
+const year = route.query?.year
+
 // 搜索季
 const season = route.query?.season?.toString() ?? ''

@@ -82,12 +88,14 @@ async function fetchData() {
    } else {
      startLoadingProgress()
      let result: { [key: string]: any }
-      // 优先按TMDBID精确查询
-      if (keyword?.startsWith('tmdb:') || keyword?.startsWith('douban:') || keyword?.startsWith('bangumi:')) {
+      // 如果keyword的格式是 xxxx:xxxxx 且:前面的xxxx为字符，则按照媒体ID格式搜索
+      if (/^[a-zA-Z]+:/.test(keyword)) {
        result = await api.get(`search/media/${keyword}`, {
          params: {
            mtype: type,
            area,
+            title,
+            year,
            season,
          },
        })
@@ -139,27 +147,28 @@ onUnmounted(() => {
    <TorrentCardListView v-else :items="dataList" />
  </div>
  <!-- 视图切换 -->
-  <VFab
-    v-if="viewType === 'list'"
-    class="mb-12"
-    icon="mdi-view-grid"
-    location="bottom"
-    size="x-large"
-    absolute
-    app
-    appear
-    @click="setViewType('card')"
-    :class="{ 'mb-12': appMode }"
-  />
-  <VFab
-    v-else
-    icon="mdi-view-list"
-    location="bottom"
-    size="x-large"
-    fixed
-    app
-    appear
-    @click="setViewType('list')"
-    :class="{ 'mb-12': appMode }"
-  />
+  <div v-if="isRefreshed">
+    <VFab
+      v-if="viewType === 'list'"
+      icon="mdi-view-grid"
+      location="bottom"
+      size="x-large"
+      absolute
+      app
+      appear
+      @click="setViewType('card')"
+      :class="{ 'mb-12': appMode }"
+    />
+    <VFab
+      v-else
+      icon="mdi-view-list"
+      location="bottom"
+      size="x-large"
+      fixed
+      app
+      appear
+      @click="setViewType('list')"
+      :class="{ 'mb-12': appMode }"
+    />
+  </div>
 </template>
--- a/src/pages/subscribe.vue
+++ b/src/pages/subscribe.vue
@@ -18,12 +18,18 @@ function jumpTab(tab: string) {

 <template>
  <div>
-    <VTabs v-model="activeTab">
+    <VTabs v-model="activeTab" show-arrows>
      <VTab v-if="subType == '电影'" v-for="item in SubscribeMovieTabs" :value="item.tab" @to="jumpTab(item.tab)">
-        <span class="mx-5">{{ item.title }}</span>
+        <div class="flex align-center min-w-24">
+          <VIcon size="20" start :icon="item.icon" />
+          {{ item.title }}
+        </div>
      </VTab>
      <VTab v-if="subType == '电视剧'" v-for="item in SubscribeTvTabs" :value="item.tab" @to="jumpTab(item.tab)">
-        <span class="mx-5">{{ item.title }}</span>
+        <div class="flex align-center min-w-24">
+          <VIcon size="20" start :icon="item.icon" />
+          {{ item.title }}
+        </div>
      </VTab>
    </VTabs>

--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -28,8 +28,16 @@ const router = createRouter({
          },
        },
        {
-          path: '/ranking',
-          component: () => import('../pages/ranking.vue'),
+          path: '/recommend',
+          component: () => import('../pages/recommend.vue'),
+          meta: {
+            keepAlive: true,
+            requiresAuth: true,
+          },
+        },
+        {
+          path: '/discover',
+          component: () => import('../pages/discover.vue'),
          meta: {
            keepAlive: true,
            requiresAuth: true,
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -8,20 +8,28 @@ export const SystemNavMenus = [
    admin: false,
    footer: true,
  },
+  {
+    title: '搜索结果',
+    icon: 'mdi-magnify',
+    to: '/resource',
+    header: '开始',
+    admin: false,
+  },
  {
    title: '推荐',
    icon: 'mdi-star-outline',
-    to: '/ranking',
+    to: '/recommend',
    header: '发现',
    admin: false,
    footer: true,
  },
  {
-    title: '资源搜索',
-    icon: 'mdi-magnify',
-    to: '/resource',
+    title: '探索',
+    icon: 'mdi-apple-safari',
+    to: '/discover',
    header: '发现',
    admin: false,
+    footer: false,
  },
  {
    title: '电影',
@@ -169,12 +177,12 @@ export const SubscribeMovieTabs = [
  {
    title: '我的订阅',
    tab: 'mysub',
-    icon: 'mdi-movie-open-outline',
+    icon: 'mdi-heart',
  },
  {
    title: '热门订阅',
    tab: 'popular',
-    icon: 'mdi-movie-open-outline',
+    icon: 'mdi-fire',
  },
 ]

@@ -183,17 +191,17 @@ export const SubscribeTvTabs = [
  {
    title: '我的订阅',
    tab: 'mysub',
-    icon: 'mdi-television',
+    icon: 'mdi-heart',
  },
  {
    title: '热门订阅',
    tab: 'popular',
-    icon: 'mdi-television',
+    icon: 'mdi-fire',
  },
  {
    title: '订阅分享',
    tab: 'share',
-    icon: 'mdi-television',
+    icon: 'mdi-share-variant',
  },
 ]

@@ -210,3 +218,22 @@ export const PluginTabs = [
    icon: 'mdi-store',
  },
 ]
+
+// 发现标签页
+export const DiscoverTabs = [
+  {
+    title: 'TheMovieDb',
+    tab: 'themoviedb',
+    icon: 'themoviedb',
+  },
+  {
+    title: '豆瓣',
+    tab: 'douban',
+    icon: 'douban',
+  },
+  {
+    title: 'Bangumi',
+    tab: 'bangumi',
+    icon: 'bangumi',
+  },
+]
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -14,8 +14,9 @@ html.v-overlay-scroll-blocked {
 }

 #nprogress .peg {
+  width: 5px;
  box-shadow: 0 0 10px rgb(var(--v-theme-primary)), 0 0 5px rgb(var(--v-theme-primary)) !important;
-      transform: rotate(0deg) translate(0, -1px);
+      transform: rotate(0deg) translate(0, 0px);
 }

 .v-toast--bottom {
--- a/src/views/discover/BangumiView.vue
+++ b/src/views/discover/BangumiView.vue
@@ -0,0 +1,107 @@
+<script setup lang="ts">
+import MediaCardListView from '@/views/discover/MediaCardListView.vue'
+
+// 过滤参数
+const filterParams = reactive({
+  'type': 2,
+  'cat': null,
+  'sort': 'rank', // date/rank
+  'year': null,
+})
+
+// Bangumi cat字典
+/**
+ * 0 为 其他
+1 为 TV
+2 为 OVA
+3 为 Movie
+5 为 WEB
+ */
+const bangumiCatDict = {
+  '0': '其他',
+  '1': 'TV',
+  '2': 'OVA',
+  '3': 'Movie',
+  '5': 'WEB',
+}
+
+// Bangumi排序字典
+const bangumiSortDict = {
+  'rank': '排名',
+  'date': '日期',
+}
+
+// 年份字典，自动生成最近10年
+const yearDict: Record<number, number> = {}
+const currentYear = new Date().getFullYear()
+for (let i = 0; i < 10; i++) {
+  yearDict[currentYear - i] = currentYear - i
+}
+
+// 当前Key
+const currentKey = ref(0)
+
+// 类型和过滤参数变化后重新刷新列表
+watch([filterParams], () => {
+  currentKey.value++
+})
+</script>
+
+<template>
+  <div class="px-3">
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>类别</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.cat">
+        <VChip
+          :color="filterParams.cat == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in bangumiCatDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>排序</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.sort">
+        <VChip
+          :color="filterParams.sort == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in bangumiSortDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>年份</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.year">
+        <VChip
+          :color="filterParams.year == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in yearDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+  </div>
+  <div>
+    <MediaCardListView :key="currentKey" apipath="discover/bangumi" :params="filterParams" />
+  </div>
+</template>
--- a/src/views/discover/DoubanView.vue
+++ b/src/views/discover/DoubanView.vue
@@ -0,0 +1,202 @@
+<script setup lang="ts">
+import MediaCardListView from '@/views/discover/MediaCardListView.vue'
+
+// 电影或者电视剧 movies/tvs
+const type = ref('movies')
+
+// 过滤参数
+const filterParams = reactive({
+  'sort': 'U',
+  'tags': '',
+})
+
+// 豆瓣风格类型
+const doubanCategory = ref('')
+
+// 地区
+const doubanZone = ref('')
+
+// 年代
+const doubanYear = ref('')
+
+// 豆瓣风格字典
+const categoryDict = {
+  '喜剧': '喜剧',
+  '爱情': '爱情',
+  '动作': '动作',
+  '科幻': '科幻',
+  '动画': '动画',
+  '悬疑': '悬疑',
+  '犯罪': '犯罪',
+  '惊悚': '惊悚',
+  '冒险': '冒险',
+  '音乐': '音乐',
+  '历史': '历史',
+  '奇幻': '奇幻',
+  '恐怖': '恐怖',
+  '战争': '战争',
+  '传记': '传记',
+  '歌舞': '歌舞',
+  '武侠': '武侠',
+  '情色': '情色',
+  '灾难': '灾难',
+  '西部': '西部',
+  '纪录片': '纪录片',
+  '短片': '短片',
+}
+
+// 地区字典
+const zoneDict = {
+  '华语': '华语',
+  '欧美': '欧美',
+  '韩国': '韩国',
+  '日本': '日本',
+  '中国大陆': '中国大陆',
+  '美国': '美国',
+  '中国香港': '中国香港',
+  '中国台湾': '中国台湾',
+  '英国': '英国',
+  '法国': '法国',
+  '德国': '德国',
+  '意大利': '意大利',
+  '西班牙': '西班牙',
+  '印度': '印度',
+  '泰国': '泰国',
+  '俄罗斯': '俄罗斯',
+  '加拿大': '加拿大',
+  '澳大利亚': '澳大利亚',
+  '爱尔兰': '爱尔兰',
+  '瑞典': '瑞典',
+  '巴西': '巴西',
+  '丹麦': '丹麦',
+}
+
+// 年代字典
+const yearDict: Record<string, string> = {
+  '2020年代': '2020年代',
+  '2010年代': '2010年代',
+  '2000年代': '2000年代',
+  '90年代': '90年代',
+  '80年代': '80年代',
+  '70年代': '70年代',
+  '60年代': '60年代',
+}
+
+// 往年代字典中追加当前年份及往前5年的字典
+const currentYear = new Date().getFullYear()
+for (let i = 0; i < 6; i++) {
+  yearDict[`${currentYear - i}`] = `${currentYear - i}`
+}
+
+// 豆瓣过滤参数
+const doubanSortDict = {
+  'U': '综合排序',
+  'R': '首播时间',
+  'T': '近期热度',
+  'S': '高分优先',
+}
+
+// 风格、年代、地区变化时，以,分隔拼接到tags参数
+watch([doubanCategory, doubanZone, doubanYear], () => {
+  filterParams.tags = [doubanCategory.value, doubanZone.value, doubanYear.value].filter(Boolean).join(',')
+})
+
+// 当前Key
+const currentKey = ref(0)
+
+// 类型和过滤参数变化后重新刷新列表
+watch([type, filterParams], () => {
+  if (!type.value) {
+    type.value = 'movies'
+  }
+  if (!filterParams.sort) {
+    filterParams.sort = 'U'
+  }
+  currentKey.value++
+})
+</script>
+
+<template>
+  <div class="px-3">
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>类型</VLabel>
+      </div>
+      <VChipGroup v-model="type">
+        <VChip :color="type == 'movies' ? 'primary' : ''" filter tile value="movies">电影</VChip>
+        <VChip :color="type == 'tvs' ? 'primary' : ''" filter tile value="tvs">电视剧</VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>排序</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.sort">
+        <VChip
+          :color="filterParams.sort == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in doubanSortDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>风格</VLabel>
+      </div>
+      <VChipGroup v-model="doubanCategory">
+        <VChip
+          :color="doubanCategory == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in categoryDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>地区</VLabel>
+      </div>
+      <VChipGroup v-model="doubanZone">
+        <VChip
+          :color="doubanZone == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in zoneDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>年代</VLabel>
+      </div>
+      <VChipGroup v-model="doubanYear">
+        <VChip
+          :color="doubanYear == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in yearDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+  </div>
+  <div>
+    <MediaCardListView :key="currentKey" :apipath="`discover/douban_${type}`" :params="filterParams" />
+  </div>
+</template>
--- a/src/views/discover/ExtraSourceView.vue
+++ b/src/views/discover/ExtraSourceView.vue
@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import { DiscoverSource } from '@/api/types'
+import MediaCardListView from '@/views/discover/MediaCardListView.vue'
+import FormRender from '@/components/render/FormRender.vue'
+import { cloneDeep } from 'lodash'
+
+// 输入参数
+const props = defineProps<{
+  source: DiscoverSource
+}>()
+
+// 默认输入参数
+const default_params = cloneDeep(props.source.filter_params)
+
+// 过滤参数
+const filterParams = reactive(props.source.filter_params)
+
+// 当前Key
+const currentKey = ref(0)
+
+// 类型和过滤参数变化后重新刷新列表
+watch([filterParams], () => {
+  // 检查每个值，如果没有值但有默认值时，设置为默认值
+  for (const key in filterParams) {
+    if (!filterParams[key] && default_params[key]) {
+      filterParams[key] = default_params[key]
+    }
+  }
+  currentKey.value++
+})
+</script>
+
+<template>
+  <div class="px-3">
+    <FormRender v-for="(element, index) in source.filter_ui" :key="index" :config="element" :model="filterParams" />
+  </div>
+  <div>
+    <MediaCardListView :key="currentKey" :apipath="source.api_path" :params="filterParams" />
+  </div>
+</template>
+
+<style>
+.v-chip--selected {
+  color: rgb(var(--v-theme-primary)) !important;
+}
+</style>
--- a/src/views/discover/MediaCardListView.vue
+++ b/src/views/discover/MediaCardListView.vue
@@ -27,6 +27,7 @@ const isRefreshed = ref(false)
 // 数据列表
 const dataList = ref<MediaInfo[]>([])
 const currData = ref<MediaInfo[]>([])
+
 // 拼装参数
 function getParams() {
  let params = {
@@ -77,7 +78,6 @@ async function fetchData({ done }: { done: any }) {
    } else {
      // 加载一次
      // 设置加载中
-
      loading.value = true
      // 请求API
      currData.value = await api.get(props.apipath, {
@@ -115,7 +115,11 @@ async function fetchData({ done }: { done: any }) {
    <div v-if="dataList.length > 0" class="grid gap-4 grid-media-card mx-3" tabindex="0">
      <MediaCard v-for="data in dataList" :key="data.tmdb_id || data.douban_id" :media="data" />
    </div>
-    <NoDataFound v-if="dataList.length === 0 && isRefreshed" error-code="404" error-title="没有数据"
-      error-description="无法获取到媒体信息。" />
+    <NoDataFound
+      v-if="dataList.length === 0 && isRefreshed"
+      error-code="404"
+      error-title="没有数据"
+      error-description="无法获取到媒体信息。"
+    />
  </VInfiniteScroll>
 </template>
--- a/src/views/discover/MediaDetailView.vue
+++ b/src/views/discover/MediaDetailView.vue
@@ -14,6 +14,8 @@ import { isNullOrEmptyObject } from '@/@core/utils'
 // 输入参数
 const mediaProps = defineProps({
  mediaid: String,
+  title: String,
+  year: String,
  type: String,
 })

@@ -57,11 +59,10 @@ const subscribeId = ref<number>()

 // 获得mediaid
 function getMediaId() {
-  return mediaDetail.value?.tmdb_id
-    ? `tmdb:${mediaDetail.value?.tmdb_id}`
-    : mediaDetail.value?.douban_id
-    ? `douban:${mediaDetail.value?.douban_id}`
-    : `bangumi:${mediaDetail.value?.bangumi_id}`
+  if (mediaDetail.value?.tmdb_id) return `tmdb:${mediaDetail.value?.tmdb_id}`
+  else if (mediaDetail.value?.douban_id) return `douban:${mediaDetail.value?.douban_id}`
+  else if (mediaDetail.value?.bangumi_id) return `bangumi:${mediaDetail.value?.bangumi_id}`
+  else return `${mediaDetail.value?.mediaid_prefix}:${mediaDetail.value?.media_id}`
 }

 // 调用API查询详情
@@ -69,6 +70,8 @@ async function getMediaDetail() {
  if (mediaProps.mediaid && mediaProps.type) {
    mediaDetail.value = await api.get(`media/${mediaProps.mediaid}`, {
      params: {
+        title: mediaProps.title,
+        year: mediaProps.year,
        type_name: mediaProps.type,
      },
    })
@@ -403,6 +406,8 @@ function handleSearch(area: string) {
      keyword,
      type: mediaDetail.value.type,
      area,
+      title: mediaDetail.value.title,
+      year: mediaDetail.value.year,
      season: mediaDetail.value.season,
    },
  })
--- a/src/views/discover/TheMovieDbView.vue
+++ b/src/views/discover/TheMovieDbView.vue
@@ -0,0 +1,226 @@
+<script setup lang="ts">
+import MediaCardListView from '@/views/discover/MediaCardListView.vue'
+
+// 电影或者电视剧 movies/tvs
+const type = ref('movies')
+
+// 过滤参数
+const filterParams = reactive({
+  sort_by: 'popularity.desc',
+  with_genres: '',
+  with_original_language: '',
+  with_keywords: '',
+  with_watch_providers: '',
+  vote_average: 0,
+  vote_count: 10,
+  release_date: '',
+})
+
+// TMDB 电影排序字典
+const tmdbSortDict: Record<string, string> = {
+  'popularity.desc': '热度降序',
+  'popularity.asc': '热度升序',
+  'release_date.desc': '上映日期降序',
+  'release_date.asc': '上映日期升序',
+  'vote_average.desc': '评分降序',
+  'vote_average.asc': '评分升序',
+}
+
+// TMDB 电视剧排序字典
+const tmdbTvSortDict: Record<string, string> = {
+  'popularity.desc': '热度降序',
+  'popularity.asc': '热度升序',
+  'first_air_date.desc': '首播日期降序',
+  'first_air_date.asc': '首播日期升序',
+  'vote_average.desc': '评分降序',
+  'vote_average.asc': '评分升序',
+}
+
+// TMDB电影风格字典
+const tmdbMovieGenreDict: Record<string, string> = {
+  '28': '动作',
+  '12': '冒险',
+  '16': '动画',
+  '35': '喜剧',
+  '80': '犯罪',
+  '99': '纪录片',
+  '18': '剧情',
+  '10751': '家庭',
+  '14': '奇幻',
+  '36': '历史',
+  '27': '恐怖',
+  '10402': '音乐',
+  '9648': '悬疑',
+  '10749': '爱情',
+  '878': '科幻',
+  '10770': '电视电影',
+  '53': '惊悚',
+  '10752': '战争',
+  '37': '西部',
+}
+
+// TMDB电视剧风格字典
+const tmdbTvGenreDict: Record<string, string> = {
+  '10759': '动作冒险',
+  '16': '动画',
+  '35': '喜剧',
+  '80': '犯罪',
+  '99': '纪录片',
+  '18': '剧情',
+  '10751': '家庭',
+  '10762': '儿童',
+  '9648': '悬疑',
+  '10763': '新闻',
+  '10764': '真人秀',
+  '10765': '科幻奇幻',
+  '10766': '肥皂剧',
+  '10767': '戏剧',
+  '10768': '战争政治',
+  '37': '西部',
+}
+
+// TMDB原始语言字典（主要语言）
+const tmdbLanguageDict = {
+  'zh': '中文',
+  'en': '英语',
+  'ja': '日语',
+  'ko': '韩语',
+  'fr': '法语',
+  'de': '德语',
+  'es': '西班牙语',
+  'it': '意大利语',
+  'ru': '俄语',
+  'pt': '葡萄牙语',
+  'ar': '阿拉伯语',
+  'hi': '印地语',
+  'th': '泰语',
+}
+
+// 当前Key
+const currentKey = ref(0)
+
+// 类型变化
+watch(type, () => {
+  if (!type.value) {
+    type.value = 'movies'
+  }
+  let refresh = true
+  if (type.value === 'movies') {
+    if (!tmdbSortDict[filterParams.sort_by]) {
+      filterParams.sort_by = 'popularity.desc'
+      refresh = false
+    }
+    if (!tmdbMovieGenreDict[filterParams.with_genres]) {
+      filterParams.with_genres = ''
+      refresh = false
+    }
+  }
+  if (type.value === 'tvs') {
+    if (!tmdbTvSortDict[filterParams.sort_by]) {
+      filterParams.sort_by = 'popularity.desc'
+      refresh = false
+    }
+    if (!tmdbTvGenreDict[filterParams.with_genres]) {
+      filterParams.with_genres = ''
+      refresh = false
+    }
+  }
+  if (refresh) {
+    currentKey.value++
+  }
+})
+
+// 过滤参数变化
+watch(filterParams, () => {
+  if (!filterParams.sort_by) {
+    filterParams.sort_by = 'popularity.desc'
+  }
+  currentKey.value++
+})
+</script>
+
+<template>
+  <div class="px-3">
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>类型</VLabel>
+      </div>
+      <VChipGroup v-model="type">
+        <VChip :color="type == 'movies' ? 'primary' : ''" filter tile value="movies">电影</VChip>
+        <VChip :color="type == 'tvs' ? 'primary' : ''" filter tile value="tvs">电视剧</VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>排序</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.sort_by">
+        <VChip
+          :color="filterParams.sort_by == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in type == 'movies' ? tmdbSortDict : tmdbTvSortDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>风格</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.with_genres">
+        <VChip
+          :color="filterParams.with_genres == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in type == 'movies' ? tmdbMovieGenreDict : tmdbTvGenreDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>语言</VLabel>
+      </div>
+      <VChipGroup v-model="filterParams.with_original_language">
+        <VChip
+          :color="filterParams.with_original_language == key ? 'primary' : ''"
+          filter
+          tile
+          :value="key"
+          v-for="(value, key) in tmdbLanguageDict"
+          :key="key"
+        >
+          {{ value }}
+        </VChip>
+      </VChipGroup>
+    </div>
+    <div class="flex justify-start align-center">
+      <div class="mr-5">
+        <VLabel>评分</VLabel>
+      </div>
+      <VSlider v-model="filterParams.vote_average" thumb-label max="10" min="0" class="align-center" hide-details>
+        <template v-slot:append>
+          <VTextField
+            width="5rem"
+            v-model="filterParams.vote_count"
+            density="compact"
+            type="number"
+            hide-details
+            single-line
+          />
+        </template>
+      </VSlider>
+    </div>
+  </div>
+
+  <div>
+    <MediaCardListView :key="currentKey" :apipath="`discover/tmdb_${type}`" :params="filterParams" />
+  </div>
+</template>
--- a/src/views/discover/TorrentRowListView.vue
+++ b/src/views/discover/TorrentRowListView.vue
@@ -1,391 +0,0 @@
-<script lang="ts" setup>
-import type { Context } from '@/api/types'
-import TorrentItem from '@/components/cards/TorrentItem.vue'
-import { list } from 'postcss'
-import { useDisplay } from 'vuetify'
-
-// 显示器宽度
-const display = useDisplay()
-
-// APP
-const appMode = inject('pwaMode') && display.mdAndDown.value
-
-// 定义输入参数
-const props = defineProps({
-  // 数据列表
-  items: Array as PropType<Context[]>,
-})
-
-// 过滤表单
-const filterForm = reactive({
-  // 站点
-  site: [] as string[],
-  // 季
-  season: [] as string[],
-  // 制作组
-  releaseGroup: [] as string[],
-  // 视频编码
-  videoCode: [] as string[],
-  // 促销状态
-  freeState: [] as string[],
-  // 质量
-  edition: [] as string[],
-  // 分辨率
-  resolution: [] as string[],
-})
-
-// 列表样式
-const listStyle = computed(() => {
-  return appMode
-    ? 'height: calc(100vh - 7.5rem - env(safe-area-inset-bottom) - 3.5rem)'
-    : 'height: calc(100vh - 6.5rem - env(safe-area-inset-bottom)'
-})
-
-// 排序字段
-const sortField = ref('default')
-
-// 数据列表
-const dataList = ref<Array<Context>>([])
-
-// 获取站点过滤选项
-const siteFilterOptions = ref<Array<string>>([])
-// 获取季过滤选项
-const seasonFilterOptions = ref<Array<string>>([])
-// 获取制作组过滤选项
-const releaseGroupFilterOptions = ref<Array<string>>([])
-// 获取视频编码过滤选项
-const videoCodeFilterOptions = ref<Array<string>>([])
-// 获取促销状态过滤选项
-const freeStateFilterOptions = ref<Array<string>>([])
-// 获取质量过滤选项
-const editionFilterOptions = ref<Array<string>>([])
-// 获取分辨率过滤选项
-const resolutionFilterOptions = ref<Array<string>>([])
-
-// 初始化过滤选项
-function initOptions(data: Context) {
-  const { torrent_info, meta_info } = data
-  const optionValue = (options: Array<string>, value: string | undefined) => {
-    value && !options.includes(value) && options.push(value)
-  }
-  optionValue(siteFilterOptions.value, torrent_info?.site_name)
-  optionValue(seasonFilterOptions.value, meta_info?.season_episode)
-  optionValue(releaseGroupFilterOptions.value, meta_info?.resource_team)
-  optionValue(videoCodeFilterOptions.value, meta_info?.video_encode)
-  optionValue(freeStateFilterOptions.value, torrent_info?.volume_factor)
-  optionValue(editionFilterOptions.value, meta_info?.edition)
-  optionValue(resolutionFilterOptions.value, meta_info?.resource_pix)
-}
-
-// 对季过滤选项进行排序
-const sortSeasonFilterOptions = computed(() => {
-  // 预解析所有选项
-  const parsedOptions = seasonFilterOptions.value.map((option, index) => {
-    const parseSeasonEpisode = (str: string) => {
-      const match = str.match(/^S(\d+)(?:-S(\d+))?(?:\s*E(\d+)(?:-E(\d+))?)?$/)
-
-      if (!match) {
-        // 如果字符串格式不正确，返回默认值
-        return {
-          original: str,
-          seasonStart: 0,
-          seasonEnd: 0,
-          episodeStart: 0,
-          episodeEnd: 0,
-          maxSeason: 0,
-          maxEpisode: 0,
-          index,
-        }
-      }
-
-      const seasonStart = match[1] ? parseInt(match[1], 10) : 0
-      const seasonEnd = match[2] ? parseInt(match[2], 10) : 0
-      const episodeStart = match[3] ? parseInt(match[3], 10) : 0
-      const episodeEnd = match[4] ? parseInt(match[4], 10) : 0
-      const maxSeason = seasonEnd > 0 ? seasonEnd : seasonStart
-      const maxEpisode = episodeEnd > 0 ? episodeEnd : episodeStart
-
-      return {
-        original: str,
-        seasonStart,
-        seasonEnd,
-        episodeStart,
-        episodeEnd,
-        maxSeason,
-        maxEpisode,
-        index,
-      }
-    }
-
-    return parseSeasonEpisode(option)
-  })
-
-  // 定义判断是否为整季或季范围的函数
-  const isWholeSeason = (parsed: (typeof parsedOptions)[0]) =>
-    parsed.seasonStart > 0 &&
-    (parsed.seasonEnd === 0 || parsed.seasonEnd > parsed.seasonStart) &&
-    parsed.episodeStart === 0 &&
-    parsed.episodeEnd === 0
-
-  // 定义判断是否包含集数的函数
-  const hasEpisodes = (parsed: (typeof parsedOptions)[0]) => parsed.episodeStart > 0 || parsed.episodeEnd > 0
-
-  // 排序逻辑
-  parsedOptions.sort((a, b) => {
-    const aIsWhole = isWholeSeason(a)
-    const bIsWhole = isWholeSeason(b)
-    const aHasEpisodes = hasEpisodes(a)
-    const bHasEpisodes = hasEpisodes(b)
-
-    // 优先级1：整季和季范围选项优先于带有集数的选项
-    if (aIsWhole && !bIsWhole) return -1
-    if (!aIsWhole && bIsWhole) return 1
-
-    // 优先级2：如果都是整季或季范围选项，按 maxSeason 降序排列
-    if (aIsWhole && bIsWhole) {
-      if (b.maxSeason !== a.maxSeason) {
-        return b.maxSeason - a.maxSeason
-      }
-      // 如果 maxSeason 相同，则按原始索引
-      return a.index - b.index
-    }
-
-    // 优先级3：如果都是带有集数的选项，先按 maxSeason 降序，再按 maxEpisode 降序
-    if (aHasEpisodes && bHasEpisodes) {
-      if (b.maxSeason !== a.maxSeason) {
-        return b.maxSeason - a.maxSeason
-      }
-      if (b.maxEpisode !== a.maxEpisode) {
-        return b.maxEpisode - a.maxEpisode
-      }
-      // 如果 maxSeason 和 maxEpisode 相同，则按原始索引
-      return a.index - b.index
-    }
-
-    // 优先级4：如果一个有集数，一个没有，优先有集数的选项
-    if (aHasEpisodes && !bHasEpisodes) return -1
-    if (!aHasEpisodes && bHasEpisodes) return 1
-
-    // 优先级5：对于没有集数且不是整季的选项，按 seasonStart 和 seasonEnd 降序排序
-    if (b.seasonStart !== a.seasonStart) {
-      return b.seasonStart - a.seasonStart
-    }
-    if (b.seasonEnd !== a.seasonEnd) {
-      return b.seasonEnd - a.seasonEnd
-    }
-
-    // 优先级6：按 episodeStart 和 episodeEnd 降序排序
-    if (b.episodeStart !== a.episodeStart) {
-      return b.episodeStart - a.episodeStart
-    }
-    if (b.episodeEnd !== a.episodeEnd) {
-      return b.episodeEnd - a.episodeEnd
-    }
-
-    // 优先级7：兜底按字母降序排列
-    if (a.original !== b.original) {
-      return b.original.localeCompare(a.original)
-    }
-
-    // 优先级8：如果所有条件都相同，则按原始索引
-    return a.index - b.index
-  })
-
-  // 返回排序后的原始字符串数组
-  return parsedOptions.map(option => option.original)
-})
-
-// 排序
-watchEffect(() => {
-  const list = dataList.value
-  if (sortField.value === 'default') {
-    dataList.value = list.sort((a, b) => b.torrent_info.pri_order - a.torrent_info.pri_order)
-  } else if (sortField.value === 'site') {
-    dataList.value = list.sort((a, b) => (a.torrent_info.site_name || '').localeCompare(b.torrent_info.site_name || ''))
-  } else if (sortField.value === 'size') {
-    dataList.value = list.sort((a, b) => b.torrent_info.size - a.torrent_info.size)
-  } else if (sortField.value === 'seeder') {
-    dataList.value = list.sort((a, b) => b.torrent_info.seeders - a.torrent_info.seeders)
-  }
-})
-
-// 计算过滤后的列表
-watchEffect(() => {
-  // 清空列表
-  dataList.value = []
-  // 匹配过滤函数
-  const match = (filter: Array<string>, value: string | undefined) =>
-    filter.length === 0 || (value && filter.includes(value))
-
-  props.items?.forEach(data => {
-    const { meta_info, torrent_info } = data
-    if (
-      // 站点过滤
-      match(filterForm.site, torrent_info.site_name) &&
-      // 促销状态过滤
-      match(filterForm.freeState, torrent_info.volume_factor) &&
-      // 季过滤
-      match(filterForm.season, meta_info.season_episode) &&
-      // 制作组过滤
-      match(filterForm.releaseGroup, meta_info.resource_team) &&
-      // 视频编码过滤
-      match(filterForm.videoCode, meta_info.video_encode) &&
-      // 分辨率过滤
-      match(filterForm.resolution, meta_info.resource_pix) &&
-      // 质量过滤
-      match(filterForm.edition, meta_info.edition)
-    )
-      dataList.value.push(data)
-  })
-})
-
-// 初始化过滤选项
-onMounted(() => {
-  props.items?.forEach(item => {
-    initOptions(item)
-  })
-})
-</script>
-
-<template>
-  <VRow>
-    <VCol>
-      <VList v-if="dataList.length === 0" lines="three" class="rounded p-0 shadow-lg">
-        <VListItem>
-          <VListItemTitle>没有附合当前过滤条件的资源。</VListItemTitle>
-        </VListItem>
-      </VList>
-      <VList v-if="dataList.length !== 0" lines="three" class="rounded p-0 torrent-list-vscroll shadow-lg">
-        <VVirtualScroll :items="dataList" :style="listStyle">
-          <template #default="{ item }">
-            <TorrentItem :torrent="item" :key="`${item.torrent_info.page_url}`" />
-          </template>
-        </VVirtualScroll>
-      </VList>
-    </VCol>
-    <VCol xl="2" md="3" v-if="display.mdAndUp.value">
-      <VList lines="one" class="rounded shadow-lg" :style="listStyle">
-        <VListSubheader> 排序 </VListSubheader>
-        <VListItem>
-          <VChipGroup column v-model="sortField">
-            <VChip :color="sortField == 'default' ? 'primary' : ''" filter variant="outlined" value="default">
-              默认
-            </VChip>
-            <VChip :color="sortField == 'site' ? 'primary' : ''" filter variant="outlined" value="site"> 站点 </VChip>
-            <VChip :color="sortField == 'size' ? 'primary' : ''" filter variant="outlined" value="size">
-              文件大小
-            </VChip>
-            <VChip :color="sortField == 'seeder' ? 'primary' : ''" filter variant="outlined" value="seeder">
-              做种数
-            </VChip>
-          </VChipGroup>
-        </VListItem>
-        <VListSubheader v-if="siteFilterOptions.length > 0"> 站点 </VListSubheader>
-        <VListItem>
-          <VChipGroup v-model="filterForm.site" column multiple>
-            <VChip
-              v-for="site in siteFilterOptions"
-              :key="site"
-              :color="filterForm.site.includes(site) ? 'primary' : ''"
-              filter
-              variant="outlined"
-              :value="site"
-            >
-              {{ site }}
-            </VChip>
-          </VChipGroup>
-        </VListItem>
-        <VListSubheader v-if="editionFilterOptions.length > 0"> 质量 </VListSubheader>
-        <VListItem>
-          <VChipGroup v-model="filterForm.edition" column multiple>
-            <VChip
-              v-for="edition in editionFilterOptions"
-              :key="edition"
-              :color="filterForm.edition.includes(edition) ? 'primary' : ''"
-              filter
-              variant="outlined"
-              :value="edition"
-            >
-              {{ edition }}
-            </VChip>
-          </VChipGroup>
-        </VListItem>
-        <VListSubheader v-if="resolutionFilterOptions.length > 0"> 分辨率 </VListSubheader>
-        <VListItem>
-          <VChipGroup v-model="filterForm.resolution" column multiple>
-            <VChip
-              v-for="resolution in resolutionFilterOptions"
-              :key="resolution"
-              :color="filterForm.resolution.includes(resolution) ? 'primary' : ''"
-              filter
-              variant="outlined"
-              :value="resolution"
-            >
-              {{ resolution }}
-            </VChip>
-          </VChipGroup>
-        </VListItem>
-        <VListSubheader v-if="releaseGroupFilterOptions.length > 0"> 制作组 </VListSubheader>
-        <VListItem>
-          <VChipGroup v-model="filterForm.releaseGroup" column multiple>
-            <VChip
-              v-for="releaseGroup in releaseGroupFilterOptions"
-              :key="releaseGroup"
-              :color="filterForm.releaseGroup.includes(releaseGroup) ? 'primary' : ''"
-              filter
-              variant="outlined"
-              :value="releaseGroup"
-            >
-              {{ releaseGroup }}
-            </VChip>
-          </VChipGroup>
-        </VListItem>
-        <VListSubheader v-if="videoCodeFilterOptions.length > 0"> 视频编码 </VListSubheader>
-        <VListItem>
-          <VChipGroup v-model="filterForm.videoCode" column multiple>
-            <VChip
-              v-for="videoCode in videoCodeFilterOptions"
-              :key="videoCode"
-              :color="filterForm.videoCode.includes(videoCode) ? 'primary' : ''"
-              filter
-              variant="outlined"
-              :value="videoCode"
-            >
-              {{ videoCode }}
-            </VChip>
-          </VChipGroup>
-        </VListItem>
-        <VListSubheader v-if="freeStateFilterOptions.length > 0"> 促销状态 </VListSubheader>
-        <VListItem>
-          <VChipGroup v-model="filterForm.freeState" column multiple>
-            <VChip
-              v-for="freeState in freeStateFilterOptions"
-              :key="freeState"
-              :color="filterForm.freeState.includes(freeState) ? 'primary' : ''"
-              filter
-              variant="outlined"
-              :value="freeState"
-            >
-              {{ freeState }}
-            </VChip>
-          </VChipGroup>
-        </VListItem>
-        <VListSubheader v-if="seasonFilterOptions.length > 0"> 季集 </VListSubheader>
-        <VListItem>
-          <VChipGroup v-model="filterForm.season" column multiple>
-            <VChip
-              v-for="season in sortSeasonFilterOptions"
-              :key="season"
-              :color="filterForm.season.includes(season) ? 'primary' : ''"
-              filter
-              variant="outlined"
-              :value="season"
-            >
-              {{ season }}
-            </VChip>
-          </VChipGroup>
-        </VListItem>
-      </VList>
-    </VCol>
-  </VRow>
-</template>
--- a/src/views/plugin/PluginCardListView.vue
+++ b/src/views/plugin/PluginCardListView.vue
@@ -397,9 +397,12 @@ onMounted(async () => {

 <template>
  <div>
-    <VTabs v-model="activeTab">
+    <VTabs v-model="activeTab" show-arrows>
      <VTab v-for="item in PluginTabs" :value="item.tab">
-        <span class="mx-5">{{ item.title }}</span>
+        <div class="flex align-center min-w-24">
+          <VIcon size="20" start :icon="item.icon" />
+          {{ item.title }}
+        </div>
      </VTab>
    </VTabs>

@@ -507,7 +510,7 @@ onMounted(async () => {
    </VWindow>
  </div>

-  <div>
+  <div v-if="isRefreshed">
    <!-- 插件搜索图标 -->
    <VFab
      icon="mdi-magnify"
@@ -604,7 +607,7 @@ onMounted(async () => {
    </VCard>
  </VDialog>
  <!-- 安装插件进度框 -->
-  <VDialog v-model="progressDialog" :scrim="false" width="25rem">
+  <VDialog v-if="progressDialog" v-model="progressDialog" :scrim="false" width="25rem">
    <VCard color="primary">
      <VCardText class="text-center">
        {{ progressText }}
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -48,7 +48,41 @@ const headers = [
    sortable: true,
  },
  {
-    title: '目录',
+    title: '路径',
+    key: 'src',
+    sortable: true,
+  },
+  {
+    title: '转移方式',
+    key: 'mode',
+    sortable: true,
+  },
+  {
+    title: '时间',
+    key: 'date',
+    sortable: true,
+  },
+  {
+    title: '状态',
+    key: 'status',
+    sortable: true,
+  },
+  {
+    title: '',
+    key: 'actions',
+    sortable: false,
+  },
+]
+
+// 分组表头
+const groupHeaders = [
+  {
+    title: '季集/类别',
+    key: 'title',
+    sortable: true,
+  },
+  {
+    title: '路径',
    key: 'src',
    sortable: true,
  },
@@ -98,6 +132,16 @@ const loading = ref(false)
 // 总条数
 const totalItems = ref(0)

+// 是否要分组
+const group = ref(false)
+
+// 分组条件
+const groupBy = ref<any>([
+  {
+    key: 'title',
+  },
+])
+
 // 每页条数
 const itemsPerPage = ref<number>(ensureNumber(route.query.itemsPerPage, 50))

@@ -113,6 +157,9 @@ const progressText = ref('请稍候 ...')
 // 进度值
 const progressValue = ref(0)

+// 是否已刷新
+const isRefreshed = ref(false)
+
 // 删除确认对话框
 const deleteConfirmDialog = ref(false)

@@ -160,7 +207,8 @@ watch(
 )

 // 搜索监听
-watch([() => search.value, () => isComposing.value],
+watch(
+  [() => search.value, () => isComposing.value],
  debounce(async () => {
    if (!isComposing.value) {
      console.log('search: ' + search.value)
@@ -181,7 +229,7 @@ async function fetchData(page = currentPage.value, count = itemsPerPage.value) {
        title: search.value,
      },
    })
-
+    isRefreshed.value = true
    dataList.value = result.data?.list
    totalItems.value = result.data?.total
    searchHintList.value = ['失败', '成功', ...new Set(dataList.value.map(item => item.title || ''))].filter(
@@ -403,7 +451,107 @@ onMounted(fetchData)
        </VRow>
      </VCardTitle>
    </VCardItem>
+    <!-- 分组模式 -->
    <VDataTableVirtual
+      v-if="group"
+      v-model="selected"
+      :groupBy="groupBy"
+      :headers="groupHeaders"
+      :items="dataList"
+      :loading="loading"
+      density="compact"
+      return-object
+      fixed-header
+      show-select
+      loading-text="加载中..."
+      hover
+      :style="tableStyle"
+    >
+      <template #header.data-table-group>
+        <span>标题</span>
+      </template>
+      <template v-slot:group-header="{ item, columns, toggleGroup, isGroupOpen }">
+        <tr>
+          <td :colspan="columns.length">
+            <VBtn
+              :icon="isGroupOpen(item) ? '$expand' : '$next'"
+              size="small"
+              variant="text"
+              @click="toggleGroup(item)"
+            />
+            {{ item.value }}
+          </td>
+        </tr>
+      </template>
+      <template #item.title="{ item }">
+        <div class="d-flex align-center">
+          <VAvatar>
+            <VIcon :icon="getIcon(item.type || '')" />
+          </VAvatar>
+          <div class="d-flex flex-column ms-1">
+            <span v-if="item.type === '电视剧'" class="d-block text-high-emphasis min-w-20">
+              {{ item?.seasons }}{{ item?.episodes }}
+            </span>
+            <small>{{ item?.category }}</small>
+          </div>
+        </div>
+      </template>
+      <template #item.src="{ item }">
+        <div>
+          <span>
+            <VChip variant="tonal" size="small" label class="my-1"> {{ storageDict[item?.src_storage || ''] }}</VChip>
+            <small>{{ item?.src }}</small>
+          </span>
+          <span class="text-high-emphasis text-bold"> => </span>
+          <br />
+          <span v-if="item?.dest">
+            <VChip variant="tonal" size="small" label class="my-1"> {{ storageDict[item?.dest_storage || ''] }}</VChip>
+            <small>{{ item?.dest }}</small>
+          </span>
+        </div>
+      </template>
+      <template #item.mode="{ item }">
+        <VChip variant="outlined" color="primary" size="small">
+          {{ TransferDict[item?.mode ?? ''] || '未知' }}
+        </VChip>
+      </template>
+      <template #item.status="{ item }">
+        <VChip v-if="item?.status" color="success" size="small"> 成功 </VChip>
+        <VTooltip v-else :text="item?.errmsg">
+          <template #activator="{ props }">
+            <VChip v-bind="props" color="error" size="small"> 失败 </VChip>
+          </template>
+        </VTooltip>
+      </template>
+      <template #item.date="{ item }">
+        <small>{{ item?.date }}</small>
+      </template>
+      <template #item.actions="{ item }">
+        <IconBtn>
+          <VIcon icon="mdi-dots-vertical" />
+          <VMenu activator="parent" close-on-content-click>
+            <VList>
+              <VListItem
+                v-for="(menu, i) in dropdownItems"
+                :key="i"
+                variant="plain"
+                :base-color="menu.props.color"
+                @click="menu.props.click(item)"
+              >
+                <template #prepend>
+                  <VIcon :icon="menu.props.prependIcon" />
+                </template>
+                <VListItemTitle v-text="menu.title" />
+              </VListItem>
+            </VList>
+          </VMenu>
+        </IconBtn>
+      </template>
+      <template #no-data> 没有数据 </template>
+    </VDataTableVirtual>
+    <!-- 列表模式 -->
+    <VDataTableVirtual
+      v-else
      v-model="selected"
      :headers="headers"
      :items="dataList"
@@ -485,7 +633,7 @@ onMounted(fetchData)
      </template>
      <template #no-data> 没有数据 </template>
    </VDataTableVirtual>
-    <div class="flex items-center justify-end">
+    <div class="flex items-center justify-center">
      <div class="w-auto">
        <VSelect v-model="itemsPerPage" :items="pageRange" density="compact" variant="solo" flat />
      </div>
@@ -502,9 +650,8 @@ onMounted(fetchData)
  </VCard>

  <!-- 底部操作按钮 -->
-  <div>
+  <div v-if="isRefreshed && selected.length > 0">
    <VFab
-      v-if="selected.length > 0"
      icon="mdi-trash-can-outline"
      color="error"
      location="bottom"
@@ -516,7 +663,6 @@ onMounted(fetchData)
      :class="{ 'mb-12': appMode }"
    />
    <VFab
-      v-if="selected.length > 0"
      :class="appMode ? 'mb-28' : 'mb-16'"
      icon="mdi-redo-variant"
      location="bottom"
@@ -527,6 +673,19 @@ onMounted(fetchData)
      @click="retransferBatch"
    />
  </div>
+  <div v-else-if="isRefreshed">
+    <VFab
+      :icon="group ? 'mdi-format-list-bulleted' : 'mdi-format-list-group'"
+      color="primary"
+      location="bottom"
+      size="x-large"
+      fixed
+      app
+      appear
+      @click="group = !group"
+      :class="{ 'mb-12': appMode }"
+    />
+  </div>
  <!-- 底部弹窗 -->
  <VBottomSheet v-model="deleteConfirmDialog" inset>
    <VCard class="text-center rounded-t">
--- a/src/views/setting/AccountSettingAbout.vue
+++ b/src/views/setting/AccountSettingAbout.vue
@@ -255,7 +255,7 @@ onMounted(() => {
      </div>
    </div>
  </div>
-  <VDialog v-model="releaseDialog" width="600" scrollable>
+  <VDialog v-if="releaseDialog" v-model="releaseDialog" width="600" scrollable>
    <VCard>
      <VCardItem>
        <DialogCloseBtn @click="releaseDialog = false" />
--- a/src/views/site/SiteCardListView.vue
+++ b/src/views/site/SiteCardListView.vue
@@ -111,6 +111,7 @@ onActivated(() => {
  />
  <!-- 新增站点按钮 -->
  <VFab
+    v-if="isRefreshed"
    icon="mdi-plus"
    location="bottom"
    size="x-large"
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import draggable from 'vuedraggable'
-import { VPullToRefresh } from 'vuetify/labs/VPullToRefresh'
 import api from '@/api'
 import type { Subscribe } from '@/api/types'
 import NoDataFound from '@/components/NoDataFound.vue'
@@ -23,6 +22,10 @@ const props = defineProps({
 // 是否刷新过
 let isRefreshed = ref(false)

+// 顺序存储键值
+const localOrderKey = props.type === '电影' ? 'MP_SUBSCRIBE_MOVIE_ORDER' : 'MP_SUBSCRIBE_TV_ORDER'
+const orderRequestKey = props.type === '电影' ? 'SubscribeMovieOrder' : 'SubscribeTvOrder'
+
 // 数据列表
 const dataList = ref<Subscribe[]>([])

@@ -45,19 +48,21 @@ watch(dataList, () => {
  const userName = store.state.auth.userName
  if (superUser) displayList.value = dataList.value.filter(data => data.type === props.type)
  else displayList.value = dataList.value.filter(data => data.type === props.type && data.username === userName)
+  // 排序
+  sortSubscribeOrder()
 })

 // 加载顺序
 async function loadSubscribeOrderConfig() {
  // 顺序配置
-  const local_order = localStorage.getItem('MP_SUBSCRIBE_ORDER')
+  const local_order = localStorage.getItem(localOrderKey)
  if (local_order) {
    orderConfig.value = JSON.parse(local_order)
  } else {
-    const response2 = await api.get('/user/config/SubscribeOrder')
-    if (response2 && response2.data && response2.data.value) {
-      orderConfig.value = response2.data.value
-      localStorage.setItem('MP_SUBSCRIBE_ORDER', JSON.stringify(orderConfig.value))
+    const response = await api.get(`/user/config/${orderRequestKey}`)
+    if (response && response.data && response.data.value) {
+      orderConfig.value = response.data.value
+      localStorage.setItem(localOrderKey, JSON.stringify(orderConfig.value))
    }
  }
 }
@@ -67,10 +72,10 @@ function sortSubscribeOrder() {
  if (!orderConfig.value) {
    return
  }
-  if (dataList.value.length === 0) {
+  if (displayList.value.length === 0) {
    return
  }
-  dataList.value.sort((a, b) => {
+  displayList.value.sort((a, b) => {
    const aIndex = orderConfig.value.findIndex((item: { id: number }) => item.id === a.id)
    const bIndex = orderConfig.value.findIndex((item: { id: number }) => item.id === b.id)
    return (aIndex === -1 ? 999 : aIndex) - (bIndex === -1 ? 999 : bIndex)
@@ -83,11 +88,11 @@ async function saveSubscribeOrder() {
  const orderObj = displayList.value.map(item => ({ id: item.id }))
  orderConfig.value = orderObj
  const orderString = JSON.stringify(orderObj)
-  localStorage.setItem('MP_SUBSCRIBE_ORDER', orderString)
+  localStorage.setItem(localOrderKey, orderString)

  // 保存到服务端
  try {
-    await api.post('/user/config/SubscribeOrder', orderObj)
+    await api.post(`/user/config/${orderRequestKey}`, orderObj)
  } catch (error) {
    console.error(error)
  }
@@ -98,8 +103,6 @@ async function fetchData() {
  try {
    loading.value = true
    dataList.value = await api.get('subscribe/')
-    // 排序
-    sortSubscribeOrder()
    loading.value = false
    isRefreshed.value = true
  } catch (error) {
@@ -110,12 +113,6 @@ async function fetchData() {
 // 刷新状态
 const loading = ref(false)

-// 下拉刷新
-async function onRefresh({ done }: { done: any }) {
-  await fetchData()
-  done('ok')
-}
-
 onMounted(async () => {
  await loadSubscribeOrderConfig()
  await fetchData()
@@ -138,29 +135,27 @@ onActivated(async () => {

 <template>
  <LoadingBanner v-if="!isRefreshed" class="mt-12" />
-  <VPullToRefresh v-model="loading" @load="onRefresh">
-    <draggable
-      v-if="displayList.length > 0"
-      v-model="displayList"
-      @end="saveSubscribeOrder"
-      handle=".cursor-move"
-      item-key="id"
-      tag="div"
-      :component-data="{ class: 'mx-3 grid gap-4 grid-subscribe-card p-1' }"
-    >
-      <template #item="{ element }">
-        <SubscribeCard :key="element.id" :media="element" @remove="fetchData" @save="fetchData" />
-      </template>
-    </draggable>
-    <NoDataFound
-      v-if="displayList.length === 0 && isRefreshed"
-      error-code="404"
-      error-title="没有订阅"
-      error-description="请通过搜索添加电影、电视剧订阅。"
-    />
-  </VPullToRefresh>
+  <draggable
+    v-if="displayList.length > 0"
+    v-model="displayList"
+    @end="saveSubscribeOrder"
+    handle=".cursor-move"
+    item-key="id"
+    tag="div"
+    :component-data="{ class: 'mx-3 grid gap-4 grid-subscribe-card p-1' }"
+  >
+    <template #item="{ element }">
+      <SubscribeCard :key="element.id" :media="element" @remove="fetchData" @save="fetchData" />
+    </template>
+  </draggable>
+  <NoDataFound
+    v-if="displayList.length === 0 && isRefreshed"
+    error-code="404"
+    error-title="没有订阅"
+    error-description="请通过搜索添加电影、电视剧订阅。"
+  />
  <!-- 底部操作按钮 -->
-  <div>
+  <div v-if="isRefreshed">
    <VFab
      v-if="store.state.auth.superUser"
      icon="mdi-clipboard-edit"
--- a/src/views/discover/TorrentCardListView.vue
+++ b/src/views/discover/TorrentCardListView.vue
@@ -14,7 +14,7 @@ const props = defineProps({
 })

 // 过滤表单
-const filterForm = reactive({
+const filterForm: Record<string, string[]> = reactive({
  // 站点
  site: [] as string[],
  // 季
@@ -31,20 +31,36 @@ const filterForm = reactive({
  resolution: [] as string[],
 })

-// 获取站点过滤选项
-const siteFilterOptions = ref<Array<string>>([])
-// 获取季过滤选项
-const seasonFilterOptions = ref<Array<string>>([])
-// 获取制作组过滤选项
-const releaseGroupFilterOptions = ref<Array<string>>([])
-// 获取视频编码过滤选项
-const videoCodeFilterOptions = ref<Array<string>>([])
-// 获取促销状态过滤选项
-const freeStateFilterOptions = ref<Array<string>>([])
-// 获取质量过滤选项
-const editionFilterOptions = ref<Array<string>>([])
-// 获取分辨率过滤选项
-const resolutionFilterOptions = ref<Array<string>>([])
+// 过滤项映射（保持中文标题）
+const filterTitles: Record<string, string> = {
+  site: '站点',
+  season: '季集',
+  freeState: '促销状态',
+  videoCode: '视频编码',
+  edition: '质量',
+  resolution: '分辨率',
+  releaseGroup: '制作组',
+}
+
+// 统一存储过滤选项
+const filterOptions: Record<string, string[]> = reactive({
+  site: [] as string[],
+  season: [] as string[],
+  freeState: [] as string[],
+  edition: [] as string[],
+  resolution: [] as string[],
+  videoCode: [] as string[],
+  releaseGroup: [] as string[],
+})
+
+// 非空值的过滤选项
+const filterOptionsNotEmpty = computed(() => {
+  const options: Record<string, string[]> = {}
+  for (const key in filterOptions) {
+    if (filterOptions[key].length > 0) options[key] = filterOptions[key]
+  }
+  return options
+})

 // 完整的数据列表
 let dataList: SearchTorrent[]
@@ -60,19 +76,19 @@ function initOptions(data: Context) {
  const optionValue = (options: Array<string>, value: string | undefined) => {
    value && !options.includes(value) && options.push(value)
  }
-  optionValue(siteFilterOptions.value, torrent_info?.site_name)
-  optionValue(seasonFilterOptions.value, meta_info?.season_episode)
-  optionValue(releaseGroupFilterOptions.value, meta_info?.resource_team)
-  optionValue(videoCodeFilterOptions.value, meta_info?.video_encode)
-  optionValue(freeStateFilterOptions.value, torrent_info?.volume_factor)
-  optionValue(editionFilterOptions.value, meta_info?.edition)
-  optionValue(resolutionFilterOptions.value, meta_info?.resource_pix)
+  optionValue(filterOptions.site, torrent_info?.site_name)
+  optionValue(filterOptions.season, meta_info?.season_episode)
+  optionValue(filterOptions.releaseGroup, meta_info?.resource_team)
+  optionValue(filterOptions.videoCode, meta_info?.video_encode)
+  optionValue(filterOptions.freeState, torrent_info?.volume_factor)
+  optionValue(filterOptions.edition, meta_info?.edition)
+  optionValue(filterOptions.resolution, meta_info?.resource_pix)
 }

 // 对季过滤选项进行排序
 const sortSeasonFilterOptions = computed(() => {
  // 预解析所有选项
-  const parsedOptions = seasonFilterOptions.value.map((option, index) => {
+  const parsedOptions = filterOptions.season.map((option, index) => {
    const parseSeasonEpisode = (str: string) => {
      const match = str.match(/^S(\d+)(?:-S(\d+))?(?:\s*E(\d+)(?:-E(\d+))?)?$/)

@@ -193,11 +209,11 @@ onMounted(() => {
  const groupMap = new Map<string, Context[]>()
  // 遍历数据
  props.items?.forEach(item => {
-    const { torrent_info } = item
+    const { torrent_info, meta_info } = item
    // init options
    initOptions(item)
    // group data
-    const key = `${torrent_info.title}_${torrent_info.size}`
+    const key = `${meta_info.name}_${meta_info.resource_pix}_${meta_info.edition}_${meta_info.resource_team}_${meta_info.season_episode}_${torrent_info.size}`
    if (groupMap.has(key)) {
      // 已入库相同标题和大小的分组，将当前上下文信息添加到分组中
      const group = groupMap.get(key)
@@ -268,86 +284,26 @@ function loadMore({ done }: { done: any }) {
 <template>
  <VCard class="bg-transparent mb-3 pt-2 shadow-none">
    <VRow>
-      <VCol v-if="siteFilterOptions.length > 0" cols="6" md="">
+      <VCol v-for="(options, key) in filterOptionsNotEmpty" :key="key" cols="6" md="">
        <VSelect
-          v-model="filterForm.site"
-          :items="siteFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="站点"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="seasonFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.season"
+          v-if="key === 'season'"
+          v-model="filterForm[key]"
          :items="sortSeasonFilterOptions"
          size="small"
          density="compact"
          chips
-          label="季集"
+          :label="filterTitles[key]"
          multiple
          clearable
        />
-      </VCol>
-      <VCol v-if="releaseGroupFilterOptions.length > 0" cols="6" md="">
        <VSelect
-          v-model="filterForm.releaseGroup"
-          :items="releaseGroupFilterOptions"
+          v-else
+          v-model="filterForm[key]"
+          :items="options"
          size="small"
          density="compact"
          chips
-          label="制作组"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="editionFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.edition"
-          :items="editionFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="质量"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="resolutionFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.resolution"
-          :items="resolutionFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="分辨率"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="videoCodeFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.videoCode"
-          :items="videoCodeFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="视频编码"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="freeStateFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.freeState"
-          :items="freeStateFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="促销状态"
+          :label="filterTitles[key]"
          multiple
          clearable
        />
--- a/src/views/torrent/TorrentRowListView.vue
+++ b/src/views/torrent/TorrentRowListView.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup>
+import type { Context } from '@/api/types'
+import TorrentItem from '@/components/cards/TorrentItem.vue'
+import FilterOption from '@/components/misc/FilterOption.vue'
+import { useDisplay } from 'vuetify'
+
+// 设备模式
+const display = useDisplay()
+const appMode = inject('pwaMode') && display.mdAndDown.value
+
+// 过滤弹窗
+const filterDialog = ref(false)
+
+// 定义输入参数
+const props = defineProps({
+  items: Array as PropType<Context[]>,
+})
+
+// 过滤表单
+const filterForm: Record<string, string[]> = reactive({
+  // 站点
+  site: [] as string[],
+  // 季
+  season: [] as string[],
+  // 制作组
+  releaseGroup: [] as string[],
+  // 视频编码
+  videoCode: [] as string[],
+  // 促销状态
+  freeState: [] as string[],
+  // 质量
+  edition: [] as string[],
+  // 分辨率
+  resolution: [] as string[],
+})
+
+// 过滤项映射（保持中文标题）
+const filterTitles: Record<string, string> = {
+  site: '站点',
+  season: '季集',
+  freeState: '促销状态',
+  videoCode: '视频编码',
+  edition: '质量',
+  resolution: '分辨率',
+  releaseGroup: '制作组',
+}
+
+// 排序中文名
+const sortTitles: Record<string, string> = {
+  default: '默认',
+  site: '站点',
+  size: '大小',
+  seeder: '做种数',
+}
+
+// 统一存储过滤选项
+const filterOptions: Record<string, string[]> = reactive({
+  site: [] as string[],
+  season: [] as string[],
+  freeState: [] as string[],
+  edition: [] as string[],
+  resolution: [] as string[],
+  videoCode: [] as string[],
+  releaseGroup: [] as string[],
+})
+
+// 非空值的过滤选项
+const filterOptionsNotEmpty = computed(() => {
+  const options: Record<string, string[]> = {}
+  for (const key in filterOptions) {
+    if (filterOptions[key].length > 0) options[key] = filterOptions[key]
+  }
+  return options
+})
+
+// 对季过滤选项进行排序
+const sortSeasonFilterOptions = computed(() => {
+  // 预解析所有选项
+  const parsedOptions = filterOptions.season.map((option, index) => {
+    const parseSeasonEpisode = (str: string) => {
+      const match = str.match(/^S(\d+)(?:-S(\d+))?(?:\s*E(\d+)(?:-E(\d+))?)?$/)
+
+      if (!match) {
+        // 如果字符串格式不正确，返回默认值
+        return {
+          original: str,
+          seasonStart: 0,
+          seasonEnd: 0,
+          episodeStart: 0,
+          episodeEnd: 0,
+          maxSeason: 0,
+          maxEpisode: 0,
+          index,
+        }
+      }
+
+      const seasonStart = match[1] ? parseInt(match[1], 10) : 0
+      const seasonEnd = match[2] ? parseInt(match[2], 10) : 0
+      const episodeStart = match[3] ? parseInt(match[3], 10) : 0
+      const episodeEnd = match[4] ? parseInt(match[4], 10) : 0
+      const maxSeason = seasonEnd > 0 ? seasonEnd : seasonStart
+      const maxEpisode = episodeEnd > 0 ? episodeEnd : episodeStart
+
+      return {
+        original: str,
+        seasonStart,
+        seasonEnd,
+        episodeStart,
+        episodeEnd,
+        maxSeason,
+        maxEpisode,
+        index,
+      }
+    }
+
+    return parseSeasonEpisode(option)
+  })
+
+  // 定义判断是否为整季或季范围的函数
+  const isWholeSeason = (parsed: (typeof parsedOptions)[0]) =>
+    parsed.seasonStart > 0 &&
+    (parsed.seasonEnd === 0 || parsed.seasonEnd > parsed.seasonStart) &&
+    parsed.episodeStart === 0 &&
+    parsed.episodeEnd === 0
+
+  // 定义判断是否包含集数的函数
+  const hasEpisodes = (parsed: (typeof parsedOptions)[0]) => parsed.episodeStart > 0 || parsed.episodeEnd > 0
+
+  // 排序逻辑
+  parsedOptions.sort((a, b) => {
+    const aIsWhole = isWholeSeason(a)
+    const bIsWhole = isWholeSeason(b)
+    const aHasEpisodes = hasEpisodes(a)
+    const bHasEpisodes = hasEpisodes(b)
+
+    // 优先级1：整季和季范围选项优先于带有集数的选项
+    if (aIsWhole && !bIsWhole) return -1
+    if (!aIsWhole && bIsWhole) return 1
+
+    // 优先级2：如果都是整季或季范围选项，按 maxSeason 降序排列
+    if (aIsWhole && bIsWhole) {
+      if (b.maxSeason !== a.maxSeason) {
+        return b.maxSeason - a.maxSeason
+      }
+      // 如果 maxSeason 相同，则按原始索引
+      return a.index - b.index
+    }
+
+    // 优先级3：如果都是带有集数的选项，先按 maxSeason 降序，再按 maxEpisode 降序
+    if (aHasEpisodes && bHasEpisodes) {
+      if (b.maxSeason !== a.maxSeason) {
+        return b.maxSeason - a.maxSeason
+      }
+      if (b.maxEpisode !== a.maxEpisode) {
+        return b.maxEpisode - a.maxEpisode
+      }
+      // 如果 maxSeason 和 maxEpisode 相同，则按原始索引
+      return a.index - b.index
+    }
+
+    // 优先级4：如果一个有集数，一个没有，优先有集数的选项
+    if (aHasEpisodes && !bHasEpisodes) return -1
+    if (!aHasEpisodes && bHasEpisodes) return 1
+
+    // 优先级5：对于没有集数且不是整季的选项，按 seasonStart 和 seasonEnd 降序排序
+    if (b.seasonStart !== a.seasonStart) {
+      return b.seasonStart - a.seasonStart
+    }
+    if (b.seasonEnd !== a.seasonEnd) {
+      return b.seasonEnd - a.seasonEnd
+    }
+
+    // 优先级6：按 episodeStart 和 episodeEnd 降序排序
+    if (b.episodeStart !== a.episodeStart) {
+      return b.episodeStart - a.episodeStart
+    }
+    if (b.episodeEnd !== a.episodeEnd) {
+      return b.episodeEnd - a.episodeEnd
+    }
+
+    // 优先级7：兜底按字母降序排列
+    if (a.original !== b.original) {
+      return b.original.localeCompare(a.original)
+    }
+
+    // 优先级8：如果所有条件都相同，则按原始索引
+    return a.index - b.index
+  })
+
+  // 返回排序后的原始字符串数组
+  return parsedOptions.map(option => option.original)
+})
+
+// 列表样式
+const listStyle = computed(() => {
+  return appMode
+    ? 'height: calc(100vh - 7.5rem - env(safe-area-inset-bottom) - 3.5rem)'
+    : 'height: calc(100vh - 6.5rem - env(safe-area-inset-bottom)'
+})
+
+// 排序字段
+const sortField = ref('default')
+
+// 数据列表
+const dataList = ref<Array<Context>>([])
+
+// 初始化过滤选项
+function initOptions(data: Context) {
+  const { torrent_info, meta_info } = data
+  const optionValue = (options: Array<string>, value: string | undefined) => {
+    value && !options.includes(value) && options.push(value)
+  }
+
+  optionValue(filterOptions.site, torrent_info?.site_name)
+  optionValue(filterOptions.season, meta_info?.season_episode)
+  optionValue(filterOptions.releaseGroup, meta_info?.resource_team)
+  optionValue(filterOptions.videoCode, meta_info?.video_encode)
+  optionValue(filterOptions.freeState, torrent_info?.volume_factor)
+  optionValue(filterOptions.edition, meta_info?.edition)
+  optionValue(filterOptions.resolution, meta_info?.resource_pix)
+}
+
+// 监听数据列表，进行排序
+watchEffect(() => {
+  const list = dataList.value
+  if (sortField.value === 'default') {
+    dataList.value = list.sort((a, b) => b.torrent_info.pri_order - a.torrent_info.pri_order)
+  } else if (sortField.value === 'site') {
+    dataList.value = list.sort((a, b) => (a.torrent_info.site_name || '').localeCompare(b.torrent_info.site_name || ''))
+  } else if (sortField.value === 'size') {
+    dataList.value = list.sort((a, b) => b.torrent_info.size - a.torrent_info.size)
+  } else if (sortField.value === 'seeder') {
+    dataList.value = list.sort((a, b) => b.torrent_info.seeders - a.torrent_info.seeders)
+  }
+})
+
+// 计算过滤后的列表
+watchEffect(() => {
+  // 清空列表
+  dataList.value = []
+  // 匹配过滤函数
+  const match = (filter: Array<string>, value: string | undefined) =>
+    filter.length === 0 || (value && filter.includes(value))
+
+  props.items?.forEach(data => {
+    const { meta_info, torrent_info } = data
+    if (
+      // 站点过滤
+      match(filterForm.site, torrent_info.site_name) &&
+      // 促销状态过滤
+      match(filterForm.freeState, torrent_info.volume_factor) &&
+      // 季过滤
+      match(filterForm.season, meta_info.season_episode) &&
+      // 制作组过滤
+      match(filterForm.releaseGroup, meta_info.resource_team) &&
+      // 视频编码过滤
+      match(filterForm.videoCode, meta_info.video_encode) &&
+      // 分辨率过滤
+      match(filterForm.resolution, meta_info.resource_pix) &&
+      // 质量过滤
+      match(filterForm.edition, meta_info.edition)
+    )
+      dataList.value.push(data)
+  })
+})
+
+// 初始化过滤选项
+onMounted(() => {
+  props.items?.forEach(initOptions)
+})
+</script>
+
+<template>
+  <div>
+    <VRow>
+      <VCol>
+        <VList v-if="dataList.length === 0" lines="three" class="rounded p-0 shadow-lg">
+          <VListItem>
+            <VListItemTitle>没有符合当前过滤条件的资源。</VListItemTitle>
+          </VListItem>
+        </VList>
+        <VList v-else lines="three" class="rounded p-0 torrent-list-vscroll shadow-lg">
+          <VVirtualScroll :items="dataList" :style="listStyle">
+            <template #default="{ item }">
+              <TorrentItem :torrent="item" :key="item.torrent_info.page_url" />
+            </template>
+          </VVirtualScroll>
+        </VList>
+      </VCol>
+      <!-- 排序 & 过滤列表 -->
+      <VCol xl="2" md="3" v-if="display.mdAndUp.value">
+        <VList lines="one" class="rounded shadow-lg" :style="listStyle">
+          <FilterOption title="排序">
+            <VChipGroup column v-model="sortField">
+              <VChip
+                v-for="(title, key) in sortTitles"
+                :key="key"
+                :color="sortField === key ? 'primary' : ''"
+                filter
+                variant="outlined"
+                :value="key"
+              >
+                {{ title }}
+              </VChip>
+            </VChipGroup>
+          </FilterOption>
+          <!-- 过滤选项 -->
+          <FilterOption v-for="(options, key) in filterOptionsNotEmpty" :key="key" :title="filterTitles[key]">
+            <VChipGroup v-if="key === 'season'" v-model="filterForm[key]" column multiple>
+              <VChip
+                v-for="option in sortSeasonFilterOptions"
+                :key="option"
+                :color="filterForm[key].includes(option) ? 'primary' : ''"
+                filter
+                variant="outlined"
+                :value="option"
+              >
+                {{ option }}
+              </VChip>
+            </VChipGroup>
+            <VChipGroup v-else v-model="filterForm[key]" column multiple>
+              <VChip
+                v-for="option in options"
+                :key="option"
+                :color="filterForm[key].includes(option) ? 'primary' : ''"
+                filter
+                variant="outlined"
+                :value="option"
+              >
+                {{ option }}
+              </VChip>
+            </VChipGroup>
+          </FilterOption>
+        </VList>
+      </VCol>
+    </VRow>
+
+    <!-- 过滤弹窗 -->
+    <VDialog v-model="filterDialog" max-width="40rem">
+      <VCard title="排序 & 过滤" class="rounded-t">
+        <DialogCloseBtn v-model="filterDialog" />
+        <VDivider />
+        <VList lines="one">
+          <FilterOption title="排序">
+            <VChipGroup column v-model="sortField">
+              <VChip
+                v-for="(title, key) in sortTitles"
+                :key="key"
+                :color="sortField === key ? 'primary' : ''"
+                filter
+                variant="outlined"
+                :value="key"
+              >
+                {{ title }}
+              </VChip>
+            </VChipGroup>
+          </FilterOption>
+          <!-- 过滤选项 -->
+          <FilterOption
+            v-for="(options, key) in filterOptionsNotEmpty"
+            v-show="options.length > 0"
+            :key="key"
+            :title="filterTitles[key]"
+          >
+            <VChipGroup v-if="key === 'season'" v-model="filterForm[key]" column multiple>
+              <VChip
+                v-for="option in sortSeasonFilterOptions"
+                :key="option"
+                :color="filterForm[key].includes(option) ? 'primary' : ''"
+                filter
+                variant="outlined"
+                :value="option"
+              >
+                {{ option }}
+              </VChip>
+            </VChipGroup>
+            <VChipGroup v-else v-model="filterForm[key]" column multiple>
+              <VChip
+                v-for="option in options"
+                :key="option"
+                :color="filterForm[key].includes(option) ? 'primary' : ''"
+                filter
+                variant="outlined"
+                :value="option"
+              >
+                {{ option }}
+              </VChip>
+            </VChipGroup>
+          </FilterOption>
+        </VList>
+      </VCard>
+    </VDialog>
+
+    <!-- 底部操作按钮 -->
+    <div v-if="props.items">
+      <VFab
+        v-if="!display.mdAndUp.value"
+        icon="mdi-filter"
+        color="info"
+        location="bottom"
+        :class="appMode ? 'mb-28' : 'mb-16'"
+        size="x-large"
+        fixed
+        app
+        appear
+        @click="filterDialog = true"
+      />
+    </div>
+  </div>
+</template>
--- a/src/views/user/UserListView.vue
+++ b/src/views/user/UserListView.vue
@@ -68,6 +68,7 @@ onActivated(() => {
  />

  <VFab
+    v-if="isRefreshed"
    icon="mdi-plus"
    location="bottom"
    size="x-large"
@@ -85,7 +86,6 @@ onActivated(() => {
    oper="add"
    max-width="50rem"
    persistent
-    z-index="1010"
    @save="onUserAdd"
    @close="addUserDialog = false"
  />
--- a/src/views/user/UserProfileView.vue
+++ b/src/views/user/UserProfileView.vue
@@ -334,7 +334,7 @@ watch(
              </VRow>

              <VDivider class="my-10">
-                <span>消息账号绑定</span>
+                <span>账号绑定</span>
              </VDivider>

              <VRow>
@@ -378,6 +378,14 @@ watch(
                    label="SynologyChat用户"
                  />
                </VCol>
+                <VCol cols="12" md="6">
+                  <VTextField
+                    v-model="accountInfo.settings.douban_userid"
+                    density="comfortable"
+                    clearable
+                    label="豆瓣用户"
+                  />
+                </VCol>
              </VRow>
              <VRow>
                <!-- 👉 Form Actions -->
@@ -395,7 +403,7 @@ watch(
    </VRow>

    <!-- 双重验证弹窗 -->
-    <VDialog v-model="otpDialog" max-width="45rem" persistent z-index="1010">
+    <VDialog v-if="otpDialog" v-model="otpDialog" max-width="45rem" persistent scrollable>
      <!-- 开启双重验证弹窗内容 -->
      <VCard>
        <DialogCloseBtn @click="otpDialog = false" />
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -101,7 +101,7 @@ export default defineConfig({
        'shortcuts': [
          {
            'name': '推荐',
-            'url': './ranking',
+            'url': './recommend',
            'icons': [
              {
                'src': './sparkles-icon-192x192.png',
Author	SHA1	Message	Date
jxxghp	68c14c24b8	feat：为TMDB排序和风格字典添加类型定义，优化过滤参数的逻辑，确保参数有效性	2025-02-09 22:21:43 +08:00
jxxghp	d343d6d54d	feat：优化TheMovieDbView组件的watch逻辑，分离类型和过滤参数的监听，确保列表刷新更高效	2025-02-09 22:00:38 +08:00
jxxghp	391a160f97	更新 package.json	2025-02-09 11:59:53 +08:00
jxxghp	2d95110f75	feat：优化推荐页面，修复MediaCardSlideView的key绑定，使用电影标题作为唯一标识	2025-02-09 11:57:46 +08:00
jxxghp	e2ced8d36d	feat：更新TheMovieDbView组件，添加电影和电视剧风格字典，优化类型过滤逻辑	2025-02-09 11:55:40 +08:00
jxxghp	a2b4511602	feat：优化FormRender组件的属性解析逻辑，支持动态表达式绑定	2025-02-09 11:41:35 +08:00
jxxghp	bdccc71b64	feat：优化FormRender组件的事件处理逻辑，支持动态函数绑定	2025-02-09 11:28:28 +08:00
jxxghp	d7038a7d18	feat：优化FormRender组件，增强v-model和v-show支持，改进属性绑定逻辑；在TheMovieDbView中添加儿童类别	2025-02-09 11:21:46 +08:00
jxxghp	3998e1f685	Merge branch 'v2' of https://github.com/jxxghp/MoviePilot-Frontend into v2	2025-02-08 21:48:03 +08:00
jxxghp	5def9d5f81	feat：重构推荐页面，添加推荐数据源接口并更新路由和视图	2025-02-08 21:47:57 +08:00
jxxghp	c62937371e	更新 package.json	2025-02-08 20:19:12 +08:00
jxxghp	52843dcf97	feat：在排名页面中添加TMDB和豆瓣的热门电影及电视剧链接	2025-02-08 20:14:45 +08:00
jxxghp	ef5680d5ad	feat：在ExtraSourceView中添加默认过滤参数支持，确保过滤条件的完整性	2025-02-08 12:53:26 +08:00
jxxghp	bd3f24c84b	feat：添加媒体季信息接口，更新相关组件以支持季信息	2025-02-08 12:46:36 +08:00
jxxghp	399f85c52e	chore：更新版本号至2.2.7-1	2025-02-07 18:21:13 +08:00
jxxghp	14430e5c89	feat：为选中的v-chip添加自定义颜色样式	2025-02-07 18:09:40 +08:00
jxxghp	b703757d28	feat：添加评分格式化功能，优化媒体卡片中的评分显示	2025-02-07 17:00:35 +08:00
jxxghp	b642eabbb3	feat：在媒体相关组件中添加媒体ID、标题和年份的支持	2025-02-06 20:33:14 +08:00
jxxghp	673596d8f9	feat：在媒体信息中添加媒体ID前缀和媒体ID	2025-02-06 19:21:02 +08:00
jxxghp	b14e927e6c	feat：支持探索扩展	2025-02-06 18:04:49 +08:00
jxxghp	b03ae41ac7	feat：在index.html中添加初始加载背景样式	2025-02-06 16:26:10 +08:00
jxxghp	92a0a9fe2f	feat：重构主题存储逻辑，优化加载背景和颜色设置	2025-02-06 16:00:32 +08:00
jxxghp	2511acfea1	feat：优化加载背景样式	2025-02-06 13:48:03 +08:00
jxxghp	361a4e0414	feat：优化分组逻辑，使用元信息增强分组键	2025-02-06 11:42:32 +08:00
jxxghp	7e310236fe	feat：在转移历史视图中添加分组功能	2025-02-06 10:38:28 +08:00
jxxghp	8705606c70	更新 package.json	2025-02-06 08:39:54 +08:00
jxxghp	1f812a5258	feat：重构过滤选项逻辑，优化过滤表单和排序功能	2025-02-06 08:30:27 +08:00
jxxghp	e9264fa472	feat：小屏搜索结果列表模式增加过滤按钮	2025-02-05 17:40:57 +08:00
jxxghp	9164a1aefc	fix #295	2025-02-04 09:59:05 +08:00
jxxghp	30351a02ee	升级版本号	2025-01-31 08:00:53 +08:00
jxxghp	7f918408a6	优化加载界面的样式，调整HTML和CSS以改善用户体验	2025-01-31 08:00:30 +08:00
jxxghp	82f69bcad0	修复在小屏幕下的返回按钮显示逻辑	2025-01-30 21:18:02 +08:00
jxxghp	83b25eabbb	优化对话框组件的样式和属性设置	2025-01-29 19:21:57 +08:00
jxxghp	47da6db51a	为filterParams添加默认排序选项	2025-01-29 19:07:43 +08:00
jxxghp	eee092a7fd	fix #292	2025-01-29 18:57:22 +08:00
jxxghp	4c0f65fcbc	fix https://github.com/jxxghp/MoviePilot/issues/3823	2025-01-29 18:51:06 +08:00
jxxghp	acbd979569	bangumi添加年份过滤选项	2025-01-28 09:23:45 +08:00
jxxghp	52b68c18bf	优化标签显示效果	2025-01-28 09:11:52 +08:00
jxxghp	c6a74a75da	build	2025-01-28 08:23:28 +08:00
jxxghp	e39eb62f52	调整资源页面导入路径，修正TorrentCardListView和TorrentRowListView组件的引用	2025-01-28 08:22:44 +08:00
jxxghp	4ecec4865d	优化过滤选项，简化组件结构，添加评分滑块功能	2025-01-28 08:20:41 +08:00
jxxghp	589007a22a	优化主题设置逻辑，简化代码结构	2025-01-28 07:32:45 +08:00
jxxghp	4d4c9516c6	重构发现页面，添加豆瓣和TheMovieDb过滤选项，优化媒体卡组件	2025-01-27 21:08:52 +08:00
jxxghp	8491f26617	更新菜单项	2025-01-27 18:37:58 +08:00
jxxghp	fcb3768a76	更新菜单项图标，添加豆瓣和TheMovieDb的SVG和PNG图标	2025-01-27 18:16:57 +08:00
jxxghp	966bb769df	更新浏览和发现页面，重构相关组件，调整路由和菜单项	2025-01-27 18:05:02 +08:00
jxxghp	dc8f7caab0	更新 menu.ts	2025-01-27 12:25:42 +08:00
jxxghp	683346d652	添加发现页面及相关路由和菜单项	2025-01-27 11:25:43 +08:00
jxxghp	f5fe39b2d2	更新 App.vue	2025-01-26 22:28:30 +08:00
jxxghp	51beb53f51	更新 index.html	2025-01-26 22:27:41 +08:00
jxxghp	9d3f03c83a	更新 index.html	2025-01-26 22:14:10 +08:00
jxxghp	3eda1e4ef7	更新 index.html	2025-01-26 22:12:42 +08:00
jxxghp	7181f83d66	更新 Footer.vue	2025-01-26 22:10:10 +08:00
jxxghp	fffad6e1b8	更新 UserListView.vue	2025-01-26 22:08:32 +08:00
jxxghp	7f3906e5cb	更新 loader.css	2025-01-26 08:59:31 +08:00
jxxghp	f836d175f0	fix(App.vue): 优化页面加载时的背景移除逻辑，增加延迟以确保渲染完成	2025-01-26 08:48:22 +08:00
jxxghp	f49cafc0cc	feat: 添加确保渲染完成的函数并优化加载背景移除逻辑	2025-01-26 08:42:09 +08:00
jxxghp	a3ecad3436	feat: 添加刷新状态控制，优化多个视图的显示逻辑	2025-01-25 19:34:39 +08:00
jxxghp	a019dbd44e	refactor(SubscribeListView): 移除不必要的 VPullToRefresh 组件，简化订阅列表渲染逻辑	2025-01-25 19:15:02 +08:00
jxxghp	b316f960a1	Merge pull request #291 from InfinityPacer/v2	2025-01-25 07:43:42 +08:00
InfinityPacer	d049b26825	fix(LibraryCard): handle image loading errors with gradient	2025-01-25 03:07:14 +08:00
jxxghp	852579c6ee	更新 ForkSubscribeDialog.vue，调整 VCardSubtitle 的行数限制以改善文本显示	2025-01-23 17:24:17 +08:00
jxxghp	5adcfa1877	更新 ForkSubscribeDialog.vue	2025-01-22 19:10:27 +08:00
jxxghp	f74458629e	为 DashboardRender 组件添加 key 属性以优化渲染性能	2025-01-22 18:58:06 +08:00
jxxghp	798f9249f8	更新 package.json 版本号至 2.2.4	2025-01-22 18:48:28 +08:00
jxxghp	6b4383643f	为 ForkSubscribeDialog 组件添加用户关注功能，并在 DashboardRender 组件中实现组件重渲染	2025-01-22 13:19:09 +08:00
jxxghp	256e8d0452	为 ForkSubscribeDialog 组件的 VDialog 添加 scrollable 属性	2025-01-21 08:28:59 +08:00
jxxghp	4112214c1f	添加豆瓣用户字段并更新账号绑定标题	2025-01-20 18:25:28 +08:00
jxxghp	c183158ffe	更新 package.json	2025-01-20 13:25:49 +08:00
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 273.42 35.52"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" y1="17.76" x2="273.42" y2="17.76" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#90cea1"/><stop offset="0.56" stop-color="#3cbec9"/><stop offset="1" stop-color="#00b3e5"/></linearGradient></defs><title>Asset 3</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M191.85,35.37h63.9A17.67,17.67,0,0,0,273.42,17.7h0A17.67,17.67,0,0,0,255.75,0h-63.9A17.67,17.67,0,0,0,174.18,17.7h0A17.67,17.67,0,0,0,191.85,35.37ZM10.1,35.42h7.8V6.92H28V0H0v6.9H10.1Zm28.1,0H46V8.25h.1L55.05,35.4h6L70.3,8.25h.1V35.4h7.8V0H66.45l-8.2,23.1h-.1L50,0H38.2ZM89.14.12h11.7a33.56,33.56,0,0,1,8.08,1,18.52,18.52,0,0,1,6.67,3.08,15.09,15.09,0,0,1,4.53,5.52,18.5,18.5,0,0,1,1.67,8.25,16.91,16.91,0,0,1-1.62,7.58,16.3,16.3,0,0,1-4.38,5.5,19.24,19.24,0,0,1-6.35,3.37,24.53,24.53,0,0,1-7.55,1.15H89.14Zm7.8,28.2h4a21.66,21.66,0,0,0,5-.55A10.58,10.58,0,0,0,110,26a8.73,8.73,0,0,0,2.68-3.35,11.9,11.9,0,0,0,1-5.08,9.87,9.87,0,0,0-1-4.52,9.17,9.17,0,0,0-2.63-3.18A11.61,11.61,0,0,0,106.22,8a17.06,17.06,0,0,0-4.68-.63h-4.6ZM133.09.12h13.2a32.87,32.87,0,0,1,4.63.33,12.66,12.66,0,0,1,4.17,1.3,7.94,7.94,0,0,1,3,2.72,8.34,8.34,0,0,1,1.15,4.65,7.48,7.48,0,0,1-1.67,5,9.13,9.13,0,0,1-4.43,2.82V17a10.28,10.28,0,0,1,3.18,1,8.51,8.51,0,0,1,2.45,1.85,7.79,7.79,0,0,1,1.57,2.62,9.16,9.16,0,0,1,.55,3.2,8.52,8.52,0,0,1-1.2,4.68,9.32,9.32,0,0,1-3.1,3A13.38,13.38,0,0,1,152.32,35a22.5,22.5,0,0,1-4.73.5h-14.5Zm7.8,14.15h5.65a7.65,7.65,0,0,0,1.78-.2,4.78,4.78,0,0,0,1.57-.65,3.43,3.43,0,0,0,1.13-1.2,3.63,3.63,0,0,0,.42-1.8A3.3,3.3,0,0,0,151,8.6a3.42,3.42,0,0,0-1.23-1.13A6.07,6.07,0,0,0,148,6.9a9.9,9.9,0,0,0-1.85-.18h-5.3Zm0,14.65h7a8.27,8.27,0,0,0,1.83-.2,4.67,4.67,0,0,0,1.67-.7,3.93,3.93,0,0,0,1.23-1.3,3.8,3.8,0,0,0,.47-1.95,3.16,3.16,0,0,0-.62-2,4,4,0,0,0-1.58-1.18,8.23,8.23,0,0,0-2-.55,15.12,15.12,0,0,0-2.05-.15h-5.9Z"/></g></g></svg>