diff --git a/public/favicon.png b/public/favicon.png index a0da2226..297d7026 100644 Binary files a/public/favicon.png and b/public/favicon.png differ diff --git a/public/font/HarmonyOS_Sans_SC.woff2 b/public/font/HarmonyOS_Sans_SC.woff2 index 58adaa73..bc7a7c50 100644 Binary files a/public/font/HarmonyOS_Sans_SC.woff2 and b/public/font/HarmonyOS_Sans_SC.woff2 differ diff --git a/public/font/HarmonyOS_Sans_SC_Bold.woff2 b/public/font/HarmonyOS_Sans_SC_Bold.woff2 index 64473438..972e3d1c 100644 Binary files a/public/font/HarmonyOS_Sans_SC_Bold.woff2 and b/public/font/HarmonyOS_Sans_SC_Bold.woff2 differ diff --git a/public/images/icons/android-chrome-192x192.png b/public/images/icons/android-chrome-192x192.png index bd9ab01c..9e82ee57 100644 Binary files a/public/images/icons/android-chrome-192x192.png and b/public/images/icons/android-chrome-192x192.png differ diff --git a/public/images/icons/android-chrome-512x512.png b/public/images/icons/android-chrome-512x512.png index df10e7b5..8e1ed1a8 100644 Binary files a/public/images/icons/android-chrome-512x512.png and b/public/images/icons/android-chrome-512x512.png differ diff --git a/public/images/icons/apple-touch-icon.png b/public/images/icons/apple-touch-icon.png index 413ce39c..818740c5 100644 Binary files a/public/images/icons/apple-touch-icon.png and b/public/images/icons/apple-touch-icon.png differ diff --git a/public/images/icons/favicon-16x16.png b/public/images/icons/favicon-16x16.png index aa81f66e..3024a216 100644 Binary files a/public/images/icons/favicon-16x16.png and b/public/images/icons/favicon-16x16.png differ diff --git a/public/images/icons/favicon-192x192.png b/public/images/icons/favicon-192x192.png index bd9ab01c..9e82ee57 100644 Binary files a/public/images/icons/favicon-192x192.png and b/public/images/icons/favicon-192x192.png differ diff --git a/public/images/icons/favicon-256x256.png b/public/images/icons/favicon-256x256.png index a0da2226..c2efbaa4 100644 Binary files a/public/images/icons/favicon-256x256.png and b/public/images/icons/favicon-256x256.png differ diff --git a/public/images/icons/favicon-32x32.png b/public/images/icons/favicon-32x32.png index cebb937a..59393950 100644 Binary files a/public/images/icons/favicon-32x32.png and b/public/images/icons/favicon-32x32.png differ diff --git a/public/images/icons/favicon-512x512.png b/public/images/icons/favicon-512x512.png index df10e7b5..8e1ed1a8 100644 Binary files a/public/images/icons/favicon-512x512.png and b/public/images/icons/favicon-512x512.png differ diff --git a/public/images/icons/favicon-96x96.png b/public/images/icons/favicon-96x96.png index f79b1131..a5329857 100644 Binary files a/public/images/icons/favicon-96x96.png and b/public/images/icons/favicon-96x96.png differ diff --git a/public/images/icons/favicon.png b/public/images/icons/favicon.png index a9da5a8a..54afc389 100644 Binary files a/public/images/icons/favicon.png and b/public/images/icons/favicon.png differ diff --git a/public/images/icons/mstile-150x150.png b/public/images/icons/mstile-150x150.png index d2282c5a..653dea26 100644 Binary files a/public/images/icons/mstile-150x150.png and b/public/images/icons/mstile-150x150.png differ diff --git a/public/images/icons/next-dark.png b/public/images/icons/next-dark.png index 4aa2cd6d..136e9596 100644 Binary files a/public/images/icons/next-dark.png and b/public/images/icons/next-dark.png differ diff --git a/public/images/icons/next-light.png b/public/images/icons/next-light.png index eee6e307..84070727 100644 Binary files a/public/images/icons/next-light.png and b/public/images/icons/next-light.png differ diff --git a/public/images/icons/open-dark.png b/public/images/icons/open-dark.png index a95ca68c..df071c59 100644 Binary files a/public/images/icons/open-dark.png and b/public/images/icons/open-dark.png differ diff --git a/public/images/icons/open-light.png b/public/images/icons/open-light.png index 2a879acf..39816241 100644 Binary files a/public/images/icons/open-light.png and b/public/images/icons/open-light.png differ diff --git a/public/images/icons/pause-dark.png b/public/images/icons/pause-dark.png index 0a0ebfd4..0b1ebe55 100644 Binary files a/public/images/icons/pause-dark.png and b/public/images/icons/pause-dark.png differ diff --git a/public/images/icons/pause-light.png b/public/images/icons/pause-light.png index 8170920a..731c25aa 100644 Binary files a/public/images/icons/pause-light.png and b/public/images/icons/pause-light.png differ diff --git a/public/images/icons/play-dark.png b/public/images/icons/play-dark.png index ead2015b..e0eaa701 100644 Binary files a/public/images/icons/play-dark.png and b/public/images/icons/play-dark.png differ diff --git a/public/images/icons/play-light.png b/public/images/icons/play-light.png index b1fed91f..7005222a 100644 Binary files a/public/images/icons/play-light.png and b/public/images/icons/play-light.png differ diff --git a/public/images/icons/power-dark.png b/public/images/icons/power-dark.png index 7e84d729..35b2f646 100644 Binary files a/public/images/icons/power-dark.png and b/public/images/icons/power-dark.png differ diff --git a/public/images/icons/power-light.png b/public/images/icons/power-light.png index 98070652..646f7249 100644 Binary files a/public/images/icons/power-light.png and b/public/images/icons/power-light.png differ diff --git a/public/images/icons/prev-dark.png b/public/images/icons/prev-dark.png index 414c4f16..0eb88b79 100644 Binary files a/public/images/icons/prev-dark.png and b/public/images/icons/prev-dark.png differ diff --git a/public/images/icons/prev-light.png b/public/images/icons/prev-light.png index bf50d9a6..75ac6d78 100644 Binary files a/public/images/icons/prev-light.png and b/public/images/icons/prev-light.png differ diff --git a/public/images/icons/setting-dark.png b/public/images/icons/setting-dark.png index f7b0d1a1..1788d5b8 100644 Binary files a/public/images/icons/setting-dark.png and b/public/images/icons/setting-dark.png differ diff --git a/public/images/icons/setting-light.png b/public/images/icons/setting-light.png index 191566a9..275d5e5a 100644 Binary files a/public/images/icons/setting-light.png and b/public/images/icons/setting-light.png differ diff --git a/public/images/pic/album.jpg b/public/images/pic/album.jpg index 0df2ac0a..c3f59e85 100644 Binary files a/public/images/pic/album.jpg and b/public/images/pic/album.jpg differ diff --git a/public/images/pic/album.png b/public/images/pic/album.png deleted file mode 100644 index 49c784cc..00000000 Binary files a/public/images/pic/album.png and /dev/null differ diff --git a/public/images/pic/artist.jpg b/public/images/pic/artist.jpg index 45f29668..4f922b6f 100644 Binary files a/public/images/pic/artist.jpg and b/public/images/pic/artist.jpg differ diff --git a/public/images/pic/avatar.jpg b/public/images/pic/avatar.jpg deleted file mode 100644 index bd4f173f..00000000 Binary files a/public/images/pic/avatar.jpg and /dev/null differ diff --git a/public/images/pic/avatar.png b/public/images/pic/avatar.png new file mode 100644 index 00000000..2b79dbd9 Binary files /dev/null and b/public/images/pic/avatar.png differ diff --git a/public/images/pic/cover.jpg b/public/images/pic/cover.jpg index da11b241..35744e86 100644 Binary files a/public/images/pic/cover.jpg and b/public/images/pic/cover.jpg differ diff --git a/public/images/pic/hot-list.png b/public/images/pic/hot-list.png index d40949f0..79816d31 100644 Binary files a/public/images/pic/hot-list.png and b/public/images/pic/hot-list.png differ diff --git a/public/images/pic/like.jpg b/public/images/pic/like.jpg index d2d642a5..db4cb543 100644 Binary files a/public/images/pic/like.jpg and b/public/images/pic/like.jpg differ diff --git a/public/images/pic/pl-1.jpg b/public/images/pic/pl-1.jpg index f01b2cf5..7dcf037f 100644 Binary files a/public/images/pic/pl-1.jpg and b/public/images/pic/pl-1.jpg differ diff --git a/public/images/pic/pl-2.jpg b/public/images/pic/pl-2.jpg index 46930a86..79ae345b 100644 Binary files a/public/images/pic/pl-2.jpg and b/public/images/pic/pl-2.jpg differ diff --git a/public/images/pic/pl-3.jpg b/public/images/pic/pl-3.jpg index faa02874..3303f9d2 100644 Binary files a/public/images/pic/pl-3.jpg and b/public/images/pic/pl-3.jpg differ diff --git a/public/images/pic/pl-4.jpg b/public/images/pic/pl-4.jpg index d119c9b6..7f86986b 100644 Binary files a/public/images/pic/pl-4.jpg and b/public/images/pic/pl-4.jpg differ diff --git a/public/images/pic/pointer.png b/public/images/pic/pointer.png index 8bec5cbe..e8320c06 100644 Binary files a/public/images/pic/pointer.png and b/public/images/pic/pointer.png differ diff --git a/public/images/pic/radar-private.jpg b/public/images/pic/radar-private.jpg index 3f282291..a210a95a 100644 Binary files a/public/images/pic/radar-private.jpg and b/public/images/pic/radar-private.jpg differ diff --git a/public/images/pic/radar-treasure.jpg b/public/images/pic/radar-treasure.jpg index 62332bca..9311b3ca 100644 Binary files a/public/images/pic/radar-treasure.jpg and b/public/images/pic/radar-treasure.jpg differ diff --git a/public/images/pic/record.png b/public/images/pic/record.png index 7feedf2c..7f9d05c2 100644 Binary files a/public/images/pic/record.png and b/public/images/pic/record.png differ diff --git a/public/images/pic/song.jpg b/public/images/pic/song.jpg index 51e72482..21c70354 100644 Binary files a/public/images/pic/song.jpg and b/public/images/pic/song.jpg differ diff --git a/public/images/pic/video.jpg b/public/images/pic/video.jpg new file mode 100644 index 00000000..74973162 Binary files /dev/null and b/public/images/pic/video.jpg differ diff --git a/public/images/pic/video.png b/public/images/pic/video.png deleted file mode 100644 index 83dfdc88..00000000 Binary files a/public/images/pic/video.png and /dev/null differ diff --git a/public/images/pic/vip.png b/public/images/pic/vip.png index 343e56c8..9106a64b 100644 Binary files a/public/images/pic/vip.png and b/public/images/pic/vip.png differ diff --git "a/screenshots/SPlayer - \344\270\273\351\241\265\351\235\242.jpg" "b/screenshots/SPlayer - \344\270\273\351\241\265\351\235\242.jpg" index c080be32..d4f0fa7e 100644 Binary files "a/screenshots/SPlayer - \344\270\273\351\241\265\351\235\242.jpg" and "b/screenshots/SPlayer - \344\270\273\351\241\265\351\235\242.jpg" differ diff --git "a/screenshots/SPlayer - \345\217\221\347\216\260\351\241\265\351\235\242.jpg" "b/screenshots/SPlayer - \345\217\221\347\216\260\351\241\265\351\235\242.jpg" index 1793cd8a..f2605c16 100644 Binary files "a/screenshots/SPlayer - \345\217\221\347\216\260\351\241\265\351\235\242.jpg" and "b/screenshots/SPlayer - \345\217\221\347\216\260\351\241\265\351\235\242.jpg" differ diff --git "a/screenshots/SPlayer - \346\222\255\346\224\276\351\241\265\351\235\242.jpg" "b/screenshots/SPlayer - \346\222\255\346\224\276\351\241\265\351\235\242.jpg" index 51e948f8..bf227bc4 100644 Binary files "a/screenshots/SPlayer - \346\222\255\346\224\276\351\241\265\351\235\242.jpg" and "b/screenshots/SPlayer - \346\222\255\346\224\276\351\241\265\351\235\242.jpg" differ diff --git "a/screenshots/SPlayer - \346\234\254\345\234\260\351\237\263\344\271\220.jpg" "b/screenshots/SPlayer - \346\234\254\345\234\260\351\237\263\344\271\220.jpg" index c60004d3..f29106d9 100644 Binary files "a/screenshots/SPlayer - \346\234\254\345\234\260\351\237\263\344\271\220.jpg" and "b/screenshots/SPlayer - \346\234\254\345\234\260\351\237\263\344\271\220.jpg" differ diff --git "a/screenshots/SPlayer - \346\255\214\345\215\225\351\241\265\351\235\242.jpg" "b/screenshots/SPlayer - \346\255\214\345\215\225\351\241\265\351\235\242.jpg" index e59fbc45..f5c29b48 100644 Binary files "a/screenshots/SPlayer - \346\255\214\345\215\225\351\241\265\351\235\242.jpg" and "b/screenshots/SPlayer - \346\255\214\345\215\225\351\241\265\351\235\242.jpg" differ diff --git "a/screenshots/SPlayer - \350\257\204\350\256\272\351\241\265\351\235\242.jpg" "b/screenshots/SPlayer - \350\257\204\350\256\272\351\241\265\351\235\242.jpg" index 72c38eb1..1444c2e9 100644 Binary files "a/screenshots/SPlayer - \350\257\204\350\256\272\351\241\265\351\235\242.jpg" and "b/screenshots/SPlayer - \350\257\204\350\256\272\351\241\265\351\235\242.jpg" differ diff --git a/screenshots/SPlayer.jpg b/screenshots/SPlayer.jpg index b26e82a3..ef5fc2ac 100644 Binary files a/screenshots/SPlayer.jpg and b/screenshots/SPlayer.jpg differ diff --git a/screenshots/build.png b/screenshots/build.png index a0552ef4..b6883385 100644 Binary files a/screenshots/build.png and b/screenshots/build.png differ diff --git a/src/api/comment.js b/src/api/comment.js index 41fd4673..5d0c9aaa 100644 --- a/src/api/comment.js +++ b/src/api/comment.js @@ -95,3 +95,24 @@ export const likeComment = (id, cid, t, type = 0) => { }, }); }; + +/** + * 电台节目评论 + * @param {number} id - 电台节目的 id + * @param {number} limit - 取出评论数量 , 默认为 20 + * @param {number} offset - 偏移数量 , 用于分页 , 如 :( 评论页数 -1)*20, 其中 20 为 limit 的值 + * @param {string} before - 分页参数,取上一页最后一项的 time 获取下一页数据(获取超过 5000 条评论的时候需要用到) + */ +export const commentDj = (id, limit, offset, before) => { + return axios({ + method: "GET", + url: "/comment/dj", + params: { + id, + limit, + offset, + before, + timestamp: new Date().getTime(), + }, + }); +}; diff --git a/src/api/dj.js b/src/api/dj.js index fc1fad01..ce7e7ceb 100644 --- a/src/api/dj.js +++ b/src/api/dj.js @@ -118,6 +118,20 @@ export const getDjProgram = (rid, limit = 50, offset = 0) => { }); }; +/** + * 电台 - 节目详情 + * @param {string} id - 电台 的 id + */ +export const getDjProgramDetail = (id) => { + return axios({ + method: "GET", + url: "/dj/program/detail", + params: { + id, + }, + }); +}; + /** * 电台 - 订阅 * @param {number} rid - 电台 的 id diff --git a/src/components/Cover/MainCover.vue b/src/components/Cover/MainCover.vue index 5d21eb16..b586e855 100644 --- a/src/components/Cover/MainCover.vue +++ b/src/components/Cover/MainCover.vue @@ -40,7 +40,7 @@ class="loading-img" :src=" type === 'mv' - ? '/images/pic/video.png?assest' + ? '/images/pic/video.jpg?assest' : type === 'artist' ? '/images/pic/artist.jpg?assest' : '/images/pic/album.jpg?assest' diff --git a/src/components/List/CommentList.vue b/src/components/List/CommentList.vue index 7290b01f..66b06465 100644 --- a/src/components/List/CommentList.vue +++ b/src/components/List/CommentList.vue @@ -25,7 +25,7 @@ > diff --git a/src/components/Player/FullPlayer.vue b/src/components/Player/FullPlayer.vue index 3ce7e1bc..d0084178 100644 --- a/src/components/Player/FullPlayer.vue +++ b/src/components/Player/FullPlayer.vue @@ -79,13 +79,16 @@ class="main-player" >
-
+
{{ music.getPlaySongData.name || "未知曲目" }} diff --git a/src/components/Player/MainControl.vue b/src/components/Player/MainControl.vue index 9da3db1f..e6299759 100644 --- a/src/components/Player/MainControl.vue +++ b/src/components/Player/MainControl.vue @@ -94,7 +94,7 @@ [ { key: "add-pl", label: "添加到歌单", + show: playMode.value !== "dj", props: { onClick: () => { addPlaylistRef.value?.openAddToPlaylist(music.getPlaySongData?.id); @@ -431,6 +432,7 @@ const songMoreOptions = computed(() => [ path: "/comment", query: { id: music.getPlaySongData?.id, + type: playMode.value, }, }); }, @@ -440,7 +442,9 @@ const songMoreOptions = computed(() => [ { key: "mv", label: "观看 MV", - show: music.getPlaySongData?.mv && music.getPlaySongData?.mv !== 0 ? true : false, + show: + playMode.value !== "dj" && + (music.getPlaySongData?.mv && music.getPlaySongData?.mv !== 0 ? true : false), props: { onClick: () => { router.push({ @@ -456,7 +460,7 @@ const songMoreOptions = computed(() => [ { key: "download", label: "下载歌曲", - show: music.getPlaySongData?.path ? false : true, + show: playMode.value !== "dj" && (music.getPlaySongData?.path ? false : true), props: { onClick: () => { downloadSongRef.value?.openDownloadModal(music.getPlaySongData); diff --git a/src/components/Player/PlayerControl.vue b/src/components/Player/PlayerControl.vue index 3901e7c8..bbd4208c 100644 --- a/src/components/Player/PlayerControl.vue +++ b/src/components/Player/PlayerControl.vue @@ -122,12 +122,10 @@ @@ -311,6 +309,18 @@ const controlEnter = () => { const controlMove = (e) => { if (!e.target.closest(".slider")) e.stopPropagation(); }; + +// 跳转至评论 +const jumpToComment = () => { + showFullPlayer.value = false; + router.push({ + path: "/comment", + query: { + id: music.getPlaySongData?.id, + type: playMode.value, + }, + }); +};