From 43c505115812141ae2548e3f0c1692bc48676eab Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 16 Feb 2022 10:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=92=AD=E6=94=BE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E6=97=B6=E9=9A=90=E8=97=8F=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/core/PlayBar/index.vue         | 24 ++++++++++++++-----
 .../components/core/PlayDetail/PlayBar.vue    | 13 +++++-----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/renderer/components/core/PlayBar/index.vue b/src/renderer/components/core/PlayBar/index.vue
index 3b6568fb..169f7c4f 100644
--- a/src/renderer/components/core/PlayBar/index.vue
+++ b/src/renderer/components/core/PlayBar/index.vue
@@ -10,12 +10,13 @@ div(:class="$style.player")
         div(:class="$style.title" @click="handleCopy(title)" :tips="title + $t('copy_tip')") {{title}}
         control-btns
     div(:class="$style.column2")
-      common-progress-bar(:progress="progress" :handleTransitionEnd="handleTransitionEnd" :isActiveTransition="isActiveTransition")
+      common-progress-bar(:progress="progress" :handleTransitionEnd="handleTransitionEnd" :isActiveTransition="isActiveTransition" v-if="!isShowPlayerDetail")
     div(:class="$style.column3")
-      span(:class="$style.statusText") {{statusText}}
-      span {{nowPlayTimeStr}}
-      span(style="margin: 0 5px;") /
-      span {{maxPlayTimeStr}}
+      template(v-if="!isShowPlayerDetail")
+        span(:class="$style.statusText") {{statusText}}
+        span {{nowPlayTimeStr}}
+        span(style="margin: 0 5px;") /
+        span {{maxPlayTimeStr}}
   div(:class="$style.right")
     div(:class="$style.playBtn" @click='playPrev' :tips="$t('player__prev')" style="transform: rotate(180deg);")
       svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 220.847 220.847' space='preserve')
@@ -48,7 +49,17 @@ import { player as eventPlayerNames } from '@renderer/event/names'
 import ControlBtns from './ControlBtns'
 import usePlayProgress from '@renderer/utils/compositions/usePlayProgress'
 // import { lyric } from '@renderer/core/share/lyric'
-import { statusText, musicInfo, setMusicInfo, setShowPlayerDetail, isPlay, musicInfoItem, playInfo, playMusicInfo } from '@renderer/core/share/player'
+import {
+  statusText,
+  musicInfo,
+  setMusicInfo,
+  isShowPlayerDetail,
+  setShowPlayerDetail,
+  isPlay,
+  musicInfoItem,
+  playInfo,
+  playMusicInfo,
+} from '@renderer/core/share/player'
 
 export default {
   name: 'CorePlayBar',
@@ -138,6 +149,7 @@ export default {
       playNext,
       playPrev,
       handleToMusicLocation,
+      isShowPlayerDetail,
     }
   },
 }
diff --git a/src/renderer/components/core/PlayDetail/PlayBar.vue b/src/renderer/components/core/PlayDetail/PlayBar.vue
index 2384efd3..9590af84 100644
--- a/src/renderer/components/core/PlayDetail/PlayBar.vue
+++ b/src/renderer/components/core/PlayDetail/PlayBar.vue
@@ -6,11 +6,10 @@ div(:class="$style.footer")
       div(:class="$style.progressContent")
         common-progress-bar(:class-name="$style.progress" :progress="progress" :handleTransitionEnd="handleTransitionEnd" :isActiveTransition="isActiveTransition")
     div(:class="$style.timeLabel")
-      span(style="margin-left: 15px") {{status}}
-      div
-        span {{nowPlayTimeStr}}
-        span(style="margin: 0 5px;") /
-        span {{maxPlayTimeStr}}
+      span(:class="$style.status" style="margin-left: 15px") {{status}}
+      span {{nowPlayTimeStr}}
+      span(style="margin: 0 5px;") /
+      span {{maxPlayTimeStr}}
   div(:class="$style.playControl")
     div(:class="$style.playBtn" @click="playPrev" style="transform: rotate(180deg);" :tips="$t('player__prev')")
       svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 220.847 220.847' space='preserve')
@@ -108,11 +107,13 @@ export default {
   width: 100%;
   height: 18px;
   display: flex;
-  justify-content: space-between;
   span {
     font-size: 13px;
   }
 }
+.status {
+  flex: auto;
+}
 
 .play-control {
   flex: none;