diff --git a/README.md b/README.md
index ed5a3e3e..0354b6ca 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,8 @@
软件下载请转到:[发布页面](https://github.com/lyswhut/lx-music-desktop/releases)
或者到网盘下载(网盘内有MAC、windows版):`https://www.lanzous.com/b906260/` 密码:`glqw`
+注意:win7需要开启**透明效果**软件才可使用
+
#### 关于软件更新
软件启动时若发现新版本时会自动从本仓库下载安装包,下载完毕会弹窗提示更新。
diff --git a/publish/changeLog.md b/publish/changeLog.md
index 74eccad3..995ce12e 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,10 +1,11 @@
### 新增
-- 在设置界面-关于洛雪音乐说明部分新增**最新版网盘下载地址**与**打赏地址**
- 新增酷我、酷狗、百度源**歌单**
+- 在设置界面-关于洛雪音乐说明部分新增**最新版网盘下载地址**与**打赏地址**
+- 新增酷狗 电音热歌榜、DJ热歌榜
### 优化
-- 目前使用的测试接口与临时接口已趋于稳定
+- 目前使用的测试接口与临时接口已逐渐趋于稳定
- 测试接口支持**酷我、酷狗、百度、网易云**源直接播放与下载
- 临时接口仅支持**酷我**源直接播放与下载
diff --git a/src/renderer/components/material/SongList.vue b/src/renderer/components/material/SongList.vue
index 1f3da395..036b4c58 100644
--- a/src/renderer/components/material/SongList.vue
+++ b/src/renderer/components/material/SongList.vue
@@ -10,8 +10,8 @@ div(:class="$style.songList")
:indeterminate="isIndeterminate" :title="isSelectAll && !isIndeterminate ? '全不选' : '全选'")
th.nobreak(style="width: 25%;") 歌曲名
th.nobreak(style="width: 20%;") 歌手
- th.nobreak(style="width: 25%;") 专辑
- th.nobreak(style="width: 15%;") 操作
+ th.nobreak(style="width: 22%;") 专辑
+ th.nobreak(style="width: 18%;") 操作
th.nobreak(style="width: 10%;") 时长
div.scroll(:class="$style.tbody" ref="dom_scrollContent")
table
@@ -24,15 +24,17 @@ div(:class="$style.songList")
span.badge.badge-info(v-if="item._types['320k']") 高品质
span.badge.badge-success(v-if="item._types.ape || item._types.flac") 无损
td.break(style="width: 20%;") {{item.singer}}
- td.break(style="width: 25%;") {{item.albumName}}
- td(style="width: 15%;")
- material-list-buttons(:index="index" :search-btn="true" :remove-btn="false" @btn-click="handleListBtnClick"
- :play-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx')" :download-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx')")
- td(style="width: 10%;") {{item.interval}}
+ td.break(style="width: 22%;") {{item.albumName}}
+ td(style="width: 18%;")
+ material-list-buttons(:index="index" :search-btn="true" :play-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx')" :download-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx')" :remove-btn="false" @btn-click="handleListBtnClick")
+ //- button.btn-info(type='button' v-if="item._types['128k'] || item._types['192k'] || item._types['320k'] || item._types.flac" @click.stop='openDownloadModal(index)') 下载
+ //- button.btn-secondary(type='button' v-if="item._types['128k'] || item._types['192k'] || item._types['320k']" @click.stop='testPlay(index)') 试听
+ //- button.btn-success(type='button' v-if="(item._types['128k'] || item._types['192k'] || item._types['320k']) && userInfo" @click.stop='showListModal(index)') +
+ td(style="width: 10%;") {{item.interval || '--/--'}}
div(:class="$style.pagination")
material-pagination(:count="total" :limit="limit" :page="page" @btn-click="handleTogglePage")
div(v-else :class="$style.noitem")
- p 搜我所想~~😉
+ p(v-html="noitem")
material-flow-btn(:show="isShowEditBtn && (source == 'kw' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
@@ -70,6 +72,10 @@ export default {
source: {
type: String,
},
+ noitem: {
+ type: String,
+ default: '搜我所想~~😉',
+ },
},
computed: {
...mapGetters(['setting']),
diff --git a/src/renderer/utils/music/kg/leaderboard.js b/src/renderer/utils/music/kg/leaderboard.js
index 1e8c4eb9..826e783d 100644
--- a/src/renderer/utils/music/kg/leaderboard.js
+++ b/src/renderer/utils/music/kg/leaderboard.js
@@ -5,12 +5,12 @@ export default {
list: [
{
id: 'kgtop500',
- name: '酷狗TOP500',
+ name: 'TOP500',
bangid: '8888',
},
{
id: 'kgwlhgb',
- name: '网络红歌榜',
+ name: '网络榜',
bangid: '23784',
},
{
@@ -30,29 +30,29 @@ export default {
},
{
id: 'kggfjqb',
- name: '古风金曲榜',
+ name: '古风榜',
bangid: '33161',
},
{
id: 'kgyyjqb',
- name: '粤语金曲榜',
+ name: '粤语榜',
bangid: '33165',
},
{
id: 'kgomjqb',
- name: '欧美金曲榜',
+ name: '欧美榜',
bangid: '33166',
},
- // {
- // id: 'kgdyrgb',
- // name: '电音热歌榜',
- // bangid: '33160',
- // },
- // {
- // id: 'kgjdrgb',
- // name: 'DJ热歌榜',
- // bangid: '24971',
- // },
+ {
+ id: 'kgdyrgb',
+ name: '电音热歌榜',
+ bangid: '33160',
+ },
+ {
+ id: 'kgjdrgb',
+ name: 'DJ热歌榜',
+ bangid: '24971',
+ },
// {
// id: 'kghyxgb',
// name: '华语新歌榜',
diff --git a/src/renderer/views/Leaderboard.vue b/src/renderer/views/Leaderboard.vue
index e75e0bf7..585ee41c 100644
--- a/src/renderer/views/Leaderboard.vue
+++ b/src/renderer/views/Leaderboard.vue
@@ -6,7 +6,6 @@
material-song-list(v-model="selectdData" @action="handleSongListAction" :source="source" :page="page" :limit="info.limit" :total="info.total" :list="list")
material-download-modal(:show="isShowDownload" :musicInfo="musicInfo" @select="handleAddDownload" @close="isShowDownload = false")
material-download-multiple-modal(:show="isShowDownloadMultiple" :list="selectdData" @select="handleAddDownloadMultiple" @close="isShowDownloadMultiple = false")
- material-flow-btn(:show="isShowEditBtn && (source == 'kw' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")