Skip to content

Commit ffb1fcc

Browse files
committed
🐞 fix: 修正无歌词时条件
1 parent ea822f9 commit ffb1fcc

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

src/components/Player/FullPlayer.vue

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
:class="[
3131
'player-content',
3232
{
33+
'no-lrc': noLrc,
3334
pure: statusStore.pureLyricMode && musicStore.isHasLrc,
34-
'no-lrc': !musicStore.isHasLrc || (!musicStore.isHasLrc && !statusStore.lyricLoading),
3535
},
3636
]"
3737
@mousemove="playerMove"
@@ -96,6 +96,15 @@ const isShowComment = computed<boolean>(
9696
() => !musicStore.playSong.path && statusStore.showPlayerComment,
9797
);
9898
99+
/** 没有歌词 */
100+
const noLrc = computed<boolean>(() => {
101+
const noNormalLrc = !musicStore.isHasLrc;
102+
const noYrcAvailable = !musicStore.isHasYrc || !settingStore.showYrc;
103+
const notLoading = !statusStore.lyricLoading;
104+
105+
return noNormalLrc && noYrcAvailable && notLoading;
106+
});
107+
99108
// 主内容 key
100109
const playerContentKey = computed(() => `${statusStore.pureLyricMode}`);
101110

src/components/Setting/MainSetting.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<template>
22
<div class="setting">
33
<div class="set-left">
4-
<div class="title">
4+
<n-flex class="title" :size="0" vertical>
55
<n-h1>设置</n-h1>
66
<n-text :depth="3">个性化与全局设置</n-text>
7-
</div>
7+
</n-flex>
88
<!-- 设置菜单 -->
99
<n-menu
1010
v-model:value="activeKey"

0 commit comments

Comments
 (0)