From 51d11e83164905d44a0f3dc27864c49b7020a1e9 Mon Sep 17 00:00:00 2001
From: qier222 <qier222@outlook.com>
Date: Sun, 31 Jan 2021 20:40:19 +0800
Subject: [PATCH] fix: bugs

---
 src/App.vue                |  4 ++++
 src/components/Player.vue  | 33 +++++++++++++++++----------------
 src/utils/Player.js        |  2 +-
 src/views/loginAccount.vue |  2 +-
 vue.config.js              | 10 +++++++---
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4063e21..ff33a46 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -178,6 +178,10 @@ a {
 ::-webkit-scrollbar-thumb {
   -webkit-border-radius: 10px;
   border-radius: 10px;
+  background: rgba(128, 128, 128, 0.38);
+}
+
+[data-theme="dark"] ::-webkit-scrollbar-thumb {
   background: var(--color-secondary-bg);
 }
 
diff --git a/src/components/Player.vue b/src/components/Player.vue
index 3d78efd..2d6d9d5 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -133,17 +133,17 @@
               ></vue-slider>
             </div>
           </div>
+
+          <button-icon
+            class="lyrics-button"
+            title="歌词"
+            style="margin-left: 12px"
+            @click.native.stop="toggleLyrics"
+            ><svg-icon icon-class="arrow-up"
+          /></button-icon>
         </div>
       </div>
     </div>
-
-    <button-icon
-      class="lyrics-button"
-      title="Lyrics"
-      style="margin-left: 12px"
-      @click.native.stop="toggleLyrics"
-      ><svg-icon icon-class="arrow-up"
-    /></button-icon>
   </div>
 </template>
 
@@ -402,6 +402,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
+  padding: 0 8px;
   .button-icon {
     margin: 0 8px;
   }
@@ -447,12 +448,12 @@ export default {
   margin-left: 16px;
 }
 
-.lyrics-button {
-  position: fixed;
-  right: 18px;
-  .svg-icon {
-    height: 20px;
-    width: 20px;
-  }
-}
+// .lyrics-button {
+//   position: fixed;
+//   right: 18px;
+//   .svg-icon {
+//     height: 20px;
+//     width: 20px;
+//   }
+// }
 </style>
diff --git a/src/utils/Player.js b/src/utils/Player.js
index a04ba88..9bf98df 100644
--- a/src/utils/Player.js
+++ b/src/utils/Player.js
@@ -277,7 +277,7 @@ export default class {
   _nextTrackCallback() {
     this._scrobble(true);
     if (this.repeatMode === "one") {
-      this._howler.play();
+      this._replaceCurrentTrack(this._currentTrack.id);
     } else {
       this.playNextTrack();
     }
diff --git a/src/views/loginAccount.vue b/src/views/loginAccount.vue
index 6cae5c6..72d1b7b 100644
--- a/src/views/loginAccount.vue
+++ b/src/views/loginAccount.vue
@@ -136,7 +136,7 @@ export default {
       return true;
     },
     validateEmail() {
-      const emailReg = /^[A-Za-z0-9]+([_][A-Za-z0-9]+)*@([A-Za-z0-9]+\.)+[A-Za-z]{2,6}$/;
+      const emailReg = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
       if (
         this.email === "" ||
         this.password === "" ||
diff --git a/vue.config.js b/vue.config.js
index 5e8872b..6e49e9b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -69,13 +69,17 @@ module.exports = {
         },
         mac: {
           target: [
-            "dmg",
+            {
+              target: "dmg",
+              arch: ["arm64", "x64"],
+            },
             {
               target: "zip",
-              // arch: ["x64", "arm64"],
+              arch: ["arm64", "x64"],
+              // arch: ["universal"]
             },
           ],
-          // artifactName: "${productName}-${version}-${os}-${arch}.${ext}",
+          artifactName: "${productName}-${arch}.${ext}",
           category: "public.app-category.music",
           darkModeSupport: true,
         },