diff --git a/publish/changeLog.md b/publish/changeLog.md index 9e32ea0b..b617a897 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,7 @@ +### 优化 + +- 歌单列表添加歌单内歌曲数量显示,注:目前只有kw、mg、wy、tx(部分)源支持显示 + ### 修复 - 修复处于不支持的源时,歌单、排行榜的右键下载菜单没有禁用的问题 diff --git a/src/renderer/assets/svgs/headphones.svg b/src/renderer/assets/svgs/headphones.svg new file mode 100644 index 00000000..49d9ff50 --- /dev/null +++ b/src/renderer/assets/svgs/headphones.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/svgs/music.svg b/src/renderer/assets/svgs/music.svg new file mode 100644 index 00000000..36d700fa --- /dev/null +++ b/src/renderer/assets/svgs/music.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/utils/music/kw/songList.js b/src/renderer/utils/music/kw/songList.js index d801a8d1..3e00791a 100644 --- a/src/renderer/utils/music/kw/songList.js +++ b/src/renderer/utils/music/kw/songList.js @@ -137,6 +137,7 @@ export default { author: item.uname, name: item.name, // time: item.publish_time, + total: item.total, img: item.img, grade: item.favorcnt / 10, desc: item.desc, @@ -153,6 +154,7 @@ export default { id: `digest-${item.digest}__${item.id}`, author: item.uname, name: item.name, + total: item.total, // time: item.publish_time, img: item.img, grade: item.favorcnt && item.favorcnt / 10, diff --git a/src/renderer/utils/music/mg/songList.js b/src/renderer/utils/music/mg/songList.js index 998415c5..25fd2705 100644 --- a/src/renderer/utils/music/mg/songList.js +++ b/src/renderer/utils/music/mg/songList.js @@ -284,6 +284,7 @@ export default { // }) }, filterList(rawData) { + // console.log(rawData) return rawData.map(item => ({ play_count: this.formatPlayCount(item.playCount), id: item.playListId, @@ -292,6 +293,7 @@ export default { time: item.createTime, img: item.image, grade: item.grade, + total: item.contentCount, desc: item.summary, source: 'mg', })) diff --git a/src/renderer/utils/music/tx/songList.js b/src/renderer/utils/music/tx/songList.js index 727e0e72..eaa88276 100644 --- a/src/renderer/utils/music/tx/songList.js +++ b/src/renderer/utils/music/tx/songList.js @@ -142,6 +142,7 @@ export default { // time: item.publish_time, img: item.cover_url_medium, // grade: item.favorcnt / 10, + total: item.song_ids?.length, desc: item.desc, source: 'tx', })), diff --git a/src/renderer/utils/music/wy/songList.js b/src/renderer/utils/music/wy/songList.js index 8e826e6f..6d687056 100644 --- a/src/renderer/utils/music/wy/songList.js +++ b/src/renderer/utils/music/wy/songList.js @@ -218,6 +218,7 @@ export default { }) }, filterList(rawData) { + // console.log(rawData) return rawData.map(item => ({ play_count: this.formatPlayCount(item.playCount), id: item.id, @@ -226,6 +227,7 @@ export default { time: item.createTime, img: item.coverImgUrl, grade: item.grade, + total: item.trackCount, desc: item.description, source: 'wy', })) diff --git a/src/renderer/views/songList/SongList.vue b/src/renderer/views/songList/SongList.vue index a2c9f2f6..633dac93 100644 --- a/src/renderer/views/songList/SongList.vue +++ b/src/renderer/views/songList/SongList.vue @@ -33,7 +33,13 @@ div(:class="$style.container") //- img(:src="item.img") div(:class="$style.right" :src="item.img") h4 {{item.name}} - p(:class="$style.play_count") {{item.play_count}} + div(:class="$style.songlist_info") + span(v-if="item.total != null") + svg-icon(name="music") + | {{item.total}} + span + svg-icon(name="headphones") + | {{item.play_count}} p(:class="$style.author") {{item.author}} li(:class="$style.item" style="cursor: default;" v-for="i in spaceNum") div(:class="$style.pagination") @@ -529,7 +535,10 @@ export default { .mixin-ellipsis-2; } } -.play_count { +.songlist_info { + display: flex; + flex-flow: row nowrap; + gap: 15px; margin-top: 12px; font-size: 12px; .mixin-ellipsis-1; @@ -537,6 +546,9 @@ export default { line-height: 1.2; // text-indent: 24px; color: @color-theme_2-font-label; + svg { + margin-right: 2px; + } } .author { margin-top: 6px;