github-mirror/YesPlayMusic
2
0
Fork 0
mirror of https://github.com/qier222/YesPlayMusic.git synced 2025-02-18 11:22:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into i18n

Browse Source
This commit is contained in:
kunkka 2020-10-19 19:24:28 +08:00
commit 92a994b1a1
4 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/index.html
View File

@ -4,6 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="referrer" content="no-referrer">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>

27
src/components/Player.vue
View File

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

14
src/components/TrackListItem.vue
View File

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

3
src/views/loginAccount.vue
View File

@ -112,6 +112,7 @@ export default {
methods: { methods: {
...mapMutations(["updateUser", "updateUserInfo"]), ...mapMutations(["updateUser", "updateUserInfo"]),
afterLogin() { afterLogin() {
Cookies.set("MUSIC_U", true, { expires: 3650 });
Cookies.set("loginMode", "account", { expires: 3650 }); Cookies.set("loginMode", "account", { expires: 3650 });
userPlaylist({ userPlaylist({
uid: this.$store.state.settings.user.userId, uid: this.$store.state.settings.user.userId,
@ -128,7 +129,7 @@ export default {
this.processing = true; this.processing = true;
if (this.mode === "phone") { if (this.mode === "phone") {
if ( if (
this.countrycode === "" || this.countryCode === "" ||
this.phone === "" || this.phone === "" ||
this.password === "" this.password === ""
) { ) {