From bcf55e63f138164cf332aebf44f672eef38ffa1e Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 8 May 2024 08:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=83=AD=E9=97=A8=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E7=83=AD=E5=BA=A6=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                 |  4 ++--
 src/components/cards/MediaCard.vue           | 24 +++++---------------
 src/views/subscribe/SubscribePopularView.vue |  8 ++++++-
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 991ac149..0aa91276 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.8.6-1",
+  "version": "1.8.6-2",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
@@ -114,4 +114,4 @@
   "resolutions": {
     "postcss": "8"
   }
-}
+}
\ No newline at end of file
diff --git a/src/components/cards/MediaCard.vue b/src/components/cards/MediaCard.vue
index 47a171c3..ddba06b8 100644
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -58,7 +58,7 @@ const seasonInfos = ref<TmdbSeason[]>([])
 const seasonsSelected = ref<TmdbSeason[]>([])
 
 // 来源角标字典
-const sourceIconDict = {
+const sourceIconDict: { [key: string]: any } = {
   themoviedb: tmdbImage,
   douban: doubanImage,
   bangumi: bangumiImage,
@@ -66,11 +66,9 @@ const sourceIconDict = {
 
 // 获得mediaid
 function getMediaId() {
-  return props.media?.tmdb_id
-    ? `tmdb:${props.media?.tmdb_id}`
-    : props.media?.douban_id
-    ? `douban:${props.media?.douban_id}`
-    : `bangumi:${props.media?.bangumi_id}`
+  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}`
 }
 
 // 订阅弹窗选择的多季
@@ -460,17 +458,7 @@ function getYear(airDate: string) {
           </p>
           <div class="flex align-center justify-between">
             <IconBtn icon="mdi-magnify" color="white" @click.stop="handleSearch" />
-            <VTooltip v-if="props.media?.popularity" :text="'流行度：' + props.media?.popularity?.toString()">
-              <template #activator="{ props }">
-                <IconBtn
-                  v-bind="props"
-                  icon="mdi-heart"
-                  :color="isSubscribed ? 'error' : 'white'"
-                  @click.stop="handleSubscribe"
-                />
-              </template>
-            </VTooltip>
-            <IconBtn v-else icon="mdi-heart" :color="isSubscribed ? 'error' : 'white'" @click.stop="handleSubscribe" />
+            <IconBtn icon="mdi-heart" :color="isSubscribed ? 'error' : 'white'" @click.stop="handleSubscribe" />
           </div>
         </VCardText>
         <VAvatar
@@ -478,7 +466,7 @@ function getYear(airDate: string) {
           density="compact"
           class="absolute bottom-1 right-1"
           tile
-          v-if="!hover.isHovering && isImageLoaded"
+          v-if="!hover.isHovering && isImageLoaded && props.media?.source"
         >
           <VImg cover :src="sourceIconDict[props.media?.source]" class="shadow-lg" />
         </VAvatar>
diff --git a/src/views/subscribe/SubscribePopularView.vue b/src/views/subscribe/SubscribePopularView.vue
index 924bea77..40c4f255 100644
--- a/src/views/subscribe/SubscribePopularView.vue
+++ b/src/views/subscribe/SubscribePopularView.vue
@@ -113,7 +113,13 @@ async function fetchData({ done }: { done: any }) {
     <template #loading />
     <template #empty />
     <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 v-for="data in dataList" :key="data.tmdb_id || data.douban_id">
+        <MediaCard :media="data" />
+        <div class="mt-2 flex flex-row justify-center align-center text-subtitle-2">
+          <VIcon icon="mdi-fire" color="error" />
+          <span> {{ data.popularity }}</span>
+        </div>
+      </div>
     </div>
     <NoDataFound
       v-if="dataList.length === 0 && isRefreshed"