diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index b9aa6405..9f6d9053 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -17,9 +17,9 @@ div(:class="$style.player") div(:class="$style.volumeMask" @mousedown="handleVolumeMsDown" ref="dom_volumeMask" :tips="`${$t('core.player.volume')}${parseInt(volume * 100)}%`") div(:class="$style.titleBtn" @click='toggleDesktopLyric' @contextmenu="handleToggleLockDesktopLyric" :tips="toggleDesktopLyricBtnTitle") svg(v-if="setting.desktopLyric.enable" version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 512 512' space='preserve') - use(xlink:href='#icon-desktop-lyric-off') - svg(v-else version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 512 512' space='preserve') use(xlink:href='#icon-desktop-lyric-on') + svg(v-else version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 512 512' space='preserve') + use(xlink:href='#icon-desktop-lyric-off') div(:class="$style.titleBtn" @click='toggleNextPlayMode' :tips="nextTogglePlayName") svg(v-if="setting.player.togglePlayMethod == 'listLoop'" version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='80%' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-list-loop') diff --git a/src/renderer/components/core/PlayerDetail.vue b/src/renderer/components/core/PlayerDetail.vue index 7dea972a..2aad7d09 100644 --- a/src/renderer/components/core/PlayerDetail.vue +++ b/src/renderer/components/core/PlayerDetail.vue @@ -737,9 +737,6 @@ each(@themes, { border-left-color: ~'@{color-@{value}-theme}'; background-color: ~'@{color-@{value}-theme_2-background_1}'; } - .leftControlBtns { - color: ~'@{color-@{value}-theme_2-font}'; - } .right { &:before { background-image: linear-gradient(0deg,rgba(255,255,255,0) 0%,~'@{color-@{value}-theme_2-background_1}' 95%); @@ -775,6 +772,14 @@ each(@themes, { .lrc-active { color: ~'@{color-@{value}-theme}'; } + .footerLeftControlBtns { + color: ~'@{color-@{value}-theme_2-font}'; + } + .footerLeftControlBtn { + &.active { + color: ~'@{color-@{value}-theme}'; + } + } .progress { background-color: ~'@{color-@{value}-player-progress}'; } diff --git a/src/renderer/components/material/MusicComment.vue b/src/renderer/components/material/MusicComment.vue index b45e66a6..fc63e7eb 100644 --- a/src/renderer/components/material/MusicComment.vue +++ b/src/renderer/components/material/MusicComment.vue @@ -165,8 +165,8 @@ export default { this.isShowComment = true this.currentMusicInfo = this.musicInfo + if (this.page == 1) this.handleGetHotComment(this.currentMusicInfo) this.handleGetNewComment(this.currentMusicInfo, this.page, this.limit) - this.handleGetHotComment(this.currentMusicInfo) }, handleToggleCommentPage(page) { this.nextPage = page diff --git a/src/renderer/utils/music/kw/comment.js b/src/renderer/utils/music/kw/comment.js index ec265945..99f160b4 100644 --- a/src/renderer/utils/music/kw/comment.js +++ b/src/renderer/utils/music/kw/comment.js @@ -14,7 +14,7 @@ export default { }) const { body, statusCode } = await _requestObj.promise if (statusCode != 200 || body.result !== 'ok') throw new Error('获取评论失败') - console.log(body) + // console.log(body) return { source: 'kw', comments: this.filterComment(body.rows), total: body.total, page, limit, maxPage: Math.ceil(body.total / limit) || 1 } }, async getHotComment({ songmid }, page = 1, limit = 100) { @@ -31,6 +31,7 @@ export default { return { source: 'kw', comments: this.filterComment(body.rows) } }, filterComment(rawList) { + if (!rawList) return [] return rawList.map(item => { let data = { id: item.id,