Merge branch 'master' of github.com:qier222/YesPlayMusic

This commit is contained in:
kunkka 2020-10-19 19:23:52 +08:00
commit 43aad44fc0
2 changed files with 22 additions and 19 deletions

View File

@ -17,7 +17,10 @@
</div>
<div class="controls">
<div class="playing">
<img :src="currentTrack.al.picUrl | resizeImage" @click="goToAlbum" />
<img
:src="currentTrack.al.picUrl | resizeImage(224)"
@click="goToAlbum"
/>
<div class="track-info">
<div class="name" @click="goToList">
{{ currentTrack.name }}
@ -125,13 +128,13 @@ export default {
name: "Player",
components: {
ButtonIcon,
VueSlider,
VueSlider
},
data() {
return {
interval: null,
progress: 0,
oldVolume: 0.5,
oldVolume: 0.5
};
},
created() {
@ -139,7 +142,7 @@ export default {
this.progress = ~~this.howler.seek();
}, 1000);
if (this.isLoggedIn) {
userLikedSongsIDs(this.settings.user.userId).then((data) => {
userLikedSongsIDs(this.settings.user.userId).then(data => {
this.updateLikedSongs(data.ids);
});
}
@ -156,7 +159,7 @@ export default {
set(value) {
this.updatePlayerState({ key: "volume", value });
Howler.volume(value);
},
}
},
playing() {
if (this.howler.state() === "loading") {
@ -170,7 +173,7 @@ export default {
},
isLoggedIn() {
return isLoggedIn();
},
}
},
methods: {
...mapMutations([
@ -178,13 +181,13 @@ export default {
"turnOffShuffleMode",
"updatePlayerState",
"updateRepeatStatus",
"updateLikedSongs",
"updateLikedSongs"
]),
...mapActions([
"nextTrack",
"previousTrack",
"playTrackOnListByID",
"addNextTrackEvent",
"addNextTrackEvent"
]),
play() {
if (this.playing) {
@ -253,7 +256,7 @@ export default {
if (this.liked.songs.includes(id)) like = false;
likeATrack({ id, like }).then(() => {
if (like === false) {
this.updateLikedSongs(this.liked.songs.filter((d) => d !== id));
this.updateLikedSongs(this.liked.songs.filter(d => d !== id));
} else {
let newLikeSongs = this.liked.songs;
newLikeSongs.push(id);
@ -266,7 +269,7 @@ export default {
this.$router.push({ path: "/library/liked-songs" });
else
this.$router.push({
path: "/" + this.player.listInfo.type + "/" + this.player.listInfo.id,
path: "/" + this.player.listInfo.type + "/" + this.player.listInfo.id
});
},
goToAlbum() {
@ -274,8 +277,8 @@ export default {
},
goToArtist(id) {
this.$router.push({ path: "/artist/" + id });
},
},
}
}
};
</script>

View File

@ -6,7 +6,7 @@
@mouseover="focus = true"
@mouseleave="focus = false"
>
<img :src="imgUrl | resizeImage" v-if="!isAlbum" @click="goToAlbum" />
<img :src="imgUrl | resizeImage(224)" v-if="!isAlbum" @click="goToAlbum" />
<div class="no" v-if="isAlbum">
<button
class="play-button"
@ -52,7 +52,7 @@
icon-class="heart"
:style="{
visibility:
focus && !isLiked && track.playable ? 'visible' : 'hidden',
focus && !isLiked && track.playable ? 'visible' : 'hidden'
}"
></svg-icon>
<svg-icon icon-class="heart-solid" v-show="isLiked"></svg-icon>
@ -75,7 +75,7 @@ export default {
name: "TrackListItem",
components: { ArtistsInLine, ExplicitSymbol },
props: {
track: Object,
track: Object
},
data() {
return { focus: false, trackStyle: {} };
@ -117,7 +117,7 @@ export default {
},
isLoggedIn() {
return isLoggedIn();
},
}
},
methods: {
goToAlbum() {
@ -135,19 +135,19 @@ export default {
if (like === false) {
this.$store.commit(
"updateLikedSongs",
likedSongs.filter((d) => d !== id)
likedSongs.filter(d => d !== id)
);
} else {
likedSongs.push(id);
this.$store.commit("updateLikedSongs", likedSongs);
}
});
},
}
},
created() {
if (this.$parent.itemWidth !== -1)
this.trackStyle = { width: this.$parent.itemWidth + "px" };
},
}
};
</script>