From 0c3899840bcc8844951a9abb3fd512e3c0de37a2 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 25 Jun 2020 15:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=99=E9=9F=B3=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/core/Player.vue | 14 ++++++++++----
 src/renderer/store/mutations.js         |  6 +++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 814b5f74..3772f70f 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -24,8 +24,9 @@ div(:class="$style.player")
           div(:class="[$style.progressBar, $style.progressBar2, isActiveTransition ? $style.barTransition : '']" @transitionend="handleTransitionEnd" :style="{ transform: `scaleX(${progress || 0})` }")
         div(:class="$style.progressMask" @click='handleSetProgress' ref="dom_progress")
       div(:class="$style.column3")
-        span {{nowPlayTimeStr}}
         span(:class="$style.statusText") {{statusText}}
+        span {{nowPlayTimeStr}}
+        span(style="margin: 0 5px;") /
         span {{maxPlayTimeStr}}
   div(:class="$style.right")
     div(:class="$style.playBtn" @click='handlePrev' :title="$t('core.player.next')" style="transform: rotate(180deg);")
@@ -80,7 +81,7 @@ export default {
       maxPlayTime: 0,
       isPlay: false,
       status: '',
-      statusText: '^-^',
+      statusText: '',
       musicInfo: {
         songmid: null,
         img: null,
@@ -625,6 +626,10 @@ export default {
       // console.log(val)
       if (audio) audio.volume = this.volume
     },
+    handleSetVolumeMute() {
+      audio.muted = !audio.muted
+      this.setVolume(audio.muted)
+    },
     handleVolumeMsUp(e) {
       this.volumeEvent.isMsDown = false
     },
@@ -806,6 +811,7 @@ export default {
     fill: currentColor;
   }
   img {
+    box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
     max-width: 100%;
     max-height: 100%;
     transition: @transition-theme;
@@ -1001,9 +1007,9 @@ export default {
   transition-property: color;
   color: @color-player-status-text;
   .mixin-ellipsis-1;
-  padding: 0 5px;
+  // padding: 0 5px;
   flex: 1 1 0;
-  text-align: center;
+  // text-align: center;
   line-height: 1.2;
   width: 0;
 }
diff --git a/src/renderer/store/mutations.js b/src/renderer/store/mutations.js
index 3c710273..1d9648b4 100644
--- a/src/renderer/store/mutations.js
+++ b/src/renderer/store/mutations.js
@@ -43,7 +43,11 @@ export default {
     state.setting.ignoreVersion = version
   },
   setVolume(state, val) {
-    state.setting.player.volume = val
+    if (typeof val == 'boolean') {
+      state.setting.player.isMute = val
+    } else {
+      state.setting.player.volume = val
+    }
   },
   setMediaDeviceId(state, val) {
     state.setting.player.mediaDeviceId = val