diff --git a/src/components/common/SongItem.vue b/src/components/common/SongItem.vue index ae28f92..5dae756 100644 --- a/src/components/common/SongItem.vue +++ b/src/components/common/SongItem.vue @@ -63,6 +63,11 @@ const emits = defineEmits(['play']); // 播放音乐 设置音乐详情 打开音乐底栏 const playMusicEvent = async (item: SongResult) => { if (playMusic.value.id === item.id) { + if (play.value) { + store.commit('setPlayMusic', false); + } else { + store.commit('setPlayMusic', true); + } return; } await store.commit('setPlay', item); diff --git a/src/views/user/index.vue b/src/views/user/index.vue index fda4dc5..35f0ad9 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -38,11 +38,12 @@ const loadPage = async () => { const { data: playlistData } = await getUserPlaylist(user.value.userId); playList.value = playlistData.playlist; - // getUserRecord(user.value.userId).then(({ data: recordData }) => { - // recordList.value = recordData.allData; - // }); const { data: recordData } = await getUserRecord(user.value.userId); - recordList.value = recordData.allData; + recordList.value = recordData.allData.map((item: any) => ({ + ...item, + ...item.song, + picUrl: item.song.al.picUrl, + })); infoLoading.value = false; }; @@ -64,19 +65,6 @@ const showPlaylist = async (id: number) => { list.value = data.playlist; }; -// 格式化歌曲列表项 -const formatDetail = computed(() => (detail: any) => { - const song = { - artists: detail.ar, - name: detail.al.name, - id: detail.al.id, - }; - - detail.song = song; - detail.picUrl = detail.al.picUrl; - return detail; -}); - const handlePlay = () => { const tracks = recordList.value || []; store.commit('setPlayList', tracks); @@ -113,8 +101,8 @@ const handlePlay = () => {
{{ userDetail.profile.signature }}
-
创建的歌单
- +
创建的歌单
+
@@ -127,18 +115,18 @@ const handlePlay = () => {
-
+
听歌排行
- +
- +
{{ item.playCount }}次