From bd553e32646a56976047b13b0fd8adc9b44930a6 Mon Sep 17 00:00:00 2001
From: CosineSky <11737516+cosinesky@user.noreply.gitee.com>
Date: Thu, 19 Dec 2024 19:32:45 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=88=A0=E9=99=A4=E4=BA=86=E9=9D=99?=
=?UTF-8?q?=E6=80=81=E7=9A=84=E2=80=9C=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
=?UTF-8?q?=E2=80=9C=E9=BB=98=E8=AE=A4=E6=AD=8C=E5=8D=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/playlist.js | 1 +
src/components/LeftSideBar.vue | 23 +++++++++--------------
src/views/HomePage.vue | 3 +++
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/api/playlist.js b/src/api/playlist.js
index 5d36d08..704a702 100644
--- a/src/api/playlist.js
+++ b/src/api/playlist.js
@@ -8,6 +8,7 @@ import { PLAYLIST_MODULE } from './_prefix';
+ user_id: number
*/
export const getPlaylistsByUser = (userInfo) => {
+ console.log(userInfo)
return axios.get(`${PLAYLIST_MODULE}/fetch`, { params: userInfo })
.then(res => {
return res;
diff --git a/src/components/LeftSideBar.vue b/src/components/LeftSideBar.vue
index d9c984d..b66880f 100644
--- a/src/components/LeftSideBar.vue
+++ b/src/components/LeftSideBar.vue
@@ -21,6 +21,12 @@ const criticalWidth = 180;
const maximumWidth = 310;
const minWidth = 75;
+/*
+ USER
+ */
+const userToken = ref(JSON.parse(sessionStorage.getItem('user-token')));
+const currentUserId = ref(userToken.value.id);
+
function toggleSideBar() {
isSideBarOpen = !isSideBarOpen;
sideBarWidth.value = isSideBarOpen ? criticalWidth : minWidth;
@@ -77,7 +83,7 @@ function searchAlbum() {
onMounted(() => {
getPlaylistsByUser({
- user_id: 1,
+ user_id: currentUserId.value
}).then(res => {
musicAlbums.value = res.data.result || []
}).catch(e => {
@@ -130,18 +136,6 @@ defineProps({
:style="{ scrollbarWidth : hoverOnAlbum? 'auto':'none'}">
- <div class="musicAlbum-item">
- <img
- src="../assets/icons/heart.png"
- alt="playlist"
- class="musicAlbum-image"
- :style="{opacity: 1}"
- />
- <div class="musicAlbum-description">
- <p style="padding-bottom: 5px;font-size: 18px">鎴戝枩娆㈢殑姝屾洸</p>
- <p style="color: #b2b2b2;font-size: 13px">榛樿鏀惰棌澶�</p>
- </div>
- </div>
<div v-if="musicAlbums !== undefined" v-for="album in musicAlbums"
:key="album.id"
@mouseenter="()=>{albumHoveredIndex = album.id}"
@@ -159,7 +153,8 @@ defineProps({
<div class="musicAlbum-description">
<p style="padding-bottom: 5px;font-size: 18px">{{ album.title }}</p>
- <p style="color: #b2b2b2;font-size: 13px">姝屽崟 鈥� {{ user }}</p>
+ <p v-if="album.title !== '鎴戝枩娆㈢殑姝屾洸'" style="color: #b2b2b2;font-size: 13px">姝屽崟 鈥� {{ user }}</p>
+ <p v-else style="color: #b2b2b2;font-size: 13px">榛樿鏀惰棌澶�</p>
</div>
</div>
</div>
diff --git a/src/views/HomePage.vue b/src/views/HomePage.vue
index 0f2da48..222ab13 100644
--- a/src/views/HomePage.vue
+++ b/src/views/HomePage.vue
@@ -330,6 +330,7 @@ const userToken = ref(JSON.parse(sessionStorage.getItem('user-token')));
const currentUserId = ref(userToken.value.id);
+
/*
SONGS
*/
@@ -487,10 +488,12 @@ onMounted(() => {
/*
API
*/
+ console.log("L: ", currentUserId.value)
getPlaylistsByUser({
user_id: currentUserId.value,
}).then((res) => {
playlists.value = res.data.result;
+ console.log("playlists: ", playlists.value);
currentPlaylist.value = playlists.value[0];
displayingPlaylist.value = playlists.value[0];
currentPlaylistId.value = currentPlaylist.value.id;
--
GitLab