diff --git a/package.json b/package.json index 5150418..2192524 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "YesPlayMusic", - "version": "0.3.1", + "version": "0.3.2", "private": true, "description": "A third party music application for Netease Music", "author": "hawtim", @@ -8,10 +8,11 @@ "serve": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint", - "electron:build": "vue-cli-service electron:build -mwl -p never", - "electron:build-mac": "vue-cli-service electron:build -m -p never", - "electron:build-win": "vue-cli-service electron:build -w -p never", - "electron:build-linux": "vue-cli-service electron:build -l -p never", + "electron:build": "vue-cli-service electron:build -p never", + "electron:build-all": "vue-cli-service electron:build -p never -mwl", + "electron:build-mac": "vue-cli-service electron:build -p never -m", + "electron:build-win": "vue-cli-service electron:build -p never -w", + "electron:build-linux": "vue-cli-service electron:build -p never -l", "electron:serve": "vue-cli-service electron:serve", "electron:buildicon": "electron-icon-builder --input=./build/icons/icon.png --output=build --flatten", "electron:publish": "vue-cli-service electron:build -mwl -p always", diff --git a/src/App.vue b/src/App.vue index d834651..4063e21 100644 --- a/src/App.vue +++ b/src/App.vue @@ -16,7 +16,7 @@ - + diff --git a/src/components/Cover.vue b/src/components/Cover.vue index 000c77d..dc51b27 100644 --- a/src/components/Cover.vue +++ b/src/components/Cover.vue @@ -50,9 +50,12 @@ export default { }, computed: { imageStyles() { - let styles = {}; + let styles = { + objectFit: "cover", + }; if (this.fixedSize !== 0) { styles.width = this.fixedSize + "px"; + styles.height = this.fixedSize + "px"; } if (this.type === "artist") styles.borderRadius = "50%"; return styles; diff --git a/src/components/Player.vue b/src/components/Player.vue index b26035a..e4cc9b7 100644 --- a/src/components/Player.vue +++ b/src/components/Player.vue @@ -150,7 +150,6 @@ export default { return { interval: null, progress: 0, - oldVolume: 0.5, }; }, mounted() { diff --git a/src/views/library.vue b/src/views/library.vue index 10c9fbe..2054f08 100644 --- a/src/views/library.vue +++ b/src/views/library.vue @@ -174,7 +174,20 @@ export default { }); }, activated() { - this.loadData(); + if (!this.data.likedSongPlaylistID) { + userPlaylist({ + uid: this.data.user.userId, + limit: 1, + }).then((data) => { + this.updateData({ + key: "likedSongPlaylistID", + value: data.playlist[0].id, + }); + this.loadData(); + }); + } else { + this.loadData(); + } dailyTask(); }, computed: { @@ -204,7 +217,7 @@ export default { }, methods: { ...mapActions(["showToast"]), - ...mapMutations(["updateModal"]), + ...mapMutations(["updateModal", "updateData"]), playLikedSongs() { this.$store.state.player.playPlaylistByID( this.playlists[0].id, diff --git a/src/views/loginAccount.vue b/src/views/loginAccount.vue index a355a34..05395af 100644 --- a/src/views/loginAccount.vue +++ b/src/views/loginAccount.vue @@ -95,7 +95,6 @@ import NProgress from "nprogress"; import { loginWithPhone, loginWithEmail } from "@/api/auth"; import md5 from "crypto-js/md5"; import { mapMutations } from "vuex"; -import { userPlaylist } from "@/api/user"; export default { name: "Login", @@ -124,19 +123,6 @@ export default { }, methods: { ...mapMutations(["updateData"]), - afterLogin() { - this.updateData({ key: "loginMode", value: "account" }); - userPlaylist({ - uid: this.$store.state.data.user.userId, - limit: 1, - }).then((data) => { - this.updateData({ - key: "likedSongPlaylistID", - value: data.playlist[0].id, - }); - this.$router.push({ path: "/library" }); - }); - }, validatePhone() { if ( this.countryCode === "" || @@ -198,7 +184,8 @@ export default { } if (data.code === 200) { this.updateData({ key: "user", value: data.profile }); - this.afterLogin(); + this.updateData({ key: "loginMode", value: "account" }); + this.$router.push({ path: "/library" }); } else { this.processing = false; alert(data.msg ?? data.message); diff --git a/src/views/lyrics.vue b/src/views/lyrics.vue index 366128b..6bac0c5 100644 --- a/src/views/lyrics.vue +++ b/src/views/lyrics.vue @@ -543,7 +543,7 @@ export default { transition: all 0.5s ease; } .slide-fade-leave-active { - transition: all 0.5s cubic-bezier(1, 0.5, 0.8, 1); + transition: all 0.5s cubic-bezier(0.2, 0.2, 0, 1); } .slide-fade-enter, .slide-fade-leave-to { diff --git a/vue.config.js b/vue.config.js index 23ecf79..5e8872b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -68,16 +68,25 @@ module.exports = { output: "dist_electron", }, mac: { + target: [ + "dmg", + { + target: "zip", + // arch: ["x64", "arm64"], + }, + ], + // artifactName: "${productName}-${version}-${os}-${arch}.${ext}", category: "public.app-category.music", darkModeSupport: true, }, win: { + target: ["nsis", "portable"], publisherName: "YesPlayMusic", icon: "build/icons/icon.ico", publish: ["github"], }, linux: { - target: ["AppImage", "tar.gz", "deb", "rpm", "snap"], + target: ["AppImage", "tar.gz", "deb", "rpm", "snap", "pacman"], category: "Music", icon: "./build/icon.icns", },