diff --git a/src/components/Player.vue b/src/components/Player.vue index 6065fdd..d6994dd 100644 --- a/src/components/Player.vue +++ b/src/components/Player.vue @@ -17,19 +17,18 @@
- - +
-
- {{ currentTrack.name }} +
+ {{ currentTrack.name }}
- - {{ ar.name }} + + {{ ar.name }} ,
@@ -175,7 +174,6 @@ export default { }, methods: { ...mapMutations([ - "updatePlayerList", "turnOnShuffleMode", "turnOffShuffleMode", "updatePlayerState", @@ -263,6 +261,20 @@ export default { } }); }, + goToList() { + if (this.player.listInfo.id === this.settings.user.likedSongPlaylistID) + this.$router.push({ path: "/library/liked-songs" }); + else + this.$router.push({ + path: "/" + this.player.listInfo.type + "/" + this.player.listInfo.id, + }); + }, + goToAlbum() { + this.$router.push({ path: "/album/" + this.currentTrack.al.id }); + }, + goToArtist(id) { + this.$router.push({ path: "/artist/" + id }); + }, }, }; @@ -307,6 +319,7 @@ export default { height: 46px; border-radius: 5px; box-shadow: 0 6px 8px -2px rgba(0, 0, 0, 0.16); + cursor: pointer; } .track-info { height: 46px; @@ -337,7 +350,7 @@ export default { -webkit-line-clamp: 1; overflow: hidden; word-break: break-all; - a { + span { cursor: pointer; &:hover { text-decoration: underline; diff --git a/src/router/index.js b/src/router/index.js index 7d3056d..5135fef 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -93,7 +93,7 @@ const routes = [ { path: "/library/liked-songs", name: "likedSongs", - component: () => import("@/views/likedSongs"), + component: () => import("@/views/playlist"), meta: { requireLogin: true, }, diff --git a/src/views/likedSongs.vue b/src/views/likedSongs.vue deleted file mode 100644 index 335576f..0000000 --- a/src/views/likedSongs.vue +++ /dev/null @@ -1,235 +0,0 @@ - - - - - diff --git a/src/views/playlist.vue b/src/views/playlist.vue index 2e4b851..1c72214 100644 --- a/src/views/playlist.vue +++ b/src/views/playlist.vue @@ -1,6 +1,6 @@