From 2a2ac5a37d02d9ca46c7163571e2bfedddea91b2 Mon Sep 17 00:00:00 2001
From: memorydream <34763046+memorydream@users.noreply.github.com>
Date: Sun, 19 Jun 2022 20:51:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=81=E4=BA=BA=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E6=AD=8C=E5=8D=95=20(#1665)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 私人推荐歌单

* update
---
 src/api/playlist.js    |  5 ++++-
 src/utils/playList.js  | 39 +++++++++++++++++++++++++++++++++++++++
 src/views/explore.vue  | 12 ++++--------
 src/views/home.vue     | 11 +++++------
 src/views/playlist.vue |  4 ++++
 5 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/src/api/playlist.js b/src/api/playlist.js
index 58f6b98..08177ea 100644
--- a/src/api/playlist.js
+++ b/src/api/playlist.js
@@ -26,7 +26,10 @@ export function dailyRecommendPlaylist(params) {
   return request({
     url: '/recommend/resource',
     method: 'get',
-    params,
+    params: {
+      params,
+      timestamp: Date.now(),
+    },
   });
 }
 /**
diff --git a/src/utils/playList.js b/src/utils/playList.js
index f476f28..d135fc3 100644
--- a/src/utils/playList.js
+++ b/src/utils/playList.js
@@ -1,5 +1,11 @@
 import router from '../router';
 import state from '../store/state';
+import {
+  recommendPlaylist,
+  dailyRecommendPlaylist,
+  getPlaylistDetail,
+} from '@/api/playlist';
+import { isAccountLoggedIn } from '@/utils/auth';
 
 export function hasListSource() {
   return !state.player.isPersonalFM && state.player.playlistSource.id !== 0;
@@ -20,3 +26,36 @@ export function getListSourcePath() {
     return `/${state.player.playlistSource.type}/${state.player.playlistSource.id}`;
   }
 }
+
+export async function getRecommendPlayList(limit, removePrivateRecommand) {
+  if (isAccountLoggedIn()) {
+    const playlists = await Promise.all([
+      dailyRecommendPlaylist(),
+      recommendPlaylist({ limit }),
+    ]);
+    let recommend = playlists[0].recommend ?? [];
+    if (recommend.length) {
+      if (removePrivateRecommand) recommend = recommend.slice(1);
+      await replaceRecommendResult(recommend);
+    }
+    return recommend.concat(playlists[1].result).slice(0, limit);
+  } else {
+    const response = await recommendPlaylist({ limit });
+    return response.result;
+  }
+}
+
+async function replaceRecommendResult(recommend) {
+  for (let r of recommend) {
+    if (specialPlaylist.indexOf(r.id) > -1) {
+      const data = await getPlaylistDetail(r.id, true);
+      const playlist = data.playlist;
+      if (playlist) {
+        r.name = playlist.name;
+        r.picUrl = playlist.coverImgUrl;
+      }
+    }
+  }
+}
+
+const specialPlaylist = [3136952023, 2829883282, 2829816518, 2829896389];
diff --git a/src/views/explore.vue b/src/views/explore.vue
index 2e5057b..ef190df 100644
--- a/src/views/explore.vue
+++ b/src/views/explore.vue
@@ -66,13 +66,9 @@
 <script>
 import { mapState, mapMutations } from 'vuex';
 import NProgress from 'nprogress';
-import {
-  topPlaylist,
-  highQualityPlaylist,
-  recommendPlaylist,
-  toplists,
-} from '@/api/playlist';
+import { topPlaylist, highQualityPlaylist, toplists } from '@/api/playlist';
 import { playlistCategories } from '@/utils/staticData';
+import { getRecommendPlayList } from '@/utils/playList';
 
 import ButtonTwoTone from '@/components/ButtonTwoTone.vue';
 import CoverRow from '@/components/CoverRow.vue';
@@ -155,9 +151,9 @@ export default {
       return this.getTopPlayList();
     },
     getRecommendPlayList() {
-      recommendPlaylist({ limit: 100 }).then(data => {
+      getRecommendPlayList(100, true).then(list => {
         this.playlists = [];
-        this.updatePlaylist(data.result);
+        this.updatePlaylist(list);
       });
     },
     getHighQualityPlaylist() {
diff --git a/src/views/home.vue b/src/views/home.vue
index 2d2a090..b166e7e 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -69,10 +69,11 @@
 </template>
 
 <script>
-import { toplists, recommendPlaylist } from '@/api/playlist';
+import { toplists } from '@/api/playlist';
 import { toplistOfArtists } from '@/api/artist';
-import { byAppleMusic } from '@/utils/staticData';
 import { newAlbums } from '@/api/album';
+import { byAppleMusic } from '@/utils/staticData';
+import { getRecommendPlayList } from '@/utils/playList';
 import NProgress from 'nprogress';
 import { mapState } from 'vuex';
 import CoverRow from '@/components/CoverRow.vue';
@@ -112,10 +113,8 @@ export default {
       setTimeout(() => {
         if (!this.show) NProgress.start();
       }, 1000);
-      recommendPlaylist({
-        limit: 10,
-      }).then(data => {
-        this.recommendPlaylist.items = data.result;
+      getRecommendPlayList(10, false).then(items => {
+        this.recommendPlaylist.items = items;
         NProgress.done();
         this.show = true;
       });
diff --git a/src/views/playlist.vue b/src/views/playlist.vue
index 339d0a5..f735b84 100644
--- a/src/views/playlist.vue
+++ b/src/views/playlist.vue
@@ -318,6 +318,10 @@ const specialPlaylist = {
     name: '一周原创发现',
     gradient: 'gradient-blue-purple',
   },
+  2829883282: {
+    name: '华语私人雷达',
+    gradient: 'gradient-yellow-red',
+  },
   3136952023: {
     name: '私人雷达',
     gradient: 'gradient-radar',