From a47697fbfa8be8d5913e21f06ffdb63aca4b10ee Mon Sep 17 00:00:00 2001
From: qier222 <qier222@outlook.com>
Date: Thu, 15 Apr 2021 14:00:32 +0800
Subject: [PATCH] fix: bugs

---
 src/components/ButtonTwoTone.vue   |  1 +
 src/components/ContextMenu.vue     |  1 +
 src/components/DailyTracksCard.vue | 44 +++++++++++++++++-------------
 src/components/Navbar.vue          |  1 +
 src/utils/Player.js                |  9 ++++--
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/components/ButtonTwoTone.vue b/src/components/ButtonTwoTone.vue
index d2cde2b..097d769 100644
--- a/src/components/ButtonTwoTone.vue
+++ b/src/components/ButtonTwoTone.vue
@@ -73,6 +73,7 @@ button {
   color: var(--color-primary);
   margin-right: 12px;
   transition: 0.2s;
+  user-select: none;
   .svg-icon {
     width: 16px;
     height: 16px;
diff --git a/src/components/ContextMenu.vue b/src/components/ContextMenu.vue
index 84c3332..5a97855 100644
--- a/src/components/ContextMenu.vue
+++ b/src/components/ContextMenu.vue
@@ -60,6 +60,7 @@ export default {
 .context-menu {
   width: 100%;
   height: 100%;
+  user-select: none;
 }
 
 .menu {
diff --git a/src/components/DailyTracksCard.vue b/src/components/DailyTracksCard.vue
index b748346..06940aa 100644
--- a/src/components/DailyTracksCard.vue
+++ b/src/components/DailyTracksCard.vue
@@ -1,9 +1,6 @@
 <template>
-  <div
-    class="daily-recommend-card"
-    @click="goToDailyTracks"
-    :style="cardStyles"
-  >
+  <div class="daily-recommend-card" @click="goToDailyTracks">
+    <img :src="coverUrl" />
     <div class="container">
       <div class="title-box">
         <div class="title">
@@ -24,7 +21,7 @@
 import { mapMutations, mapState, mapActions } from "vuex";
 import { dailyRecommendTracks } from "@/api/playlist";
 import { isAccountLoggedIn } from "@/utils/auth";
-import { sample } from "lodash";
+import sample from "lodash/sample";
 
 const defaultCovers = [
   "https://p2.music.126.net/0-Ybpa8FrDfRgKYCTJD8Xg==/109951164796696795.jpg",
@@ -34,20 +31,20 @@ const defaultCovers = [
 
 export default {
   name: "DailyTracksCard",
-  created() {
-    if (this.dailyTracks.length === 0) this.loadDailyTracks();
+  data() {
+    return { useAnimation: false };
   },
   computed: {
     ...mapState(["dailyTracks"]),
     coverUrl() {
-      return this.dailyTracks[0]?.al.picUrl || sample(defaultCovers);
-    },
-    cardStyles() {
-      return {
-        background: `no-repeat url("${this.coverUrl}?param=1024y1024") center/cover`,
-      };
+      return `${
+        this.dailyTracks[0]?.al.picUrl || sample(defaultCovers)
+      }?param=1024y1024`;
     },
   },
+  created() {
+    if (this.dailyTracks.length === 0) this.loadDailyTracks();
+  },
   methods: {
     ...mapActions(["showToast"]),
     ...mapMutations(["updateDailyTracks"]),
@@ -81,15 +78,24 @@ export default {
 <style lang="scss" scoped>
 .daily-recommend-card {
   border-radius: 1rem;
-  animation: move 38s infinite;
-  animation-direction: alternate;
   height: 198px;
   cursor: pointer;
   position: relative;
+  overflow: hidden;
+}
+
+img {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  animation: move 38s infinite;
+  animation-direction: alternate;
+  z-index: -1;
 }
 
 .container {
-  background: linear-gradient(to left, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.38));
+  background: linear-gradient(to left, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.28));
   height: 198px;
   width: 50%;
   display: flex;
@@ -154,10 +160,10 @@ export default {
 
 @keyframes move {
   0% {
-    background-position: 0% 0%;
+    transform: translateY(0);
   }
   100% {
-    background-position: 0% 100%;
+    transform: translateY(-50%);
   }
 }
 </style>
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index da7ed08..36f4499 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -400,6 +400,7 @@ nav {
   align-items: center;
   justify-content: flex-end;
   .avatar {
+    user-select: none;
     height: 30px;
     margin-left: 12px;
     vertical-align: -7px;
diff --git a/src/utils/Player.js b/src/utils/Player.js
index 99fb5e8..f696e29 100644
--- a/src/utils/Player.js
+++ b/src/utils/Player.js
@@ -1,5 +1,5 @@
 import { getTrackDetail, scrobble, getMP3 } from "@/api/track";
-import { shuffle } from "lodash";
+import shuffle from "lodash/shuffle";
 import { Howler, Howl } from "howler";
 import { cacheTrackSource, getTrackSource } from "@/utils/db";
 import { getAlbum } from "@/api/album";
@@ -250,8 +250,8 @@ export default class {
     autoplay = true,
     ifUnplayableThen = "playNextTrack"
   ) {
-    if (autoplay) {
-      this._scrobble(this.currentTrack, this._howler.seek());
+    if (autoplay && this._currentTrack.name) {
+      this._scrobble(this.currentTrack, this._howler?.seek());
     }
     return getTrackDetail(id).then((data) => {
       let track = data.songs[0];
@@ -508,6 +508,9 @@ export default class {
     });
   }
   playPlaylistByID(id, trackID = "first", noCache = false) {
+    console.debug(
+      `[debug][Player.js] playPlaylistByID 👉 id:${id} trackID:${trackID} noCache:${noCache}`
+    );
     getPlaylistDetail(id, noCache).then((data) => {
       let trackIDs = data.playlist.trackIds.map((t) => t.id);
       this.replacePlaylist(trackIDs, id, "playlist", trackID);