github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

打开播放详情页时隐藏外部进度条

pull/930/merge
lyswhut 2022-02-16 10:33:52 +08:00
parent 2f56a7090a
commit 43c5051158
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/renderer/components/core/PlayBar/index.vue
View File

@ -10,12 +10,13 @@ div(:class="$style.player")
div(:class="$style.title" @click="handleCopy(title)" :tips="title + $t('copy_tip')") {{title}} div(:class="$style.title" @click="handleCopy(title)" :tips="title + $t('copy_tip')") {{title}}
control-btns control-btns
div(:class="$style.column2") 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") div(:class="$style.column3")
span(:class="$style.statusText") {{statusText}} template(v-if="!isShowPlayerDetail")
span {{nowPlayTimeStr}} span(:class="$style.statusText") {{statusText}}
span(style="margin: 0 5px;") / span {{nowPlayTimeStr}}
span {{maxPlayTimeStr}} span(style="margin: 0 5px;") /
span {{maxPlayTimeStr}}
div(:class="$style.right") div(:class="$style.right")
div(:class="$style.playBtn" @click='playPrev' :tips="$t('player__prev')" style="transform: rotate(180deg);") 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') 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 ControlBtns from './ControlBtns'
import usePlayProgress from '@renderer/utils/compositions/usePlayProgress' import usePlayProgress from '@renderer/utils/compositions/usePlayProgress'
// import { lyric } from '@renderer/core/share/lyric' // 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 { export default {
name: 'CorePlayBar', name: 'CorePlayBar',
@ -138,6 +149,7 @@ export default {
playNext, playNext,
playPrev, playPrev,
handleToMusicLocation, handleToMusicLocation,
isShowPlayerDetail,
} }
}, },
} }

13
src/renderer/components/core/PlayDetail/PlayBar.vue
View File

@ -6,11 +6,10 @@ div(:class="$style.footer")
div(:class="$style.progressContent") div(:class="$style.progressContent")
common-progress-bar(:class-name="$style.progress" :progress="progress" :handleTransitionEnd="handleTransitionEnd" :isActiveTransition="isActiveTransition") common-progress-bar(:class-name="$style.progress" :progress="progress" :handleTransitionEnd="handleTransitionEnd" :isActiveTransition="isActiveTransition")
div(:class="$style.timeLabel") div(:class="$style.timeLabel")
span(style="margin-left: 15px") {{status}} span(:class="$style.status" style="margin-left: 15px") {{status}}
div span {{nowPlayTimeStr}}
span {{nowPlayTimeStr}} span(style="margin: 0 5px;") /
span(style="margin: 0 5px;") / span {{maxPlayTimeStr}}
span {{maxPlayTimeStr}}
div(:class="$style.playControl") div(:class="$style.playControl")
div(:class="$style.playBtn" @click="playPrev" style="transform: rotate(180deg);" :tips="$t('player__prev')") 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') 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%; width: 100%;
height: 18px; height: 18px;
display: flex; display: flex;
justify-content: space-between;
span { span {
font-size: 13px; font-size: 13px;
} }
} }
.status {
flex: auto;
}
.play-control { .play-control {
flex: none; flex: none;