From 6ce905548426d5eddc45e48d0bfee25bf818cfbf Mon Sep 17 00:00:00 2001
From: qier222 <qier222@outlook.com>
Date: Mon, 17 May 2021 19:20:21 +0800
Subject: [PATCH] fix: bugs

---
 netease_api/util/request.js |  2 +-
 src/App.vue                 |  4 ++--
 src/components/Player.vue   |  3 ++-
 src/utils/updateApp.js      | 12 ------------
 src/views/artist.vue        |  2 +-
 src/views/lyrics.vue        | 17 ++---------------
 src/views/settings.vue      |  3 ++-
 7 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/netease_api/util/request.js b/netease_api/util/request.js
index b15d694..7b4f45a 100644
--- a/netease_api/util/request.js
+++ b/netease_api/util/request.js
@@ -117,7 +117,7 @@ const createRequest = (method, url, data, options) => {
       headers: headers,
       data: queryString.stringify(data),
       httpAgent: new http.Agent({ keepAlive: true }),
-      httpsAgent: new https.Agent({ keepAlive: true }),
+      httpsAgent: new https.Agent({ keepAlive: true, rejectUnauthorized: false }),
     }
 
     if (options.crypto === 'eapi') settings.encoding = null
diff --git a/src/App.vue b/src/App.vue
index 7bf49be..fd423e5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -46,7 +46,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(['showLyrics', 'showLibraryDefault', 'player']),
+    ...mapState(['showLyrics', 'settings', 'player']),
     isAccountLoggedIn() {
       return isAccountLoggedIn();
     },
@@ -69,7 +69,7 @@ export default {
     },
   },
   created() {
-    this.showLibraryDefault && this.$router.push('/library');
+    this.settings.showLibraryDefault && this.$router.push('/library');
     if (this.isElectron) ipcRenderer(this);
     window.addEventListener('keydown', this.handleKeydown);
     this.fetchData();
diff --git a/src/components/Player.vue b/src/components/Player.vue
index a1dccca..7bd601c 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -11,7 +11,7 @@
       <vue-slider
         v-model="player.progress"
         :min="0"
-        :max="player.currentTrackDuration + 1"
+        :max="player.currentTrackDuration"
         :interval="1"
         :drag-on-click="true"
         :duration="0"
@@ -19,6 +19,7 @@
         :height="2"
         :tooltip-formatter="formatTrackTime"
         :lazy="true"
+        :silent="true"
       ></vue-slider>
     </div>
     <div class="controls">
diff --git a/src/utils/updateApp.js b/src/utils/updateApp.js
index cdab8cb..9b3c4ba 100644
--- a/src/utils/updateApp.js
+++ b/src/utils/updateApp.js
@@ -24,18 +24,6 @@ const updatePlayer = () => {
   let appVersion = localStorage.getItem('appVersion');
   if (appVersion === `"0.2.5"`) parsedData = {}; // 0.2.6版本重构了player
   const data = {
-    _repeatMode: 'off',
-    _shuffle: false,
-    _list: [],
-    _current: 0,
-    _playlistSource: {},
-    _volume: 1,
-    _volumeBeforeMuted: 1,
-    _currentTrack: {},
-    _playNextList: [],
-    _enabled: false,
-    _shuffledList: [],
-    _shuffledCurrent: 0,
     ...parsedData,
   };
   localStorage.setItem('player', JSON.stringify(data));
diff --git a/src/views/artist.vue b/src/views/artist.vue
index 06f1752..b6e504b 100644
--- a/src/views/artist.vue
+++ b/src/views/artist.vue
@@ -21,7 +21,7 @@
           >
         </div>
         <div class="buttons">
-          <ButtonTwoTone :icon-class="play" @click.native="playPopularSongs()">
+          <ButtonTwoTone icon-class="play" @click.native="playPopularSongs()">
             {{ $t('common.play') }}
           </ButtonTwoTone>
           <ButtonTwoTone color="grey" @click.native="followArtist">
diff --git a/src/views/lyrics.vue b/src/views/lyrics.vue
index 54b4e76..b57cc3d 100644
--- a/src/views/lyrics.vue
+++ b/src/views/lyrics.vue
@@ -77,7 +77,7 @@
                 <vue-slider
                   v-model="player.progress"
                   :min="0"
-                  :max="player.currentTrackDuration + 1"
+                  :max="player.currentTrackDuration"
                   :interval="1"
                   :drag-on-click="true"
                   :duration="0"
@@ -85,6 +85,7 @@
                   :height="2"
                   :tooltip-formatter="formatTrackTime"
                   :lazy="true"
+                  :silent="true"
                 ></vue-slider>
               </div>
               <span>{{ formatTrackTime(player.currentTrackDuration) }}</span>
@@ -221,17 +222,6 @@ export default {
     bgImageUrl() {
       return this.player.currentTrack?.al?.picUrl + '?param=500y500';
     },
-    progress: {
-      get() {
-        return this.playerRef.progress;
-      },
-      set(value) {
-        this.playerRef.setProgress(value);
-      },
-    },
-    progressMax() {
-      return this.playerRef.progressMax;
-    },
     lyricWithTranslation() {
       let ret = [];
       // 空内容的去除
@@ -268,9 +258,6 @@ export default {
         fontSize: `${this.$store.state.settings.lyricFontSize || 28}px`,
       };
     },
-    playerRef() {
-      return this.$parent.$refs.player ? this.$parent.$refs.player : {};
-    },
     noLyric() {
       return this.lyric.length == 0;
     },
diff --git a/src/views/settings.vue b/src/views/settings.vue
index a9b0b5b..72bdff3 100644
--- a/src/views/settings.vue
+++ b/src/views/settings.vue
@@ -503,7 +503,8 @@ export default {
     },
     enableUnblockNeteaseMusic: {
       get() {
-        return this.settings.enableUnblockNeteaseMusic || true;
+        const value = this.settings.enableUnblockNeteaseMusic;
+        return value !== undefined ? value : true;
       },
       set(value) {
         this.$store.commit('updateSettings', {