更新依赖包到最新，发布0.5.3版本

发布0.5.2版本
更新免责声明
2019-09-09 01:05:30 +08:00 · 2019-09-09 00:40:27 +08:00 · 2019-09-09 00:40:00 +08:00 · 2019-09-09 00:33:24 +08:00 · 2019-09-08 01:59:43 +08:00 · 2019-09-08 00:41:45 +08:00
84 changed files with 4095 additions and 1231 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,14 +4,15 @@ platform:
 cache:
  - node_modules
  - '%APPDATA%\npm-cache'
-  # - '%USERPROFILE%\.electron'
+  - '%LOCALAPPDATA%\electron\Cache'
+  - '%LOCALAPPDATA%\electron-builder\Cache'

 install:
  - ps: Install-Product node 12 x64
  - npm install

 build_script:
-  - npm run pub:gh
+  - npm run publish:gh

 test: off

--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ build/Release

 # Dependency directories
 node_modules/
+node_modules.bak*/
 jspm_packages/

 # TypeScript v1 declaration files
@@ -68,3 +69,5 @@ dist
 publish/assets

 publish/utils/githubToken.js
+
+src/**/*-internal.js
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,43 @@
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode10.2
+      language: node_js
+      node_js: "12"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+    - os: linux
+      language: node_js
+      node_js: "12"
+      dist: trusty
+      services: docker
+      language: generic
+
+cache:
+  directories:
+    - node_modules
+    - $HOME/.cache/electron
+    - $HOME/.cache/electron-builder
+    - $HOME/.npm/_prebuilds
+
+notifications:
+  email: false
+
+script:
+  - |
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      npm install && npm run publish:gh:linux
+    else
+      npm run publish:gh:mac
+    fi
+
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder/wine
+
+# only run this script on pull requests and merges into
+# the 'master' and 'prod' branches
+branches:
+  only:
+    - master
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,159 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).

+## [0.5.3](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.2...v0.5.3) - 2019-09-09
+
+### 优化
+
+- 更新所有依赖包到最新
+
+### 修复
+
+- 修复试听酷狗源的音乐仍然获取320k音质导致获取失败的Bug
+
+## [0.5.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.1...v0.5.2) - 2019-09-09
+
+### 新增
+
+- 新增强迫症设置-离开搜索界面时是否清空搜索框
+- 设置-关于板块新增常见问题链接
+- 歌单左上角的分类按钮添加一个**向下图标**，方便识别该按钮为下拉框（该按钮可选择歌单类型，请自行尝试）
+
+### 优化
+
+- 略微优化最小化按钮字符
+- 优化试听列表的加载体验，当歌曲数过多时列表将延迟加载
+
+### 修复
+
+- 修复下载管理的一些Bug
+
+### 移除
+
+- 因接口失效，移除网易云音源，酷狗音源仅支持播放128k音质
+
+## [0.5.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.0...v0.5.1) - 2019-09-05
+
+### 新增
+
+- 新增右上角最小化/关闭按钮鼠标滑过符号
+- 新增下载列表定位文件按钮
+
+### 修复
+
+- 修复百度源歌单全部分类无法加载的问题
+- 修复更新弹窗无法弹出的问题
+
+## [0.5.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.4.0...v0.5.0) - 2019-09-05
+
+### 新增
+
+- 新增**封面嵌入**（默认开启，可到设置-下载设置关闭）
+- 新增**歌词下载**（默认关闭，可到设置-下载设置开启）
+- 新增单例应用功能（实现软件单开功能，禁止软件多开）
+
+### 优化
+
+- 优化歌单列表动画
+
+### 修复
+
+- 修复歌单无法翻页的问题
+- 修复在某些情况下，添加下载歌曲导致下载列表崩溃的问题
+- 修复版本更新弹窗Bug
+- 修复酷狗歌单推荐歌单出现在其他分类中的Bug
+
+## [0.4.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.3.5...v0.4.0) - 2019-09-04
+
+
+### 新增
+
+- 新增**歌单**功能，目前支持酷我、酷狗、百度源歌单
+- 在设置界面-关于洛雪音乐说明部分新增**最新版网盘下载地址**与**打赏地址**
+- 新增酷狗 电音热歌榜、DJ热歌榜
+- 新增版本更新超时功能，对于部分无法访问GitHub的用户做更新超时提醒
+
+### 移除
+
+- **注意**：0.4.0以前的版本即将失效，请更新到0.4.0版本
+
+## [0.3.5](https://github.com/lyswhut/lx-music-desktop/compare/v0.3.4...v0.3.5) - 2019-08-30
+
+### 新增
+
+- 新增**测试接口**，该接口同样速度较慢，但软件的大部分功能可用，**请自行切换到该接口**，找接口辛苦，且用且珍惜！
+
+### 优化
+
+- 取消需要刷新URL时windows任务栏进度显示错误状态（现显示为暂停状态）
+
+### 修复
+
+- 修复使用临时接口时在试听列表双击灰色歌曲仍然会进行播放的Bug
+- 修复歌词加载Bug
+
+## [0.3.4](https://github.com/lyswhut/lx-music-desktop/compare/v0.3.3...v0.3.4) - 2019-08-29
+
+### 优化
+
+- 减少接口不稳定带来的影响，适当增加请求等待时间
+
+### 修复
+
+- 修复播放过程中URL过期不会刷新URL的问题
+
+## [0.3.3](https://github.com/lyswhut/lx-music-desktop/compare/v0.3.2...v0.3.3) - 2019-08-29
+
+### 修复
+
+- **messoer**的接口已经关闭，暂时切换到临时接口使用，部分功能受限。。。
+- 修复设置界面更新出错时仍然显示更新下载中的问题
+- 修复手动定位播放进度条时存在偏差的问题
+- 屏蔽播放器中没有歌曲时对进度条的点击
+
+
+## [0.3.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.3.1...v0.3.2) - 2019-08-24
+
+### 新增
+
+- 新增酷狗排行榜其他音质下载
+
+## [0.3.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.3.0...v0.3.1) - 2019-08-24
+
+### 修复
+
+- 修复音量条主题适配
+
+## [0.3.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.3...v0.3.0) - 2019-08-24
+
+### 新增
+
+- 新增**MAC**及**Linux**版本（需要的可自行下载）
+- 新增音量调整
+- 新增任务栏播放进度条控制选项（现在可在设置界面关闭在任务栏显示的播放进度）
+- 新增更新出错时的弹窗提示
+- 从该版本起，非安装版也会有更新弹窗提醒了，但仍然需要手动下载新版本更新，版本信息可到设置页面查看
+
+### 修复
+
+- 强制把临时接口设置回 `messoer` 接口
+
+## [0.2.3](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.2...v0.2.3) - 2019-08-22
+
+### 新增
+
+- 新增任务栏程序标题改变功能（播放歌曲时任务栏标题将显示当前播放的歌曲）
+
+### 修复
+
+- 使用临时接口时，试听列表中的下载按钮仍然能点击的Bug
+- 修复某些情况下歌曲链接未能缓存的问题
+
+### 移除
+
+- 移除临时接口（因服务器被攻击，本接口已关闭）
+- 移除列表栏设置的隐藏专辑栏选项（感觉这个设置并没有什么luan用，并且还会打破布局）
+
 ## [0.2.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.1...v0.2.2) - 2019-08-21

 ### 修复
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@
 <p align="center">
  <a href="https://github.com/lyswhut/lx-music-desktop/releases"><img src="https://img.shields.io/github/release/lyswhut/lx-music-desktop" alt="Release version"></a>
  <a href="https://ci.appveyor.com/project/lyswhut/lx-music-desktop"><img src="https://ci.appveyor.com/api/projects/status/flrsqd5ymp8fnte5?svg=true" alt="Build status"></a>
-  <a href="https://github.com/lyswhut/lx-music-desktop/releases"><img src="https://img.shields.io/github/downloads/lyswhut/lx-music-desktop/latest/total" alt="Downloads"></a>
+  <a href="https://travis-ci.org/lyswhut/lx-music-desktop"><img src="https://travis-ci.org/lyswhut/lx-music-desktop.svg?branch=master" alt="Build status"></a>
+  <!-- <a href="https://github.com/lyswhut/lx-music-desktop/releases"><img src="https://img.shields.io/github/downloads/lyswhut/lx-music-desktop/latest/total" alt="Downloads"></a> -->
  <a href="https://github.com/lyswhut/lx-music-desktop/tree/dev"><img src="https://img.shields.io/github/package-json/v/lyswhut/lx-music-desktop/dev" alt="Dev branch version"></a>
  <!-- <a href="https://github.com/lyswhut/lx-music-desktop/blob/master/LICENSE"><img src="https://img.shields.io/github/license/lyswhut/lx-music-desktop" alt="License"></a> -->
 </p>
@@ -30,23 +31,28 @@

 ### 说明

-一个基于 Electron + Vue 开发的 Windows 版音乐软件。
+一个基于 Electron + Vue 开发的音乐软件。

 所用技术栈：

 - Electron 6.x
 - Vue 2.x

+已支持的平台：
+
+- Windows 7 及以上
+- Mac OS
+- Linux
+
 软件变化请查看：[更新日志](https://github.com/lyswhut/lx-music-desktop/blob/master/CHANGELOG.md)<br>
-软件下载请转到：[发布页面](https://github.com/lyswhut/lx-music-desktop/releases)
+软件下载请转到：[发布页面](https://github.com/lyswhut/lx-music-desktop/releases)<br>
+或者到网盘下载（网盘内有MAC、windows版）：`https://www.lanzous.com/b906260/` 密码：`glqw`<br>
+使用常见问题请转至：[常见问题](https://github.com/lyswhut/lx-music-desktop#常见问题)

-其他说明：TODO
+#### TODO

-#### 关于软件更新
-
-软件启动时若发现新版本时会自动从本仓库下载安装包，下载完毕会弹窗提示更新。<br>
-若下载未完成时软件被关闭，下次启动软件会再次自动下载。<br>
-目前暂未添加跳过更新某个版本的功能。<br>
+- [ ] 新增拉取各大平台歌单
+- [ ] 新增聚合搜索

 ### 源码使用方法

@@ -59,7 +65,7 @@ npm run dev
 # 构建免安装版
 npm run pack:dir

-# 构建安装包
+# 构建安装包（windows版）
 npm run pack

 ```
@@ -68,9 +74,39 @@ npm run pack

 <p><a href="https://github.com/lyswhut/lx-music-desktop"><img width="100%" src="https://github.com/lyswhut/lx-music-desktop/blob/master/doc/images/app.png" alt="lx-music UI"></a></p>

+### 常见问题
+
+#### 歌曲无法试听与下载
+
+该问题解决顺序如下：
+
+1. 尝试更新到最新版本
+2. 尝试切换其他歌曲（或直接搜索该歌曲），若全部歌曲都无法试听与下载则进行下一步
+3. 尝试切换网络（比如切到移动网络）
+4. 若还不行请到这个链接查看详情：<https://github.com/lyswhut/lx-music-desktop/issues/5>
+
+#### Windows 7 下界面异常
+
+当 win7 没有开启**透明效果**时界面将会显示异常，开启方法请自行百度
+
+#### 软件更新
+
+软件启动时若发现新版本时会自动从本仓库下载安装包，下载完毕会弹窗提示更新。<br>
+若下载未完成时软件被关闭，下次启动软件会再次自动下载。<br>
+若还是更新失败，可能是无法访问GitHub导致的，这时需要手动更新，即下载最新安装包直接覆盖安装即可。<br>
+注意：**绿色版**的软件更新功能**不可用**，为了能及时地获取更新，建议使用安装版！！<br>
+注意：**Mac版**、**Linux deb**版不支持自动更新！
+
 ### 致谢

-感谢 [@messoer](https://github.com/messoer) 提供的部分音乐API！
+感谢 [@messoer](https://github.com/messoer) 曾经提供的部分音乐API！
+
+### 免责声明
+
+本项目**不开发或者破解直接获取音频数据**的功能，所有音频数据均来自**第三方接口**！<br>
+本软件仅用于**测试 `electron 6.x` 在各种系统上的兼容性**及用于**对比各大音乐平台歌单、排行榜等数据列表的差异性**，使用本软件产生的**任何涉及版权相关的数据**请于**24小时内删除**。<br>
+本软件仅用于学习交流使用，禁止用于商业用途，使用本软件所造成的的后果由使用者承担！<br>
+若对此有疑问请 mail to: lyswhut@qq.com

 ### 许可证

--- a/build-config/main/webpack.config.base.js
+++ b/build-config/main/webpack.config.base.js
@@ -7,11 +7,6 @@ module.exports = {
    libraryTarget: 'commonjs2',
    path: path.join(__dirname, '../../dist/electron'),
  },
-  externals: [
-    // suppress electron-debug warning
-    // see https://github.com/SimulatedGREG/electron-vue/issues/498
-    { 'electron-debug': 'electron-debug' },
-  ],
  resolve: {
    alias: {
      common: path.join(__dirname, '../../src/common'),
--- a/licenses/license.rtf
+++ b/licenses/license.rtf
--- a/licenses/license_en.txt
+++ b/licenses/license_en.txt
@@ -0,0 +1,5 @@
+This program is only for learning to communicate!
+Do not use for commercial purposes! !
+All consequences of using this software are borne by the user!
+
+By: lyswhut
--- a/licenses/license_zh.txt
+++ b/licenses/license_zh.txt
@@ -0,0 +1,5 @@
+本程序仅用于学习交流使用！
+请勿用于商业用途！！
+使用本软件造成的一切后果由使用者承担！
+
+By: 落雪无痕
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,12 +1,40 @@
 {
  "name": "lx-music-desktop",
-  "version": "0.2.2",
+  "version": "0.5.3",
  "description": "一个免费的音乐下载助手",
  "main": "./dist/electron/main.js",
+  "productName": "lx-music-desktop",
  "scripts": {
+    "pack": "node build-config/pack.js && npm run pack:win",
+    "pack:win": "npm run pack:win:setup && npm run pack:win:7z",
+    "pack:win:setup": "cross-env TARGET=win_安装版 ARCH=x64_x86 electron-builder -w=nsis --x64 --ia32",
+    "pack:win:portable": "npm run pack:win:portable:x64_x86 && npm run pack:win:portable:x64 && npm run pack:win:portable:x86",
+    "pack:win:portable:x64_x86": "cross-env TARGET=便携版 ARCH=x64_x86 electron-builder -w=portable --x64 --ia32",
+    "pack:win:portable:x64": "cross-env TARGET=便携版 ARCH=x64 electron-builder -w=portable --x64",
+    "pack:win:portable:x86": "cross-env TARGET=便携版 ARCH=x86 electron-builder -w=portable --ia32",
+    "pack:win:7z": "npm run pack:win:7z:x64 && npm run pack:win:7z:x86",
+    "pack:win:7z:x64": "cross-env TARGET=win_绿色版 ARCH=x64 electron-builder -w=7z --x64",
+    "pack:win:7z:x86": "cross-env TARGET=win_绿色版 ARCH=x86 electron-builder -w=7z --ia32",
    "publish": "node publish",
-    "pub:gh": "node build-config/pack.js && electron-builder --win -p always",
-    "pack": "node build-config/pack.js && electron-builder -w",
+    "publish:gh": "node build-config/pack.js && npm run publish:win",
+    "publish:win": "npm run publish:win:7z && npm run publish:win:setup",
+    "publish:win:setup": "cross-env TARGET=Setup ARCH=x64_x86 electron-builder -w=nsis --x64 --ia32 -p onTagOrDraft",
+    "publish:win:portable": "npm run publish:win:portable:x64_x86 && npm run publish:win:portable:x64 && npm run publish:win:portable:x86",
+    "publish:win:portable:x64_x86": "cross-env TARGET=portable ARCH=x64_x86 electron-builder -w=portable --x64 --ia32 -p onTagOrDraft",
+    "publish:win:portable:x64": "cross-env TARGET=portable ARCH=x64 electron-builder -w=portable --x64 -p onTagOrDraft",
+    "publish:win:portable:x86": "cross-env TARGET=portable ARCH=x86 electron-builder -w=portable --ia32 -p onTagOrDraft",
+    "publish:win:7z": "npm run publish:win:7z:x64 && npm run publish:win:7z:x86",
+    "publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p always",
+    "publish:win:7z:x86": "cross-env TARGET=green ARCH=win_x86 electron-builder -w=7z --ia32 -p onTagOrDraft",
+    "publish:gh:mac": "node build-config/pack.js && npm run publish:mac",
+    "publish:mac": "npm run publish:mac:dmg",
+    "publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft",
+    "publish:gh:linux": "node build-config/pack.js && npm run publish:linux",
+    "publish:linux": "npm run publish:linux:deb && npm run publish:linux:appImage",
+    "publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft",
+    "publish:linux:deb": "npm run publish:linux:deb:x64 && npm run publish:linux:deb:x86",
+    "publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft",
+    "publish:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32 -p onTagOrDraft",
    "pack:linux": "node build-config/pack.js && electron-builder -l",
    "pack:dir": "node build-config/pack.js && electron-builder --dir",
    "dev": "node build-config/runner-dev.js",
@@ -34,49 +62,50 @@
    "files": [
      "dist/electron/**/*"
    ],
+    "extraResources": [
+      "./licenses"
+    ],
    "win": {
-      "icon": "src/static/icons/lunch.ico",
+      "icon": "./resources/icons/256x256.ico",
      "legalTrademarks": "lyswhut",
-      "target": [
-        {
-          "arch": [
-            "ia32",
-            "x64"
-          ],
-          "target": "nsis"
-        }
-      ]
+      "artifactName": "${productName} v${version} ${env.ARCH} ${env.TARGET}.${ext}"
+    },
+    "mac": {
+      "icon": "./resources/icons/512x512.png",
+      "category": "public.app-category.music"
    },
    "linux": {
-      "target": [
-        {
-          "target": "AppImage",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "arch": [
-            "ia32",
-            "x64"
-          ],
-          "target": "deb"
-        },
-        {
-          "arch": [
-            "x64"
-          ],
-          "target": "snap"
-        }
-      ],
-      "maintainer": "lyswhut <lyswuhut@qq.com>"
+      "maintainer": "lyswhut <lyswuhut@qq.com>",
+      "artifactName": "${productName} v${version} ${env.ARCH}.${ext}"
    },
    "nsis": {
      "oneClick": false,
      "language": "2052",
      "allowToChangeInstallationDirectory": true,
      "differentialPackage": true,
-      "license": "./license.rtf"
+      "license": "./licenses/license.rtf",
+      "shortcutName": "lx-music"
+    },
+    "dmg": {
+      "contents": [
+        {
+          "x": 110,
+          "y": 150,
+          "name": "lx-music"
+        },
+        {
+          "x": 240,
+          "y": 150,
+          "type": "link",
+          "path": "/Applications",
+          "name": "lx-music"
+        }
+      ],
+      "title": "洛雪音乐助手 v${version}"
+    },
+    "appImage": {
+      "license": "./licenses/license_zh.txt",
+      "category": "Audio"
    },
    "publish": [
      {
@@ -90,49 +119,56 @@
    "type": "git",
    "url": "git+https://github.com/lyswhut/lx-music-desktop.git"
  },
-  "keywords": [],
-  "author": "lyswhut",
+  "keywords": [
+    "music-player",
+    "electron-app",
+    "vuejs2"
+  ],
+  "author": {
+    "name": "lyswhut",
+    "email": "lyswuhut@qq.com"
+  },
  "license": "Apache-2.0",
  "bugs": {
    "url": "https://github.com/lyswhut/lx-music-desktop/issues"
  },
  "homepage": "https://github.com/lyswhut/lx-music-desktop#readme",
  "devDependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.6.0",
    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/polyfill": "^7.4.4",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/polyfill": "^7.6.0",
+    "@babel/preset-env": "^7.6.0",
    "autoprefixer": "^9.6.1",
-    "babel-eslint": "^10.0.2",
+    "babel-eslint": "^10.0.3",
    "babel-loader": "^8.0.6",
    "babel-minify-webpack-plugin": "^0.3.1",
-    "babel-preset-minify": "^0.5.0",
-    "cfonts": "^2.4.4",
+    "babel-preset-minify": "^0.5.1",
+    "cfonts": "^2.4.5",
    "chalk": "^2.4.2",
    "changelog-parser": "^2.8.0",
    "copy-webpack-plugin": "^5.0.4",
    "core-js": "^3.2.1",
-    "cos-nodejs-sdk-v5": "^2.5.11",
-    "cross-env": "^5.2.0",
+    "cos-nodejs-sdk-v5": "^2.5.12",
+    "cross-env": "^5.2.1",
    "css-loader": "^3.2.0",
-    "del": "^3.0.0",
-    "electron": "^6.0.2",
+    "del": "^5.1.0",
+    "electron": "^6.0.7",
    "electron-builder": "^21.2.0",
    "electron-debug": "^3.0.1",
    "electron-devtools-installer": "^2.2.4",
-    "eslint": "^6.1.0",
-    "eslint-config-standard": "^13.0.1",
+    "eslint": "^6.3.0",
+    "eslint-config-standard": "^14.1.0",
    "eslint-formatter-friendly": "^7.0.0",
-    "eslint-loader": "^2.2.1",
+    "eslint-loader": "^3.0.0",
    "eslint-plugin-html": "^6.0.0",
    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-node": "^9.1.0",
+    "eslint-plugin-node": "^10.0.0",
    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-standard": "^4.0.1",
    "file-loader": "^4.2.0",
    "friendly-errors-webpack-plugin": "^1.7.0",
    "html-webpack-plugin": "^3.2.0",
-    "less": "^3.9.0",
+    "less": "^3.10.3",
    "less-loader": "^5.0.0",
    "markdown-it": "^9.1.0",
    "mini-css-extract-plugin": "^0.8.0",
@@ -144,31 +180,34 @@
    "pug-plain-loader": "^1.0.0",
    "raw-loader": "^3.1.0",
    "rimraf": "^3.0.0",
-    "stylus": "^0.54.5",
+    "stylus": "^0.54.7",
    "stylus-loader": "^3.0.2",
-    "terser-webpack-plugin": "^1.4.1",
+    "terser-webpack-plugin": "^2.0.1",
    "url-loader": "^2.1.0",
    "vue-loader": "^15.7.1",
    "vue-style-loader": "^4.1.2",
    "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.39.2",
-    "webpack-cli": "^3.3.6",
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.8",
    "webpack-dev-server": "^3.8.0",
    "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^4.2.1"
+    "webpack-merge": "^4.2.2"
  },
  "dependencies": {
    "axios": "^0.19.0",
+    "crypto-js": "^3.1.9-1",
    "electron-log": "^3.0.7",
    "electron-store": "^4.0.0",
    "electron-updater": "^4.1.2",
+    "flac-metadata": "^0.1.1",
    "js-htmlencode": "^0.3.0",
    "lrc-file-parser": "^0.1.12",
-    "node-downloader-helper": "^1.0.10",
+    "node-downloader-helper": "^1.0.11",
+    "node-id3": "^0.1.11",
    "request": "^2.88.0",
    "vue": "^2.6.10",
    "vue-electron": "^1.0.6",
-    "vue-router": "^3.1.2",
+    "vue-router": "^3.1.3",
    "vuex": "^3.1.1",
    "vuex-electron": "^1.0.3",
    "vuex-router-sync": "^5.0.0"
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,4 +1,7 @@
+### 优化
+
+- 更新所有依赖包到最新
+
 ### 修复

- 修复下载过程中出错重试5次都失败后不会自动开始下一个任务的Bug
- 修复播放到一半URL过期时不会刷新URL直接播放下一首的问题
+- 修复试听酷狗源的音乐仍然获取320k音质导致获取失败的Bug
--- a/publish/version.json
+++ b/publish/version.json
@@ -1,7 +1,55 @@
 {
-  "version": "0.2.2",
-  "desc": "<h3>修复</h3>\n<ul>\n<li>修复下载过程中出错重试5次都失败后不会自动开始下一个任务的Bug</li>\n<li>修复播放到一半URL过期时不会刷新URL直接播放下一首的问题</li>\n</ul>\n",
+  "version": "0.5.3",
+  "desc": "<h3>优化</h3>\n<ul>\n<li>更新所有依赖包到最新</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复试听酷狗源的音乐仍然获取320k音质导致获取失败的Bug</li>\n</ul>\n",
  "history": [
+    {
+      "version": "0.5.2",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增强迫症设置-离开搜索界面时是否清空搜索框</li>\n<li>设置-关于板块新增常见问题链接</li>\n<li>歌单左上角的分类按钮添加一个<strong>向下图标</strong>，方便识别该按钮为下拉框（该按钮可选择歌单类型，请自行尝试）</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>略微优化最小化按钮字符</li>\n<li>优化试听列表的加载体验，当歌曲数过多时列表将延迟加载</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复下载管理的一些Bug</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li>因接口失效，移除网易云音源，酷狗音源仅支持播放128k音质</li>\n</ul>\n"
+    },
+    {
+      "version": "0.5.1",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增右上角最小化/关闭按钮鼠标滑过符号</li>\n<li>新增下载列表定位文件按钮</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复百度源歌单全部分类无法加载的问题</li>\n<li>修复更新弹窗无法弹出的问题</li>\n</ul>\n"
+    },
+    {
+      "version": "0.5.0",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>封面嵌入</strong>（默认开启，可到设置-下载设置关闭）</li>\n<li>新增<strong>歌词下载</strong>（默认关闭，可到设置-下载设置开启）</li>\n<li>新增单例应用功能（实现软件单开功能，禁止软件多开）</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>优化歌单列表动画</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复歌单无法翻页的问题</li>\n<li>修复在某些情况下，添加下载歌曲导致下载列表崩溃的问题</li>\n<li>修复版本更新弹窗Bug</li>\n<li>修复酷狗歌单推荐歌单出现在其他分类中的Bug</li>\n</ul>\n"
+    },
+    {
+      "version": "0.4.0",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>歌单</strong>功能，目前支持酷我、酷狗、百度源歌单</li>\n<li>在设置界面-关于洛雪音乐说明部分新增<strong>最新版网盘下载地址</strong>与<strong>打赏地址</strong></li>\n<li>新增酷狗 电音热歌榜、DJ热歌榜</li>\n<li>新增版本更新超时功能，对于部分无法访问GitHub的用户做更新超时提醒</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li><strong>注意</strong>：0.4.0以前的版本即将失效，请更新到0.4.0版本</li>\n</ul>\n"
+    },
+    {
+      "version": "0.3.5",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>测试接口</strong>，该接口同样速度较慢，但软件的大部分功能可用，<strong>请自行切换到该接口</strong>，找接口辛苦，且用且珍惜！</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>取消需要刷新URL时windows任务栏进度显示错误状态（现显示为暂停状态）</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复使用临时接口时在试听列表双击灰色歌曲仍然会进行播放的Bug</li>\n<li>修复歌词加载Bug</li>\n</ul>\n"
+    },
+    {
+      "version": "0.3.4",
+      "desc": "<h3>优化</h3>\n<ul>\n<li>减少接口不稳定带来的影响，适当增加请求等待时间</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复播放过程中URL过期不会刷新URL的问题</li>\n</ul>\n"
+    },
+    {
+      "version": "0.3.3",
+      "desc": "<h3>修复</h3>\n<ul>\n<li><strong>messoer</strong>的接口已经关闭，暂时切换到临时接口使用，部分功能受限。。。</li>\n<li>修复设置界面更新出错时仍然显示更新下载中的问题</li>\n<li>修复手动定位播放进度条时存在偏差的问题</li>\n<li>屏蔽播放器中没有歌曲时对进度条的点击</li>\n</ul>\n"
+    },
+    {
+      "version": "0.3.2",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增酷狗排行榜其他音质下载</li>\n</ul>\n"
+    },
+    {
+      "version": "0.3.1",
+      "desc": "<h3>修复</h3>\n<ul>\n<li>修复音量条主题适配</li>\n</ul>\n"
+    },
+    {
+      "version": "0.3.0",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>MAC</strong>及<strong>Linux</strong>版本（需要的可自行下载）</li>\n<li>新增音量调整</li>\n<li>新增任务栏播放进度条控制选项（现在可在设置界面关闭在任务栏显示的播放进度）</li>\n<li>新增更新出错时的弹窗提示</li>\n<li>从该版本起，非安装版也会有更新弹窗提醒了，但仍然需要手动下载新版本更新，版本信息可到设置页面查看</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>强制把临时接口设置回 <code>messoer</code> 接口</li>\n</ul>\n"
+    },
+    {
+      "version": "0.2.3",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增任务栏程序标题改变功能（播放歌曲时任务栏标题将显示当前播放的歌曲）</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>使用临时接口时，试听列表中的下载按钮仍然能点击的Bug</li>\n<li>修复某些情况下歌曲链接未能缓存的问题</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li>移除临时接口（因服务器被攻击，本接口已关闭）</li>\n<li>移除列表栏设置的隐藏专辑栏选项（感觉这个设置并没有什么luan用，并且还会打破布局）</li>\n</ul>\n"
+    },
+    {
+      "version": "0.2.2",
+      "desc": "<h3>修复</h3>\n<ul>\n<li>修复下载过程中出错重试5次都失败后不会自动开始下一个任务的Bug</li>\n<li>修复播放到一半URL过期时不会刷新URL直接播放下一首的问题</li>\n</ul>\n"
+    },
    {
      "version": "0.2.1",
      "desc": "<h3>优化</h3>\n<ul>\n<li>新增歌曲URL存储，当URL无效时才重新获取，以减少接口不稳定的影响</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复歌曲加载无法加载时自动切换混乱的Bug</li>\n<li>修复移除列表最后一首歌曲时播放器不停止播放的问题</li>\n</ul>\n"
--- a/resources/icons/256x256.ico
+++ b/resources/icons/256x256.ico
--- a/resources/icons/512x512.icns
+++ b/resources/icons/512x512.icns
--- a/resources/icons/512x512.png
+++ b/resources/icons/512x512.png
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -0,0 +1,8 @@
+const log = require('electron-log')
+
+exports.isLinux = process.platform == 'linux'
+exports.isWin = process.platform == 'win32'
+exports.isMac = process.platform == 'darwin'
+
+
+exports.log = log
--- a/src/index.pug
+++ b/src/index.pug
@@ -3,7 +3,7 @@ html(lang="cn")
    meta(charset="UTF-8")
    meta(name="viewport" content="width=device-width, initial-scale=1.0")
    meta(http-equiv="X-UA-Compatible" content="ie=edge")
-    title= require('../package.json').name
+    title 洛雪音乐助手

  body
    #root
--- a/src/main/events/index.js
+++ b/src/main/events/index.js
@@ -1,4 +1,5 @@

 require('./request')
-require('./appName')
+// require('./appName')
+require('./musicMeta')

--- a/src/main/events/musicMeta.js
+++ b/src/main/events/musicMeta.js
@@ -0,0 +1,6 @@
+const { mainOn } = require('../../common/icp')
+const { setMeta } = require('../utils/musicMeta')
+
+mainOn('setMusicMeta', (event, { filePath, meta }) => {
+  setMeta(filePath, meta)
+})
--- a/src/main/events/trafficLight.js
+++ b/src/main/events/trafficLight.js
@@ -1,3 +1,4 @@
+// const { app } = require('electron')
 const { mainOn } = require('../../common/icp')

 module.exports = win => {
@@ -13,6 +14,9 @@ module.exports = win => {
  // })
  mainOn('close', event => {
    if (win) {
+      // window.destroy()
+      // console.log('close')
+      // app.quit()
      win.close()
    }
  })
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1,10 +1,25 @@
-const { app, BrowserWindow } = require('electron')
+const { app, BrowserWindow, Menu } = require('electron')
 const path = require('path')

+// 单例应用程序
+if (!app.requestSingleInstanceLock()) {
+  app.quit()
+  return
+}
+app.on('second-instance', (event, argv, cwd) => {
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore()
+    mainWindow.focus()
+  } else {
+    app.quit()
+  }
+})
+
 require('./events')
 const progressBar = require('./events/progressBar')
 const trafficLight = require('./events/trafficLight')
 const autoUpdate = require('./utils/autoUpdate')
+const { isLinux, isMac } = require('../common/utils')

 const isDev = process.env.NODE_ENV !== 'production'

@@ -18,7 +33,7 @@ let winURL

 if (isDev) {
  global.__static = path.join(__dirname, '../static')
-  winURL = `http://localhost:9080`
+  winURL = 'http://localhost:9080'
 } else {
  global.__static = path.join(__dirname, '/static')
  winURL = `file://${__dirname}/index.html`
@@ -33,8 +48,8 @@ function createWindow() {
    useContentSize: true,
    width: 920,
    frame: false,
-    transparent: true,
-    icon: path.join(global.__static, 'icons/lunch.ico'),
+    transparent: !isLinux,
+    // icon: path.join(global.__static, isWin ? 'icons/256x256.ico' : 'icons/512x512.png'),
    resizable: false,
    maximizable: false,
    fullscreenable: false,
@@ -48,7 +63,7 @@ function createWindow() {
  mainWindow.loadURL(winURL)

  mainWindow.on('closed', () => {
-    mainWindow = null
+    if (!isMac) mainWindow = null
  })

  // mainWindow.webContents.openDevTools()
@@ -58,12 +73,28 @@ function createWindow() {
  if (!isDev) autoUpdate(mainWindow)
 }

-app.once('ready', createWindow)
+if (isMac) {
+  const template = [
+    {
+      label: app.getName(),
+      submenu: [{ label: '关于洛雪音乐', role: 'about' }, { type: 'separator' }, { label: '隐藏', role: 'hide' }, { label: '显示其他', role: 'hideothers' }, { label: '显示全部', role: 'unhide' }, { type: 'separator' }, { label: '退出', click: () => app.quit() }],
+    },
+    {
+      label: '窗口',
+      role: 'window',
+      submenu: [{ label: '最小化', role: 'minimize' }, { label: '关闭', role: 'close' }],
+    },
+  ]
+
+  Menu.setApplicationMenu(Menu.buildFromTemplate(template))
+} else {
+  Menu.setApplicationMenu(null)
+}
+
+app.on('ready', createWindow)

 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
+  if (!isMac) app.quit()
 })

 app.on('activate', () => {
@@ -71,4 +102,3 @@ app.on('activate', () => {
    createWindow()
  }
 })
-
--- a/src/main/utils/autoUpdate.js
+++ b/src/main/utils/autoUpdate.js
@@ -1,8 +1,9 @@
-const log = require('electron-log')
+const { log } = require('../../common/utils')
 const { autoUpdater } = require('electron-updater')
 const { mainOn } = require('../../common/icp')

 autoUpdater.logger = log
+// autoUpdater.autoDownload = false
 autoUpdater.logger.transports.file.level = 'info'
 log.info('App starting...')

@@ -60,21 +61,30 @@ module.exports = win => {
  autoUpdater.on('checking-for-update', () => {
    sendStatusToWindow('Checking for update...')
  })
-  autoUpdater.on('update-available', (ev, info) => {
+  autoUpdater.on('update-available', info => {
    sendStatusToWindow('Update available.')
+    win.webContents.send('update-available', info)
  })
-  autoUpdater.on('update-not-available', (ev, info) => {
+  autoUpdater.on('update-not-available', info => {
    sendStatusToWindow('Update not available.')
+    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
+      win.webContents.send('update-not-available')
+    }, 5000)
  })
-  autoUpdater.on('error', (ev, err) => {
+  autoUpdater.on('error', () => {
    sendStatusToWindow('Error in auto-updater.')
+    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
+      win.webContents.send('update-error')
+    }, 6000)
  })
-  autoUpdater.on('download-progress', (ev, progressObj) => {
+  autoUpdater.on('download-progress', progressObj => {
    sendStatusToWindow('Download progress...')
  })
-  autoUpdater.on('update-downloaded', (ev, info) => {
+  autoUpdater.on('update-downloaded', info => {
    sendStatusToWindow('Update downloaded.')
-    win.webContents.send('update-downloaded')
+    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
+      win.webContents.send('update-downloaded')
+    }, 2000)
  })
  mainOn('quit-update', () => {
    setTimeout(() => {
--- a/src/main/utils/flacMeta.js
+++ b/src/main/utils/flacMeta.js
@@ -0,0 +1,38 @@
+const fs = require('fs')
+const flac = require('flac-metadata')
+
+module.exports = (filenPath, meta) => {
+  const reader = fs.createReadStream(filenPath)
+  const tempPath = filenPath + '.lxmtemp'
+  const writer = fs.createWriteStream(tempPath)
+  const processor = new flac.Processor()
+  if (meta.APIC) delete meta.APIC
+
+  const comments = []
+  for (const key in meta) {
+    comments.push(`${key.toUpperCase()}=${meta[key]}`)
+  }
+  const vendor = 'lx-music-desktop'
+
+  processor.on('preprocess', function(mdb) {
+    // Remove existing VORBIS_COMMENT block, if any.
+    if (mdb.type === flac.Processor.MDB_TYPE_VORBIS_COMMENT) {
+      mdb.remove()
+    }
+    // Inject new VORBIS_COMMENT block.
+    if (mdb.removed || mdb.isLast) {
+      let mdbVorbis = flac.data.MetaDataBlockVorbisComment.create(mdb.isLast, vendor, comments)
+      this.push(mdbVorbis.publish())
+    }
+  })
+
+  reader.pipe(processor).pipe(writer).on('finish', () => {
+    fs.unlink(filenPath, err => {
+      if (err) return console.log(err.message)
+      fs.rename(tempPath, filenPath, err => {
+        if (err) console.log(err.message)
+      })
+    })
+  })
+}
+
--- a/src/main/utils/mp3Meta.js
+++ b/src/main/utils/mp3Meta.js
@@ -0,0 +1,17 @@
+const NodeID3 = require('node-id3')
+const path = require('path')
+const fs = require('fs')
+const request = require('request')
+const extReg = /^(\.(?:jpe?g|png)).*$/
+
+module.exports = (filePath, meta) => {
+  if (!meta.APIC) return NodeID3.write(meta, filePath)
+  let picPath = path.join(path.dirname(filePath), `${meta.title}-${meta.artist}${path.extname(meta.APIC).replace(extReg, '$1')}`)
+  request(meta.APIC).pipe(fs.createWriteStream(picPath)).on('finish', () => {
+    meta.APIC = picPath
+    NodeID3.write(meta, filePath)
+    fs.unlink(picPath, err => {
+      if (err) console.log(err.message)
+    })
+  })
+}
--- a/src/main/utils/musicMeta.js
+++ b/src/main/utils/musicMeta.js
@@ -0,0 +1,14 @@
+const path = require('path')
+const mp3Meta = require('./mp3Meta')
+const flacMeta = require('./flacMeta')
+
+exports.setMeta = (filePath, meta) => {
+  switch (path.extname(filePath)) {
+    case '.mp3':
+      mp3Meta(filePath, meta)
+      break
+    case '.flac':
+      flacMeta(filePath, meta)
+      break
+  }
+}
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-#container(v-if="isProd" :class="theme" @mouseenter="enableIgnoreMouseEvents" @mouseleave="dieableIgnoreMouseEvents")
+#container(v-if="isProd && !isLinux" :class="theme" @mouseenter="enableIgnoreMouseEvents" @mouseleave="dieableIgnoreMouseEvents")
  core-aside#left
  #right
    core-toolbar#toolbar
@@ -20,17 +20,24 @@
 <script>
 import { mapMutations, mapGetters, mapActions } from 'vuex'
 import { rendererOn } from '../common/icp'
+import { isLinux } from '../common/utils'
 window.ELECTRON_DISABLE_SECURITY_WARNINGS = process.env.ELECTRON_DISABLE_SECURITY_WARNINGS
-const win = require('electron').remote.getCurrentWindow()
-const body = document.body
+let win
+let body
+if (!isLinux) {
+  win = require('electron').remote.getCurrentWindow()
+  body = document.body
+}

 export default {
  data() {
    return {
      isProd: process.env.NODE_ENV === 'production',
+      isLinux,
      globalObj: {
        apiSource: 'messoer',
      },
+      updateTimeout: null,
    }
  },
  computed: {
@@ -42,6 +49,7 @@ export default {
    }),
  },
  mounted() {
+    document.body.classList.add(this.isLinux ? 'noTransparent' : 'transparent')
    this.init()
  },
  watch: {
@@ -74,33 +82,61 @@ export default {
  },
  methods: {
    ...mapActions(['getVersionInfo']),
-    ...mapMutations(['setNewVersion', 'setVersionVisible']),
+    ...mapMutations(['setNewVersion', 'setVersionModalVisible']),
    ...mapMutations('list', ['initDefaultList']),
    ...mapMutations('download', ['updateDownloadList']),
    ...mapMutations(['setSetting']),
    init() {
-      if (this.isProd) {
+      if (this.isProd && !isLinux) {
        body.addEventListener('mouseenter', this.dieableIgnoreMouseEvents)
        body.addEventListener('mouseleave', this.enableIgnoreMouseEvents)
      }
-      rendererOn('update-downloaded', () => {
-        this.getVersionInfo().then(body => {
-          this.setNewVersion(body)
-          this.$nextTick(() => {
-            this.setVersionVisible(true)
-          })
+      rendererOn('update-available', (e, info) => {
+        // this.showUpdateModal(true)
+        this.setNewVersion({
+          version: info.version,
        })
      })
+      rendererOn('update-error', () => {
+        if (!this.updateTimeout) return
+        this.setVersionModalVisible({ isError: true })
+        this.clearUpdateTimeout()
+        this.$nextTick(() => {
+          this.showUpdateModal()
+        })
+      })
+      rendererOn('update-downloaded', () => {
+        this.clearUpdateTimeout()
+        this.showUpdateModal()
+      })
+      rendererOn('update-not-available', () => {
+        if (!this.updateTimeout) return
+        if (this.setting.ignoreVersion) this.setSetting(Object.assign({}, this.setting, { ignoreVersion: null }))
+        this.clearUpdateTimeout()
+        this.setNewVersion({
+          version: this.version.version,
+        })
+      })
+      // 更新超时定时器
+      this.updateTimeout = setTimeout(() => {
+        this.updateTimeout = null
+        this.setVersionModalVisible({ isError: true })
+        this.$nextTick(() => {
+          this.showUpdateModal()
+        })
+      }, 180000)

      this.initData()
      this.globalObj.apiSource = this.setting.apiSource
      window.globalObj = this.globalObj
    },
    enableIgnoreMouseEvents() {
+      if (isLinux) return
      win.setIgnoreMouseEvents(false)
      // console.log('content enable')
    },
    dieableIgnoreMouseEvents() {
+      if (isLinux) return
      // console.log('content disable')
      win.setIgnoreMouseEvents(true, { forward: true })
    },
@@ -131,8 +167,28 @@ export default {
        this.updateDownloadList(downloadList)
      }
    },
+    showUpdateModal() {
+      (this.version.newVersion && this.version.newVersion.history ? Promise.resolve(this.version.newVersion) : this.getVersionInfo().then(body => {
+        this.setNewVersion(body)
+        if (body.version !== this.setting.ignoreVersion) this.setSetting(Object.assign({}, this.setting, { ignoreVersion: null }))
+        return body
+      })).then(body => {
+        if (body.version === this.version.version) return
+        if (this.version.isError && body.version === this.setting.ignoreVersion) return
+
+        this.$nextTick(() => {
+          this.setVersionModalVisible({ isShow: true })
+        })
+      })
+    },
+    clearUpdateTimeout() {
+      if (!this.updateTimeout) return
+      clearTimeout(this.updateTimeout)
+      this.updateTimeout = null
+    },
  },
  beforeDestroy() {
+    this.clearUpdateTimeout()
    if (this.isProd) {
      body.removeEventListener('mouseenter', this.dieableIgnoreMouseEvents)
      body.removeEventListener('mouseleave', this.enableIgnoreMouseEvents)
@@ -146,22 +202,30 @@ export default {
@import './assets/styles/layout.less';

 body {
-  // background-color: #fff;
-  padding: @shadow-app;
  user-select: none;
  height: 100vh;
  box-sizing: border-box;
 }

+.transparent {
+  padding: @shadow-app;
+  #container {
+    box-shadow: 0 0 @shadow-app rgba(0, 0, 0, 0.5);
+    border-radius: 4px;
+    background-color: transparent;
+  }
+}
+.noTransparent {
+  background-color: #fff;
+}
+
 #container {
  position: relative;
  display: flex;
  height: 100%;
-  box-shadow: 0 0 @shadow-app rgba(0, 0, 0, 0.5);
-  // background-color: #fff;
-  border-radius: 4px;
  overflow: hidden;
 }
+
 #left {
  flex: none;
  width: @width-app-left;
--- a/src/renderer/assets/styles/index.less
+++ b/src/renderer/assets/styles/index.less
@@ -103,6 +103,10 @@ strong {
  font-weight: bold;
 }

+.underline {
+  text-decoration: underline;
+}
+
 svg {
  transition: @transition-theme;
  transition-property: fill;
--- a/src/renderer/components/core/Aside.vue
+++ b/src/renderer/components/core/Aside.vue
@@ -9,10 +9,10 @@ div(:class="$style.aside")
      dt 在线音乐
      dd
        router-link(:active-class="$style.active" to="search") 搜索
+      dd
+        router-link(:active-class="$style.active" to="songList") 歌单
      dd
        router-link(:active-class="$style.active" to="leaderboard") 排行榜
-      //- dd
-        router-link(:active-class="$style.active" to="recommend") 歌单
    dl
      dt 我的音乐
      dd
--- a/src/renderer/components/core/Icons.vue
+++ b/src/renderer/components/core/Icons.vue
@@ -48,5 +48,26 @@ svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/19
      path(fill='currentColor' d='M112.525,95.091L26.75,45.901C11.982,37.427,0,44.369,0,61.404v98.062c0,17.025,11.982,23.969,26.75,15.492l85.781-49.177C127.294,117.305,127.294,103.565,112.525,95.091z')
      // 205.857 205.857
      //- path(fill='currentColor' d='M174.522,0h-26.848c-9.885,0-17.897,8.013-17.897,17.899v62.533L37.513,2.522c-3.483-2.406-7.807-2.005-11.072-2.005c-13.061,0-13.004,11.7-13.004,14.666v175.983c0,2.507-0.057,14.666,13.004,14.666c3.265,0,7.589,0.401,11.072-2.005l92.265-77.91v62.016c0,9.885,8.012,17.898,17.897,17.898h26.848c9.885,0,17.898-8.013,17.898-17.898V17.899C192.421,8.013,184.408,0,174.522,0z')
+    g#icon-sound
+      // 0 0 291.063 291.064
+      path(fill='currentColor' d='M26.512,204.255h18.292l106.48,67.761c12.354,7.855,22.369,2.361,22.369-12.282v-69.397c16.933-8.854,28.501-26.559,28.501-46.983c0-20.425-11.568-38.129-28.501-46.986V31.645c0-14.639-10.18-20.401-22.731-12.873L44.804,82.443H26.512C11.866,82.443,0,94.311,0,108.955v68.789C0,192.387,11.866,204.255,26.512,204.255z')
+      path(fill='currentColor' d='M219.791,152.899c-0.818,11.185-4.039,21.758-9.569,31.426c-3.635,6.354-1.43,14.452,4.919,18.087c2.082,1.187,4.34,1.751,6.576,1.751c4.599,0,9.062-2.393,11.517-6.675c7.508-13.138,11.889-27.491,12.986-42.663c1.714-23.397-4.836-46.781-18.455-65.845c-4.256-5.96-12.536-7.332-18.491-3.081c-5.959,4.259-7.337,12.531-3.08,18.491C216.218,118.425,221.055,135.653,219.791,152.899z')
+      path(fill='currentColor' d='M290.7,158c3.34-45.736-16.508-89.592-53.097-117.318c-5.841-4.433-14.146-3.27-18.568,2.556c-4.428,5.838-3.283,14.151,2.558,18.568c29.401,22.281,45.355,57.521,42.668,94.252c-2.02,27.636-14.375,53.159-34.787,71.867c-5.396,4.95-5.758,13.339-0.808,18.729c2.609,2.854,6.188,4.298,9.771,4.298c3.194,0,6.41-1.154,8.953-3.484C272.805,224.175,288.184,192.408,290.7,158z')
+
+    g#icon-sdCard
+      // 0 0 291.13 291.13
+      path(fill='currentColor' d="M 50.981 282.415 c 1.722 -2.372 5.494 -4.293 8.419 -4.293 h 172.331 c 2.92 0 6.695 1.921 8.419 4.293 l 6.339 8.715 h 41.74 V 18.538 C 288.23 8.298 279.929 0 269.698 0 H 48.988 L 2.9 49.632 V 291.13 h 41.744 L 50.981 282.415 Z M 240.348 27.418 c 0 -2.926 2.371 -5.302 5.302 -5.302 h 17.668 c 2.931 0 5.303 2.376 5.303 5.302 v 50.373 c 0 2.928 -2.372 5.302 -5.303 5.302 H 245.65 c -2.931 0 -5.302 -2.375 -5.302 -5.302 V 27.418 Z M 197.929 27.418 c 0 -2.926 2.371 -5.302 5.302 -5.302 h 17.668 c 2.931 0 5.303 2.376 5.303 5.302 v 50.373 c 0 2.928 -2.372 5.302 -5.303 5.302 h -17.668 c -2.931 0 -5.302 -2.375 -5.302 -5.302 V 27.418 Z M 155.509 27.418 c 0 -2.926 2.372 -5.302 5.303 -5.302 h 17.668 c 2.931 0 5.303 2.376 5.303 5.302 v 50.373 c 0 2.928 -2.372 5.302 -5.303 5.302 h -17.668 c -2.931 0 -5.303 -2.375 -5.303 -5.302 V 27.418 Z M 113.088 27.418 c 0 -2.926 2.376 -5.302 5.302 -5.302 h 17.673 c 2.926 0 5.303 2.376 5.303 5.302 v 50.373 c 0 2.928 -2.377 5.302 -5.303 5.302 H 118.39 c -2.926 0 -5.302 -2.375 -5.302 -5.302 V 27.418 Z M 70.668 27.418 c 0 -2.926 2.377 -5.302 5.303 -5.302 h 17.673 c 2.926 0 5.302 2.376 5.302 5.302 v 50.373 c 0 2.928 -2.376 5.302 -5.302 5.302 H 75.971 c -2.926 0 -5.303 -2.375 -5.303 -5.302 V 27.418 Z M 28.25 104.303 V 53.93 c 0 -2.926 2.377 -5.302 5.303 -5.302 h 17.673 c 2.925 0 5.302 2.376 5.302 5.302 v 50.373 c 0 2.928 -2.377 5.303 -5.302 5.303 H 33.552 C 30.626 109.605 28.25 107.231 28.25 104.303 Z")
+    g#icon-musicFolder
+      // 0 0 247.498 247.498
+      path(fill='currentColor' d="M 0 200.188 c 0 14.645 11.871 26.513 26.512 26.513 h 194.475 c 14.639 0 26.512 -11.868 26.512 -26.513 V 86.192 c 0 -14.641 -11.873 -26.512 -26.512 -26.512 H 0 V 200.188 Z M 85.553 156.537 c 4.137 -0.869 8.2 -0.678 11.788 0.373 v -43.856 c 0 -3 2.11 -5.605 5.049 -6.224 l 53.047 -11.19 l 0.011 -0.005 c 0.196 -0.041 0.414 -0.041 0.621 -0.062 c 0.228 -0.021 0.445 -0.07 0.673 -0.07 c 0 0 0 0 0.011 0 c 0.093 0 0.171 0.021 0.259 0.025 c 0.331 0.011 0.663 0.034 0.984 0.102 c 0.201 0.041 0.383 0.111 0.579 0.171 c 0.197 0.062 0.404 0.106 0.601 0.184 c 0.207 0.091 0.404 0.207 0.606 0.318 c 0.155 0.085 0.315 0.155 0.471 0.256 c 0.182 0.117 0.337 0.269 0.508 0.407 c 0.155 0.121 0.311 0.228 0.445 0.362 c 0.146 0.143 0.27 0.311 0.404 0.471 c 0.124 0.153 0.269 0.295 0.383 0.471 c 0.135 0.197 0.238 0.414 0.342 0.621 c 0.088 0.153 0.176 0.295 0.254 0.456 c 0.14 0.323 0.238 0.668 0.326 1.012 c 0.01 0.065 0.041 0.122 0.062 0.186 v 0.006 c 0.042 0.223 0.052 0.46 0.073 0.688 c 0.021 0.202 0.062 0.404 0.062 0.604 c 0 0.005 0 0.005 0 0.01 v 58.148 c 0 0.367 -0.041 0.74 -0.113 1.103 c -0.135 8.196 -7.208 15.866 -17.233 17.999 c -11.319 2.413 -22.113 -3.2 -24.096 -12.521 c -1.983 -9.331 5.6 -18.838 16.93 -21.251 c 4.137 -0.87 8.202 -0.674 11.785 0.373 v -36.001 l -40.317 8.502 v 52.985 c 0 0.373 -0.042 0.74 -0.106 1.098 c -0.143 8.202 -7.216 15.876 -17.233 18.01 c -11.33 2.407 -22.121 -3.2 -24.104 -12.521 C 66.64 168.452 74.223 158.945 85.553 156.537 Z")
+    g#icon-musicFile
+      // -61 0 512 512
+      path(fill='currentColor' d='m295 120.5h86.230469l-111.230469-111.695312v86.53125c0 13.875 11.214844 25.164062 25 25.164062zm0 0')
+      path(fill='currentColor' d='m240 346.5c0 8.269531 6.730469 15 15 15s15-6.730469 15-15v-15.25h-15c-7.960938 0-15 6.324219-15 15.25zm0 0')
+      path(fill='currentColor' d='m295 150.5c-30.328125 0-55-24.746094-55-55.167969v-95.332031h-185c-30.328125 0-55 24.746094-55 55.167969v401.667969c0 30.417968 24.671875 55.164062 55 55.164062h280c30.328125 0 55-24.746094 55-55.167969v-306.332031zm5 196c0 24.8125-20.1875 45-45 45s-45-20.1875-45-45c0-25.507812 20.53125-45.25 45-45.25h15v-56.144531l-90 22.59375v108.925781c0 24.8125-20.1875 45-45 45s-45-20.1875-45-45c0-25.507812 20.53125-45.25 45-45.25h15v-75.375c0-6.878906 4.675781-12.875 11.347656-14.546875l120-30.125c9.46875-2.382813 18.652344 4.796875 18.652344 14.546875zm0 0')
+      path(fill='currentColor' d='m120 376.625c0 8.269531 6.730469 15 15 15s15-6.730469 15-15v-15.25h-15c-7.960938 0-15 6.324219-15 15.25zm0 0')
+    g#icon-down
+      // 0 0 451.847 451.847
+      path(fill='currentColor' d='M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751c12.354-12.354,32.388-12.354,44.748,0l171.905,171.915l171.906-171.909c12.359-12.354,32.391-12.354,44.744,0c12.365,12.354,12.365,32.392,0,44.751L248.292,345.449C242.115,351.621,234.018,354.706,225.923,354.706z')
 </template>

--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -8,6 +8,13 @@ div(:class="$style.player")
    div(:class="$style.column1")
      div(:class="$style.container")
        div(:class="$style.title") {{title}}
+        div(:class="$style.volumeContent")
+          div(:class="$style.volume" @click.stop='handleChangeVolume' :title="`当前音量：${volumeStr}%`")
+            div(:class="$style.volumeBar" :style="{ width: volumeStr + '%' }")
+
+        //- div(:class="$style.playBtn" @click='handleNext' title="音量")
+          svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 291.063 291.064' space='preserve')
+            use(xlink:href='#icon-sound')
        div(:class="$style.playBtn" @click='handleNext' title="下一首")
          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')
            use(xlink:href='#icon-nextMusic')
@@ -41,7 +48,7 @@ div(:class="$style.player")
 <script>
 import Lyric from 'lrc-file-parser'
 import { rendererSend } from '../../../common/icp'
-import { formatPlayTime2, getRandom, checkPath } from '../../utils'
+import { formatPlayTime2, getRandom, checkPath, setTitle } from '../../utils'
 import { mapGetters, mapActions, mapMutations } from 'vuex'
 import { requestMsg } from '../../utils/message'

@@ -50,6 +57,7 @@ export default {
    return {
      show: true,
      audio: null,
+      volume: 0,
      nowPlayTime: 0,
      maxPlayTime: 0,
      isPlay: false,
@@ -71,7 +79,7 @@ export default {
      },
      delayNextTimeout: null,
      audioErrorTime: 0,
-      // retryNum: 0,
+      retryNum: 0,
    }
  },
  computed: {
@@ -98,10 +106,15 @@ export default {
    isAPITemp() {
      return this.setting.apiSource == 'temp'
    },
+    volumeStr() {
+      return parseInt(this.volume * 100)
+    },
  },
  mounted() {
-    this.setProgessWidth()
    this.init()
+    this.$nextTick(() => {
+      this.setProgessWidth()
+    })
  },
  watch: {
    changePlay(n) {
@@ -139,6 +152,9 @@ export default {
      if (n.toFixed(2) === o.toFixed(2)) return
      this.sendProgressEvent(n, 'normal')
    },
+    volume(n) {
+      this.handleSaveVolume(n)
+    },
  },
  methods: {
    ...mapActions('player', ['getUrl', 'getPic', 'getLrc']),
@@ -147,11 +163,14 @@ export default {
      'fixPlayIndex',
      'resetChangePlay',
    ]),
+    ...mapMutations(['setVolume']),
    ...mapMutations('list', ['updateMusicInfo']),
    init() {
      this.audio = document.createElement('audio')
+      this.volume = this.audio.volume = this.setting.player.volume
      this.audio.controls = false
      this.audio.autoplay = true
+      this.audio.preload = 'auto'
      this.audio.loop = this.setting.player.togglePlayMethod === 'singleLoop'

      this.audio.addEventListener('playing', () => {
@@ -175,31 +194,17 @@ export default {
        // console.log('code', this.audio.error.code)
        if (!this.musicInfo.songmid) return
        console.log('出错')
+        this.stopPlay()
        if (this.audio.error.code !== 1 && this.retryNum < 3) { // 若音频URL无效则尝试刷新3次URL
          // console.log(this.retryNum)
          this.audioErrorTime = this.audio.currentTime // 记录出错的播放时间
          this.retryNum++
          this.setUrl(this.list[this.playIndex], true)
+          this.status = 'URL过期，正在刷新URL...'
          return
        }
-        this.stopPlay()
-        this.sendProgressEvent(this.progress, 'error')

-        // let urls = this.player_info.targetSong.urls
-        // if (urls && urls.some((url, index) => {
-        //   if (this.musicInfo.musicUrl.includes(url)) {
-        //     let newUrl = urls[index + 1]
-        //     if (!newUrl) return false
-        //     this.musicInfo.musicUrl = this.musicInfo.musicUrl.replace(url, newUrl)
-        //     // this.musicInfo.musicUrl = newUrl ? this.musicInfo.musicUrl.replace(url, newUrl) : this.setFormTag(this.musicInfo.musicUrl.replace(url, urls[0]))
-        //     return true
-        //   }
-        // })) {
-        //   this.audio.src = this.musicInfo.musicUrl
-        //   // console.log(this.musicInfo.musicUrl)
-        // } else {
-        //   this.handleNext()
-        // }
+        this.sendProgressEvent(this.progress, 'error')
        this.status = '音频加载出错，5 秒后切换下一首'
        this.addDelayNextTimeout()
      })
@@ -212,9 +217,9 @@ export default {
        if (!this.targetSong.interval && this.listId != 'download') this.updateMusicInfo({ index: this.playIndex, data: { interval: formatPlayTime2(this.maxPlayTime) } })
        this.status = '音乐加载中...'
      })
-      // this.audio.addEventListener('loadstart', () => {
-      //   this.status = '开始加载音乐信息...'
-      // })
+      this.audio.addEventListener('loadstart', () => {
+        this.status = '音乐加载中...'
+      })
      this.audio.addEventListener('canplay', () => {
        console.log('加载完成开始播放')
        // if (this.musicInfo.lrc) this.lyric.lrc.play(this.audio.currentTime * 1000)
@@ -278,7 +283,7 @@ export default {
      }
    },
    checkDelayNextTimeout() {
-      console.log(this.delayNextTimeout)
+      // console.log(this.delayNextTimeout)
      if (this.delayNextTimeout) {
        clearTimeout(this.delayNextTimeout)
        this.delayNextTimeout = null
@@ -334,16 +339,17 @@ export default {
    startPlay() {
      this.isPlay = true
      if (this.musicInfo.lrc) this.lyric.lrc.play(this.audio.currentTime * 1000)
-      this.setAppName()
+      this.setAppTitle()
      this.sendProgressEvent(this.progress, 'normal')
    },
    stopPlay() {
      this.isPlay = false
      this.lyric.lrc.pause()
      this.sendProgressEvent(this.progress, 'paused')
-      this.clearAppName()
+      this.clearAppTitle()
    },
    setProgess(e) {
+      if (!this.audio.src) return
      this.audio.currentTime =
        (e.offsetX / this.pregessWidth) * this.maxPlayTime
      if (!this.isPlay) this.audio.play()
@@ -395,12 +401,12 @@ export default {
      }
    },
    setLrc(targetSong) {
-      this.musicInfo.lrc = targetSong.lyric
+      this.musicInfo.lrc = targetSong.lrc

      let lrcP = this.musicInfo.lrc
        ? Promise.resolve()
        : this.getLrc(targetSong).then(() => {
-          this.musicInfo.lrc = targetSong.lyric
+          this.musicInfo.lrc = targetSong.lrc
        })

      lrcP
@@ -408,8 +414,8 @@ export default {
          this.lyric.lrc.setLyric(this.musicInfo.lrc)
          if (this.isPlay && (this.musicInfo.url || this.listId == 'download')) this.lyric.lrc.play(this.audio.currentTime * 1000)
        })
-        .catch(err => {
-          this.status = err.message
+        .catch(() => {
+          this.status = '歌词获取失败'
        })
    },
    handleRemoveMusic() {
@@ -427,18 +433,27 @@ export default {
    },
    sendProgressEvent(status, mode) {
      // console.log(status)
-      rendererSend('progress', {
+      this.setting.player.isShowTaskProgess && rendererSend('progress', {
        status: status < 0.01 ? 0.01 : status,
        mode: mode || 'normal',
      })
    },
-    setAppName() {
-    //   rendererSend('appName', {
-    //     name: `${this.musicInfo.name} - ${this.musicInfo.singer}`,
-    //   })
+    setAppTitle() {
+      setTitle(`${this.musicInfo.name} - ${this.musicInfo.singer}`)
    },
-    clearAppName() {
-      // rendererSend('appName')
+    clearAppTitle() {
+      setTitle()
+    },
+    handleChangeVolume(e) {
+      let val = e.offsetX / 70
+      if (val < 0) val = 0
+      if (val > 1) val = 1
+      if (val > 0.97) val = 1
+      this.volume = val
+      if (this.audio) this.audio.volume = this.volume
+    },
+    handleSaveVolume(volume) {
+      this.setVolume(volume)
    },
  },
 }
@@ -511,6 +526,40 @@ export default {
  .mixin-ellipsis-1;
 }

+.volume-content {
+  width: 100px;
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+}
+
+.volume {
+  cursor: pointer;
+  width: 100%;
+  height: 0.25em;
+  border-radius: 10px;
+  // overflow: hidden;
+  transition: @transition-theme;
+  transition-property: background-color;
+  background-color: @color-player-progress;
+  // background-color: #f5f5f5;
+  position: relative;
+  border-radius: @radius-progress-border;
+}
+
+.volume-bar {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 0;
+  height: 100%;
+  border-radius: @radius-progress-border;
+  transition-duration: 0.2s;
+  background-color: @color-theme;
+  box-shadow: 0 0 2px rgba(0, 0, 0, 0.2);
+  opacity: .5;
+}
+
 .play-btn {
  + .play-btn {
    margin-left: 10px;
@@ -631,6 +680,14 @@ each(@themes, {
        filter: drop-shadow(0 0 1px rgba(0, 0, 0, 0.3));
      }
    }
+    .volume {
+      background-color: ~'@{color-@{value}-player-progress}';
+    }
+
+    .volume-bar {
+      background-color: ~'@{color-@{value}-theme}';
+      box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
+    }


    .progress {
--- a/src/renderer/components/core/Toolbar.vue
+++ b/src/renderer/components/core/Toolbar.vue
@@ -83,8 +83,14 @@ each(@themes, {
  display: flex;
  height: 100%;
  -webkit-app-region: no-drag;
+  &:hover {
+    button:before {
+      opacity: 1;
+    }
+  }

  button {
+    position: relative;
    width: @height-toolbar;
    background: none;
    border: none;
@@ -99,11 +105,18 @@ each(@themes, {
      content: ' ';
      display: block;
      border-radius: 50%;
-      width: 13px;
-      height: 13px;
+      width: 14px;
+      height: 14px;
      transition: background-color 0.2s ease-in-out;
    }

+    &:before {
+      display: block;
+      position: absolute;
+      opacity: 0;
+      transition: opacity @transition-theme;
+    }
+
    &.min:after {
      background-color: @color-minBtn;
    }
@@ -116,6 +129,7 @@ each(@themes, {

    &.min:hover:after {
      background-color: lighten(@color-minBtn, 10%);
+      opacity: 1;
    }
    &.max:hover:after {
      background-color: lighten(@color-maxBtn, 10%);
@@ -125,4 +139,25 @@ each(@themes, {
    }
  }
 }
+.min {
+  &:before {
+    content: ' ';
+    width: 8px;
+    height: 2px;
+    left: @height-toolbar / 2 - 4;
+    top: @height-toolbar / 2 - 1;
+    background-color: #fff;
+  }
+}
+.close {
+  &:before {
+    content: '×';
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 14px;
+    line-height: 1;
+    color: #fff;
+  }
+}
 </style>
--- a/src/renderer/components/material/Checkbox.vue
+++ b/src/renderer/components/material/Checkbox.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 div(:class="$style.checkbox")
-  input(:type="need ? 'radio' : 'checkbox'" :id="id" :value="value" :name="name" @change="change" v-model="bool")
+  input(:type="need ? 'radio' : 'checkbox'" :id="id" :disabled="disabled" :value="value" :name="name" @change="change" v-model="bool")
  label(:for="id" :class="$style.content")
    div(v-if="indeterminate")
      svg(v-show="indeterminate" version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' width="100%" viewBox='0 32 448 448' space='preserve')
@@ -34,6 +34,10 @@ export default {
      default: false,
    },
    label: {},
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
    indeterminate: {
      type: Boolean,
      default: false,
@@ -111,6 +115,11 @@ export default {

  > input {
    display: none;
+    &[disabled] {
+      + .content {
+        opacity: .5;
+      }
+    }
    &:checked {
      + .content {
        > div {
--- a/src/renderer/components/material/DownloadModal.vue
+++ b/src/renderer/components/material/DownloadModal.vue
@@ -5,7 +5,7 @@ material-modal(:show="show" :bg-close="bgClose" @close="handleClose")
      | {{ info.name }}
      br
      | {{ info.singer }}
-    material-btn(:class="$style.btn" :title="!checkSource(type.type) && '目前酷狗、网易云音源仅支持下载128k音质'" :disabled="!checkSource(type.type)" :key="type.type" @click="handleClick(type.type)" v-for="type in info.types") {{getTypeName(type.type)}} {{ type.type.toUpperCase() }}{{ type.size && ` - ${type.size.toUpperCase()}` }}
+    material-btn(:class="$style.btn" :title="!checkSource(type.type) && '目前酷狗音源仅支持下载128k音质'" :disabled="!checkSource(type.type)" :key="type.type" @click="handleClick(type.type)" v-for="type in info.types") {{getTypeName(type.type)}} {{ type.type.toUpperCase() }}{{ type.size && ` - ${type.size.toUpperCase()}` }}

 </template>

--- a/src/renderer/components/material/InputRange.vue
+++ b/src/renderer/components/material/InputRange.vue
@@ -0,0 +1,80 @@
+<template lang="pug">
+  input(type="range" :class="[$style.range, min ? $style.min : '']" :disabled="disabled" v-model="val" input="handleInput" @change="handleChange")
+</template>
+
+<script>
+export default {
+  props: {
+    min: {
+      type: Boolean,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    value: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      val: 0,
+    }
+  },
+  mounted() {
+    this.val = this.value
+  },
+  methods: {
+    handleChange(e) {
+      this.$emit('input', this.val)
+      this.$emit('change', e)
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+
+.range {
+  display: inline-block;
+  border-radius: .25em;
+  cursor: pointer;
+  color: @color-btn;
+  outline: none;
+  background: transparent;
+  // background-color: @color-btn-background;
+  &[disabled] {
+    opacity: .4;
+  }
+
+  &:hover {
+    background-color: @color-theme_2-hover;
+  }
+  &:active {
+    background-color: @color-theme_2-active;
+  }
+}
+
+.min {
+
+}
+
+// each(@themes, {
+//   :global(#container.@{value}) {
+//     .btn {
+//       color: ~'@{color-@{value}-btn}';
+//       background-color: ~'@{color-@{value}-btn-background}';
+//       &:hover {
+//         background-color: ~'@{color-@{value}-theme_2-hover}';
+//       }
+//       &:active {
+//         background-color: ~'@{color-@{value}-theme_2-active}';
+//       }
+//     }
+//   }
+// })
+
+</style>
--- a/src/renderer/components/material/ListButtons.vue
+++ b/src/renderer/components/material/ListButtons.vue
@@ -15,6 +15,9 @@ div(:class="$style.btns")
  button(type="button" v-if="pauseBtn" title="暂停" @click.stop="handleClick('pause')")
    svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 277.338 277.338' space='preserve')
      use(xlink:href='#icon-pause')
+  button(type="button" v-if="fileBtn" title="定位文件" @click.stop="handleClick('file')")
+    svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='-61 0 512 512' space='preserve')
+      use(xlink:href='#icon-musicFile')
  button(type="button" v-if="removeBtn" title="移除" @click.stop="handleClick('remove')")
    svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 212.982 212.982' space='preserve')
      use(xlink:href='#icon-delete')
@@ -57,6 +60,10 @@ export default {
      type: Boolean,
      default: false,
    },
+    fileBtn: {
+      type: Boolean,
+      default: false,
+    },
  },
  computed: {
    ...mapGetters(['userInfo']),
--- a/src/renderer/components/material/SearchInput.vue
+++ b/src/renderer/components/material/SearchInput.vue
@@ -34,8 +34,11 @@ export default {
    }
  },
  computed: {
-    ...mapGetters(['source']),
+    ...mapGetters(['source', 'route', 'setting']),
    ...mapGetters('search', ['info']),
+    isAutoClearInput() {
+      return this.setting.odc.isAutoClearSearchInput
+    },
  },
  watch: {
    list(n) {
@@ -46,6 +49,9 @@ export default {
    'info.text'(n) {
      if (n !== this.text) this.text = n
    },
+    route(n) {
+      if (this.isAutoClearInput && n.name != 'search' && this.text) this.text = ''
+    },
  },
  methods: {
    handleTemplistClick(index) {
--- a/src/renderer/components/material/SongList.vue
+++ b/src/renderer/components/material/SongList.vue
@@ -0,0 +1,235 @@
+<template lang="pug">
+div(:class="$style.songList")
+  transition(enter-active-class="animated fadeIn" leave-active-class="animated fadeOut")
+    div(v-if="list.length" :class="$style.list")
+      div(:class="$style.thead")
+        table
+          thead
+            tr
+              th.nobreak.center(style="width: 37px;")
+                material-checkbox(id="search_select_all" v-model="isSelectAll" @change="handleSelectAllData"
+                  :indeterminate="isIndeterminate" :title="isSelectAll && !isIndeterminate ? '全不选' : '全选'")
+              th.nobreak(style="width: 25%;") 歌曲名
+              th.nobreak(style="width: 20%;") 歌手
+              th.nobreak(style="width: 22%;") 专辑
+              th.nobreak(style="width: 18%;") 操作
+              th.nobreak(style="width: 10%;") 时长
+      div.scroll(:class="$style.tbody" ref="dom_scrollContent")
+        table
+          tbody
+            tr(v-for='(item, index) in list' :key='item.songmid' @click="handleDoubleClick(index)")
+              td.nobreak.center(style="width: 37px;" @click.stop)
+                material-checkbox(:id="index.toString()" v-model="selectdList" @change="handleChangeSelect" :value="item")
+              td.break(style="width: 25%;")
+                | {{item.name}}
+                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: 22%;") {{item.albumName}}
+              td(style="width: 18%;")
+                material-list-buttons(:index="index" :search-btn="true" :play-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx' && item.source != 'wy')" :download-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx' && item.source != 'wy')" :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(v-html="noItem")
+  material-flow-btn(:show="isShowEditBtn && (source == 'kw' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { scrollTo } from '../../utils'
+export default {
+  name: 'MaterialSongList',
+  model: {
+    prop: 'selectdData',
+    event: 'input',
+  },
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
+    page: {
+      type: Number,
+      required: true,
+    },
+    limit: {
+      type: Number,
+      required: true,
+    },
+    total: {
+      type: Number,
+      required: true,
+    },
+    selectdData: {
+      type: Array,
+      required: true,
+    },
+    source: {
+      type: String,
+    },
+    noItem: {
+      type: String,
+      default: '列表加载中...',
+    },
+  },
+  computed: {
+    ...mapGetters(['setting']),
+    isAPITemp() {
+      return this.setting.apiSource == 'temp'
+    },
+  },
+  watch: {
+    selectdList(n) {
+      const len = n.length
+      if (len) {
+        this.isSelectAll = true
+        this.isIndeterminate = len !== this.list.length
+        this.isShowEditBtn = true
+      } else {
+        this.isSelectAll = false
+        this.isShowEditBtn = false
+      }
+    },
+    selectdData(n) {
+      const len = n.length
+      if (len) {
+        this.isSelectAll = true
+        this.isIndeterminate = len !== this.list.length
+        this.isShowEditBtn = true
+        this.selectdList = [...n]
+      } else {
+        this.isSelectAll = false
+        this.isShowEditBtn = false
+        this.resetSelect()
+      }
+    },
+    list(n) {
+      this.resetSelect()
+      if (!this.list.length) return
+      this.$nextTick(() => scrollTo(this.$refs.dom_scrollContent, 0))
+    },
+  },
+  data() {
+    return {
+      clickTime: 0,
+      clickIndex: -1,
+      isSelectAll: false,
+      isIndeterminate: false,
+      isShowEditBtn: false,
+      selectdList: [],
+    }
+  },
+  methods: {
+    handleDoubleClick(index) {
+      if (
+        window.performance.now() - this.clickTime > 400 ||
+        this.clickIndex !== index
+      ) {
+        this.clickTime = window.performance.now()
+        this.clickIndex = index
+        return
+      }
+      this.emitEvent((this.source == 'kw' || (!this.isAPITemp && this.list[index].source != 'tx' && this.list[index].source != 'wy')) ? 'testPlay' : 'search', index)
+      this.clickTime = 0
+      this.clickIndex = -1
+    },
+    handleListBtnClick(info) {
+      this.emitEvent('listBtnClick', info)
+    },
+    handleSelectAllData(isSelect) {
+      this.selectdList = isSelect ? [...this.list] : []
+      this.$emit('input', [...this.selectdList])
+    },
+    resetSelect() {
+      this.selectdList = false
+      this.selectdList = []
+    },
+    handleTogglePage(page) {
+      this.emitEvent('togglePage', page)
+    },
+    handleFlowBtnClick(action) {
+      this.emitEvent('flowBtnClick', action)
+    },
+    emitEvent(action, data) {
+      this.$emit('action', { action, data })
+    },
+    handleChangeSelect() {
+      this.$emit('input', [...this.selectdList])
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+.song-list {
+  overflow: hidden;
+  height: 100%;
+  display: flex;
+  flex-flow: column nowrap;
+  background-color: @color-theme_2;
+}
+
+.list {
+  position: relative;
+  font-size: 14px;
+  overflow: hidden;
+  display: flex;
+  flex-flow: column nowrap;
+}
+.thead {
+  flex: none;
+}
+.tbody {
+  flex: auto;
+  overflow-y: auto;
+  td {
+    font-size: 12px;
+    :global(.badge) {
+      margin-right: 3px;
+      &:first-child {
+        margin-left: 3px;
+      }
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
+}
+.pagination {
+  text-align: center;
+  padding: 15px 0;
+  // left: 50%;
+  // transform: translateX(-50%);
+}
+.noitem {
+  position: relative;
+  height: 100%;
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: center;
+  align-items: center;
+
+  p {
+    font-size: 24px;
+    color: #ccc;
+  }
+}
+
+each(@themes, {
+  :global(#container.@{value}) {
+    .thead {
+      background-color: ~'@color-@{value}-theme_2';
+    }
+  }
+})
+
+</style>
--- a/src/renderer/components/material/TagList.vue
+++ b/src/renderer/components/material/TagList.vue
@@ -0,0 +1,240 @@
+<template lang="pug">
+  div(:class="$style.tagList")
+    div(:class="$style.label" ref="dom_btn" @click="handleShow")
+      span {{value.name}}
+      div(:class="[$style.icon, show ? $style.active : '']")
+        svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 451.847 451.847' space='preserve')
+          use(xlink:href='#icon-down')
+    div.scroll(:class="$style.list" @click.stop ref="dom_list" :style="listStyle")
+      div(:class="$style.tag" @click="handleClick(null)") 默认
+      dl(v-for="type in list")
+        dt(:class="$style.type") {{type.name}}
+        dd(:class="$style.tag" v-for="tag in type.list" @click="handleClick(tag)") {{tag.name}}
+</template>
+
+<script>
+import { isChildren } from '../../utils'
+export default {
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
+    value: {
+      type: Object,
+    },
+  },
+  data() {
+    return {
+      show: false,
+      listStyle: {
+        height: 0,
+        opacity: 0,
+      },
+    }
+  },
+  watch: {
+    show(n) {
+      this.$nextTick(() => {
+        if (n) {
+          let sh = this.$refs.dom_list.scrollHeight
+          this.listStyle.height = (sh > 250 ? 250 : sh) + 'px'
+          this.listStyle.opacity = 1
+          this.listStyle.overflow = 'auto'
+        } else {
+          this.listStyle.height = 0
+          this.listStyle.opacity = 0
+        }
+      })
+    },
+    list() {
+      this.$refs.dom_list.scrollTop = 0
+    },
+  },
+  mounted() {
+    document.addEventListener('click', this.handleHide)
+  },
+  beforeDestroy() {
+    document.removeEventListener('click', this.handleHide)
+  },
+  methods: {
+    handleHide(e) {
+      // if (e && e.target.parentNode != this.$refs.dom_list && this.show) return this.show = false
+      if (e && (e.target == this.$refs.dom_btn || isChildren(this.$refs.dom_btn, e.target))) return
+      setTimeout(() => {
+        this.show = false
+      }, 50)
+    },
+    handleClick(item) {
+      if (!item) {
+        item = {
+          name: '默认',
+          id: null,
+        }
+      }
+      if (item.id === this.value.id) return this.handleShow()
+      this.$emit('input', item)
+      this.$emit('change', item)
+      this.handleShow()
+    },
+    handleShow() {
+      this.show = !this.show
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+
+.tag-list {
+  font-size: 12px;
+  position: relative;
+}
+
+.label {
+  padding: 8px 15px;
+  // background-color: @color-btn-background;
+  transition: background-color @transition-theme;
+  border-top: 2px solid @color-tab-border-bottom;
+  // border-left: 2px solid @color-tab-border-bottom;
+  box-sizing: border-box;
+  text-align: center;
+  // border-top-left-radius: 3px;
+  color: @color-btn;
+  cursor: pointer;
+
+  display: flex;
+
+  span {
+    flex: auto;
+  }
+  .icon {
+    flex: none;
+    margin-left: 7px;
+    line-height: 0;
+    svg {
+      width: 1em;
+      transition: transform .2s ease;
+      transform: rotate(0);
+    }
+    &.active {
+      svg{
+        transform: rotate(180deg);
+      }
+    }
+  }
+
+  &:hover {
+    background-color: @color-theme_2-hover;
+  }
+  &:active {
+    background-color: @color-theme_2-active;
+  }
+}
+
+.list {
+  position: absolute;
+  top: 100%;
+  width: 646px;
+  left: 0;
+  border-bottom: 2px solid @color-tab-border-bottom;
+  border-right: 2px solid @color-tab-border-bottom;
+  border-bottom-right-radius: 5px;
+  background-color: @color-theme_2;
+  overflow: hidden;
+  opacity: 0;
+  transition: .25s ease;
+  transition-property: height, opacity;
+  z-index: 10;
+  padding: 10px;
+  box-sizing: border-box;
+
+  li {
+    cursor: pointer;
+    padding: 8px 15px;
+    // color: @color-btn;
+    text-align: center;
+    outline: none;
+    transition: background-color @transition-theme;
+    background-color: @color-btn-background;
+    box-sizing: border-box;
+
+    &:hover {
+      background-color: @color-theme_2-hover;
+    }
+    &:active {
+      background-color: @color-theme_2-active;
+    }
+  }
+}
+
+.type {
+  padding-top: 10px;
+  padding-bottom: 3px;
+  color: #999;
+}
+
+.tag {
+  display: inline-block;
+  margin: 5px;
+  background-color: @color-btn-background;
+  padding: 8px 10px;
+  border-radius: @radius-progress-border;
+  transition: background-color @transition-theme;
+  cursor: pointer;
+  &:hover {
+    background-color: @color-theme_2-hover;
+  }
+  &:active {
+    background-color: @color-theme_2-active;
+  }
+}
+
+
+each(@themes, {
+  :global(#container.@{value}) {
+    .label {
+      border-top-color: ~'@{color-@{value}-tab-border-bottom}';
+      // border-left-color: ~'@{color-@{value}-tab-border-bottom}';
+      color: ~'@{color-@{value}-btn}';
+      &:hover {
+        background-color: ~'@{color-@{value}-theme_2-hover}';
+      }
+      &:active {
+        background-color: ~'@{color-@{value}-theme_2-active}';
+      }
+    }
+
+    .list {
+      border-bottom-color: ~'@{color-@{value}-tab-border-bottom}';
+      border-right-color: ~'@{color-@{value}-tab-border-bottom}';
+      // border-left-color: ~'@{color-@{value}-tab-border-bottom}';
+      li {
+        // color: ~'@{color-@{value}-btn}';
+        background-color: ~'@{color-@{value}-btn-background}';
+        &:hover {
+          background-color: ~'@{color-@{value}-theme_2-hover}';
+        }
+        &:active {
+          background-color: ~'@{color-@{value}-theme_2-active}';
+        }
+      }
+    }
+
+    .tag {
+      background-color: ~'@{color-@{value}-btn-background}';
+      &:hover {
+        background-color: ~'@{color-@{value}-theme_2-hover}';
+      }
+      &:active {
+        background-color: ~'@{color-@{value}-theme_2-active}';
+      }
+    }
+  }
+})
+
+</style>
--- a/src/renderer/components/material/VersionModal.vue
+++ b/src/renderer/components/material/VersionModal.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 material-modal(:show="version.showModal" @close="handleClose")
  main(:class="$style.main" v-if="version.newVersion")
-    h2 🚀程序更新🚀
+    h2 {{ version.isError ? (isUnknow ? '❓ 版本信息获取失败 ❓' : '🌟发现新版本🌟') : '🚀程序更新🚀'}}

    div.scroll(:class="$style.info")
      div(:class="$style.current")
@@ -15,7 +15,20 @@ material-modal(:show="version.showModal" @close="handleClose")
          h4 v{{ver.version}}
          p(v-html="ver.desc")

-    div(:class="$style.footer")
+    div(:class="$style.footer" v-if="version.isError")
+      div(:class="$style.desc" v-if="!isUnknow")
+        p 发现有新版本啦，但是自动更新功能出问题了
+        p
+          | 如果你所用的软件是
+          strong 安装版
+          | ，可以到QQ群：830125506 反馈哦
+        p
+          | 你现在可以选择继续使用当前版本或
+          strong 去发布页下载新版本
+      div(:class="$style.btns")
+        material-btn(:class="$style.btn" @click.onec="handleIgnoreClick") 忽略该版本
+        material-btn(:class="$style.btn" @click.onec="handleOpenPageClick") 去下载新版本
+    div(:class="$style.footer" v-else)
      div(:class="$style.desc")
        p 新版本已下载完毕，
        p
@@ -24,18 +37,18 @@ material-modal(:show="version.showModal" @close="handleClose")
          | 或稍后
          strong 关闭程序时
          | 自动更新~
-      material-btn(:class="$style.btn" @click.onec="handleClick") 立即重启更新
+      material-btn(:class="$style.btn" @click.onec="handleRestartClick") 立即重启更新

 </template>

 <script>
 import { mapGetters, mapMutations } from 'vuex'
 import { rendererSend } from '../../../common/icp'
-import { checkVersion } from '../../utils'
+import { checkVersion, openUrl } from '../../utils'

 export default {
  computed: {
-    ...mapGetters(['version']),
+    ...mapGetters(['version', 'setting']),
    history() {
      if (!this.version.newVersion) return []
      let arr = []
@@ -46,13 +59,26 @@ export default {

      return arr
    },
+    isUnknow() {
+      return this.version.newVersion.version == '0.0.0'
+    },
  },
  methods: {
-    ...mapMutations(['setVersionVisible']),
+    ...mapMutations(['setVersionModalVisible', 'setSetting']),
    handleClose() {
-      this.setVersionVisible(false)
+      this.setVersionModalVisible({
+        isShow: false,
+      })
    },
-    handleClick(event) {
+    handleIgnoreClick(event) {
+      this.handleClose()
+      // event.target.disabled = true
+      this.setSetting(Object.assign({}, this.setting, { ignoreVersion: this.version.newVersion.version }))
+    },
+    handleOpenPageClick() {
+      openUrl('https://github.com/lyswhut/lx-music-desktop')
+    },
+    handleRestartClick(event) {
      this.handleClose()
      event.target.disabled = true
      rendererSend('quit-update')
@@ -68,7 +94,7 @@ export default {
 .main {
  position: relative;
  padding: 15px;
-  max-width: 500px;
+  max-width: 450px;
  min-width: 300px;
  display: flex;
  flex-flow: column nowrap;
@@ -156,6 +182,11 @@ export default {
  display: block;
  width: 100%;
 }
+.btns {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-gap: 0 10px;
+}

 each(@themes, {
  :global(#container.@{value}) {
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-// import { sync } from 'vuex-router-sync'
+import { sync } from 'vuex-router-sync'

 // Components
 import './components'
@@ -11,7 +11,7 @@ import App from './App'
 import router from './route'
 import store from './store'

-// sync(store, router)
+sync(store, router)

 if (!process.env.IS_WEB) {

--- a/src/renderer/route/paths.js
+++ b/src/renderer/route/paths.js
@@ -18,9 +18,9 @@ export default [
    view: 'Leaderboard',
  },
  {
-    path: '/recommend',
-    name: 'recommend',
-    view: 'Recommend',
+    path: '/songList',
+    name: 'songList',
+    view: 'SongList',
  },
  {
    path: '/list',
--- a/src/renderer/store/actions.js
+++ b/src/renderer/store/actions.js
@@ -5,8 +5,14 @@ import { author, name } from '../../../package.json'
 export default {
  getVersionInfo() {
    return new Promise((resolve, reject) => {
-      httpGet(`https://raw.githubusercontent.com/${author}/${name}/master/publish/version.json`, (err, resp, body) => {
-        if (err) return reject(err)
+      httpGet(`https://raw.githubusercontent.com/${author.name}/${name}/master/publish/version.json`, (err, resp, body) => {
+        if (err) {
+          return resolve({
+            version: '0.0.0',
+            desc: '<h3>版本信息获取失败</h3><ul><li>更新信息获取失败，可能是无法访问Github导致的，请手动检查更新！</li><li>检查方法：去设置-关于洛雪音乐打开<strong>开源地址</strong>或<strong>网盘地址</strong>查看<strong>版本号</strong>与当前版本对比是否最新</li></ul>',
+            history: [],
+          })
+        }
        resolve(body)
      })
    })
--- a/src/renderer/store/getters.js
+++ b/src/renderer/store/getters.js
@@ -31,4 +31,7 @@ export default {
  version(state) {
    return state.version
  },
+  route(state) {
+    return state.route
+  },
 }
--- a/src/renderer/store/modules/download.js
+++ b/src/renderer/store/modules/download.js
@@ -3,6 +3,7 @@ import fs from 'fs'
 import path from 'path'
 import music from '../../utils/music'
 import { getMusicType } from '../../utils/music/utils'
+import { setMeta, saveLrc } from '../../utils'

 // state
 const state = {
@@ -75,6 +76,43 @@ const getUrl = (downloadInfo, isRefresh) => {
  return url && !isRefresh ? Promise.resolve({ url }) : music[downloadInfo.musicInfo.source].getMusicUrl(downloadInfo.musicInfo, downloadInfo.type).promise
 }

+/**
+ * 设置歌曲meta信息
+ * @param {*} downloadInfo
+ * @param {*} filePath
+ * @param {*} isEmbedPic
+ */
+const saveMeta = (downloadInfo, filePath, isEmbedPic) => {
+  if (downloadInfo.type === 'ape') return
+  const promise = isEmbedPic
+    ? downloadInfo.musicInfo.img
+      ? Promise.resolve(downloadInfo.musicInfo.img)
+      : music[downloadInfo.musicInfo.source].getPic(downloadInfo.musicInfo).promise
+    : Promise.resolve()
+  promise.then(url => {
+    setMeta(filePath, {
+      title: downloadInfo.musicInfo.name,
+      artist: downloadInfo.musicInfo.singer,
+      album: downloadInfo.musicInfo.albumName,
+      APIC: url,
+    })
+  })
+}
+
+/**
+ * 保存歌词
+ * @param {*} downloadInfo
+ * @param {*} filePath
+ */
+const downloadLyric = (downloadInfo, filePath) => {
+  const promise = downloadInfo.musicInfo.lrc
+    ? Promise.resolve(downloadInfo.musicInfo.lrc)
+    : music[downloadInfo.musicInfo.source].getLyric(downloadInfo.musicInfo).promise
+  promise.then(lrc => {
+    if (lrc) saveLrc(filePath.replace(/(mp3|flac|ape)$/, 'lrc'), lrc)
+  })
+}
+
 // actions
 const actions = {
  createDownload({ state, rootState, commit }, { musicInfo, type }) {
@@ -133,8 +171,16 @@ const actions = {
      method: 'get',
      override: true,
      onEnd() {
+        if (downloadInfo.progress.progress != '100.00') {
+          delete dls[downloadInfo.key]
+          return this.dispatch('download/startTask', downloadInfo)
+        }
        commit('onEnd', downloadInfo)
        _this.dispatch('download/startTask')
+        const filePath = path.join(options.path, options.fileName)
+
+        saveMeta(downloadInfo, filePath, rootState.setting.download.isEmbedPic)
+        if (rootState.setting.download.isDownloadLrc) downloadLyric(downloadInfo, filePath)
        console.log('on complate')
      },
      onError(err) {
--- a/src/renderer/store/modules/player.js
+++ b/src/renderer/store/modules/player.js
@@ -56,13 +56,13 @@ const actions = {
 // mitations
 const mutations = {
  setUrl(state, datas) {
-    datas.musicInfo.typeUrl[datas.type] = datas.url
+    datas.musicInfo.typeUrl = Object.assign({}, datas.musicInfo.typeUrl, { [datas.type]: datas.url })
  },
  getPic(state, datas) {
    datas.musicInfo.img = datas.url
  },
  setLrc(state, datas) {
-    datas.musicInfo.lyric = datas.lrc
+    datas.musicInfo.lrc = datas.lrc
  },
  setList(state, { list, listId, index }) {
    state.list = list
--- a/src/renderer/store/modules/songList.js
+++ b/src/renderer/store/modules/songList.js
@@ -0,0 +1,110 @@
+import music from '../../utils/music'
+const sortList = {}
+const sources = []
+for (const source of music.sources) {
+  const songList = music[source.id].songList
+  if (!songList) continue
+  sortList[source.id] = songList.sortList
+  sources.push(source)
+}
+
+// state
+const state = {
+  tags: {},
+  list: {
+    list: [],
+    total: 0,
+    page: 1,
+    limit: 30,
+    key: null,
+  },
+  listDetail: {
+    list: [],
+    total: 0,
+    page: 1,
+    limit: 30,
+    key: null,
+  },
+  selectListInfo: {},
+  isVisibleListDetail: false,
+}
+
+sources.forEach(source => {
+  state.tags[source.id] = null
+})
+
+
+// getters
+const getters = {
+  sourceInfo: () => ({ sources, sortList }),
+  tags: state => state.tags,
+  isVisibleListDetail: state => state.isVisibleListDetail,
+  selectListInfo: state => state.selectListInfo,
+  listData(state) {
+    return state.list
+  },
+  listDetail(state) {
+    return state.listDetail
+  },
+}
+
+// actions
+const actions = {
+  getTags({ state, rootState, commit }) {
+    let source = rootState.setting.songList.source
+    return music[source].songList.getTags().then(result => commit('setTags', { tags: result, source }))
+  },
+  getList({ state, rootState, commit }, page) {
+    let source = rootState.setting.songList.source
+    let tabId = rootState.setting.songList.tagInfo.id
+    let sortId = rootState.setting.songList.sortId
+    // console.log(sortId)
+    let key = `${source}${sortId}${tabId}${page}`
+    if (state.list.list.length && state.list.key == key) return true
+    return music[source].songList.getList(sortId, tabId, page).then(result => commit('setList', { result, key, page }))
+  },
+  getListDetail({ state, rootState, commit }, { id, page }) {
+    let source = rootState.setting.songList.source
+    let key = `${source}${id}${page}`
+    if (state.listDetail.list.length && state.listDetail.key == key) return true
+    return music[source].songList.getListDetail(id, page).then(result => commit('setListDetail', { result, key, page }))
+  },
+}
+
+// mitations
+const mutations = {
+  setTags(state, { tags, source }) {
+    state.tags[source] = tags
+  },
+  setList(state, { result, key, page }) {
+    state.list.list = result.list
+    state.list.total = result.total
+    state.list.limit = result.limit
+    state.list.page = page
+    state.list.key = key
+  },
+  setListDetail(state, { result, key, page }) {
+    state.listDetail.list = result.list
+    state.listDetail.total = result.total
+    state.listDetail.limit = result.limit
+    state.listDetail.page = page
+    state.listDetail.key = key
+  },
+  setVisibleListDetail(state, bool) {
+    state.isVisibleListDetail = bool
+  },
+  setSelectListInfo(state, info) {
+    state.selectListInfo = info
+  },
+  clearListDetail(state) {
+    state.listDetail.list = []
+  },
+}
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+}
--- a/src/renderer/store/mutations.js
+++ b/src/renderer/store/mutations.js
@@ -12,6 +12,11 @@ export default {
    if (tabId != null) state.setting.leaderboard.tabId = tabId
    if (source != null) state.setting.leaderboard.source = source
  },
+  setSongList(state, { sortId, tagInfo, source }) {
+    if (tagInfo != null) state.setting.songList.tagInfo = tagInfo
+    if (sortId != null) state.setting.songList.sortId = sortId
+    if (source != null) state.setting.songList.source = source
+  },
  setNewVersion(state, val) {
    // val.history.forEach(ver => {
    //   ver.desc = ver.desc.replace(/\n/g, '<br>')
@@ -19,7 +24,11 @@ export default {
    // val.desc = val.desc.replace(/\n/g, '<br>')
    state.version.newVersion = val
  },
-  setVersionVisible(state, val) {
-    state.version.showModal = val
+  setVersionModalVisible(state, { isShow, isError }) {
+    if (isShow !== undefined) state.version.showModal = isShow
+    if (isError !== undefined) state.version.isError = isError
+  },
+  setVolume(state, val) {
+    state.setting.player.volume = val
  },
 }
--- a/src/renderer/store/state.js
+++ b/src/renderer/store/state.js
@@ -49,6 +49,7 @@ export default {
    version,
    newVersion: null,
    showModal: false,
+    isError: false,
  },
  userInfo: null,
  setting,
--- a/src/renderer/utils/index.js
+++ b/src/renderer/utils/index.js
@@ -1,7 +1,9 @@
 import fs from 'fs'
-import { shell, remote } from 'electron'
+import { shell, remote, clipboard } from 'electron'
 import path from 'path'
 import os from 'os'
+import crypto from 'crypto'
+import { rendererSend } from '../../common/icp'

 /**
 * 获取两个数之间的随机整数，大于等于min，小于max
@@ -161,12 +163,14 @@ export const isChildren = (parent, children) => {
 * @param {*} setting
 */
 export const updateSetting = setting => {
-  const defaultVersion = '1.0.3'
+  const defaultVersion = '1.0.7'
  const defaultSetting = {
    version: defaultVersion,
    player: {
      togglePlayMethod: 'listLoop',
      highQuality: false,
+      isShowTaskProgess: true,
+      volume: 1,
    },
    list: {
      isShowAlbumName: true,
@@ -175,15 +179,29 @@ export const updateSetting = setting => {
      savePath: path.join(os.homedir(), 'Desktop'),
      fileName: '歌名 - 歌手',
      maxDownloadNum: 3,
+      isDownloadLrc: false,
+      isEmbedPic: true,
    },
    leaderboard: {
      source: 'kw',
      tabId: 'kwbiaosb',
    },
+    songList: {
+      source: 'kg',
+      sortId: '5',
+      tagInfo: {
+        name: '默认',
+        id: null,
+      },
+    },
+    odc: {
+      isAutoClearSearchInput: false,
+    },
    themeId: 0,
    sourceId: 'kw',
-    apiSource: 'messoer',
+    apiSource: 'test',
    randomAnimate: true,
+    ignoreVersion: null,
  }
  const overwriteSetting = {
    version: defaultVersion,
@@ -198,6 +216,7 @@ export const updateSetting = setting => {
    objectDeepMerge(defaultSetting, overwriteSetting)
    setting = defaultSetting
  }
+  if (setting.apiSource != 'temp') setting.apiSource = 'test' // 强制设置回 test 接口源
  return setting
 }

@@ -209,3 +228,43 @@ export const openUrl = url => {
  shell.openExternal(url)
 }

+/**
+ * 设置标题
+ */
+let dom_title = document.getElementsByTagName('title')[0]
+export const setTitle = title => {
+  dom_title.innerText = title || '洛雪音乐助手'
+}
+
+
+/**
+ * 创建 MD5 hash
+ * @param {*} str
+ */
+export const toMD5 = str => crypto.createHash('md5').update(str).digest('hex')
+
+/**
+ * 复制文本到剪贴板
+ * @param {*} str
+ */
+export const clipboardWriteText = str => clipboard.writeText(str)
+
+/**
+ * 设置音频 meta 信息
+ * @param {*} filePath
+ * @param {*} meta
+ */
+export const setMeta = (filePath, meta) => {
+  rendererSend('setMusicMeta', { filePath, meta })
+}
+
+/**
+ * 保存歌词文件
+ * @param {*} filePath
+ * @param {*} lrc
+ */
+export const saveLrc = (filePath, lrc) => {
+  fs.writeFile(filePath, lrc, 'utf8', err => {
+    if (err) console.log(err)
+  })
+}
--- a/src/renderer/utils/message.js
+++ b/src/renderer/utils/message.js
@@ -1,6 +1,7 @@
 export const requestMsg = {
  fail: '请求异常😮，可以多试几次，若还是不行就换一首吧。。。',
-  unachievable: '哦No😱...接口无法访问了！已帮你切换到临时接口，重试下看能不能播放吧~',
-  notConnectNetwork: '无法连接网络',
+  unachievable: '哦No😱...接口无法访问了！',
+  // unachievable: '哦No😱...接口无法访问了！已帮你切换到临时接口，重试下看能不能播放吧~',
+  notConnectNetwork: '无法连接到服务器',
  cancelRequest: '取消http请求',
 }
--- a/src/renderer/utils/music/api-source.js
+++ b/src/renderer/utils/music/api-source.js
@@ -1,24 +1,36 @@
-import kw_api_messoer from './kw/api-messoer'
 import kw_api_temp from './kw/api-temp'
-import tx_api_messoer from './tx/api-messoer'
-import kg_api_messoer from './kg/api-messoer'
-import wy_api_messoer from './wy/api-messoer'
-import bd_api_messoer from './bd/api-messoer'
+import kw_api_test from './kw/api-test'
+// import tx_api_messoer from './tx/api-messoer'
+import kg_api_test from './kg/api-test'
+import wy_api_test from './wy/api-test'
+import bd_api_test from './bd/api-test'
+// import kw_api_internal from './kw/api-internal'
+// import tx_api_internal from './tx/api-internal'
+// import kg_api_internal from './kg/api-internal'
+// import wy_api_internal from './wy/api-internal'
+// import bd_api_internal from './bd/api-internal'

 const apis = {
-  kw_api_messoer,
-  tx_api_messoer,
-  kg_api_messoer,
-  wy_api_messoer,
-  bd_api_messoer,
+  kw_api_test,
+  // tx_api_messoer,
+  kg_api_test,
+  wy_api_test,
+  bd_api_test,
+  // kw_api_internal,
+  // tx_api_internal,
+  // kg_api_internal,
+  // wy_api_internal,
+  // bd_api_internal,
  kw_api_temp,
 }


 const getAPI = source => {
  switch (window.globalObj.apiSource) {
-    case 'messoer':
-      return apis[`${source}_api_messoer`]
+    // case 'messoer':
+    //   return apis[`${source}_api_messoer`]
+    case 'test':
+      return apis[`${source}_api_test`]
    case 'temp':
      return apis[`${source}_api_temp`]
  }
--- a/src/renderer/utils/music/bd/api-internal.js
+++ b/src/renderer/utils/music/bd/api-internal.js
@@ -0,0 +1,44 @@
+import { httpFatch } from '../../request'
+import { requestMsg } from '../../message'
+
+const api_internal = {
+  successCode: 2200,
+  // getMusicUrl(songInfo, type) {
+  //   const requestObj = httpFatch(`http://play.taihe.com/data/music/songlink`, {
+  //     method: 'post',
+  //     headers: {
+  //       Origin: 'http://play.taihe.com',
+  //     },
+  //     formData: {
+  //       songIds: songInfo.songmid,
+  //     },
+  //   })
+  //   requestObj.promise = requestObj.promise.then(({ body }) => {
+  //     console.log(body)
+  //     return Promise.reject()
+  //     // if (body.error_code !== this.successCode) return this.getMusicUrl(songInfo, type)
+  //     // return body.code === 200 ? Promise.resolve({ type, url: body.result.bitrate.file_link }) : Promise.reject(new Error(requestMsg.fail))
+  //   })
+  //   return requestObj
+  // },
+  getMusicInfo(songInfo, tryNum = 0) {
+    const requestObj = httpFatch(`http://tingapi.ting.baidu.com/v1/restserver/ting?from=webapp_music&method=baidu.ting.song.baseInfos&song_id=${songInfo.songmid}`)
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      if (body.error_code !== this.successCode) return tryNum > 5 ? Promise.reject(new Error(requestMsg.fail)) : this.getMusicInfo(songInfo, ++tryNum)
+      return body ? Promise.resolve(body.result.items[0]) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+  getPic(songInfo) {
+    const requestObj = this.getMusicInfo(songInfo)
+    requestObj.promise = requestObj.promise.then(info => info.pic_premium)
+    return requestObj
+  },
+  getLyric(songInfo) {
+    const requestObj = this.getMusicInfo(songInfo)
+    requestObj.promise.then(info => httpFatch(info.lrclink).promise)
+    return requestObj
+  },
+}
+
+export default api_internal
--- a/src/renderer/utils/music/bd/api-messoer.js
+++ b/src/renderer/utils/music/bd/api-messoer.js
@@ -1,37 +0,0 @@
-import { httpFatch } from '../../request'
-import { requestMsg } from '../../message'
-
-const api_messoer = {
-  getMusicUrl(songInfo, type) {
-    const requestObj = httpFatch(`https://v1.itooi.cn/baidu/url?id=${songInfo.songmid}&quality=${type.replace(/k$/, '')}&isRedirect=0`, {
-      method: 'get',
-      timeout: 5000,
-    })
-    requestObj.promise = requestObj.promise.then(({ body }) => {
-      return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
-    })
-    return requestObj
-  },
-  getPic(songInfo, size = '500') {
-    const requestObj = httpFatch(`https://v1.itooi.cn/baidu/pic?id=${songInfo.songmid}&imageSize=${size}&isRedirect=0`, {
-      method: 'get',
-      timeout: 5000,
-    })
-    requestObj.promise = requestObj.promise.then(({ body }) => {
-      return body.code === 200 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
-    })
-    return requestObj
-  },
-  getLyric(songInfo) {
-    const requestObj = httpFatch(`https://v1.itooi.cn/baidu/lrc?id=${songInfo.songmid}&isRedirect=0`, {
-      method: 'get',
-      timeout: 5000,
-    })
-    requestObj.promise = requestObj.promise.then(({ body }) => {
-      return body ? Promise.resolve(body) : Promise.reject(new Error(requestMsg.fail))
-    })
-    return requestObj
-  },
-}
-
-export default api_messoer
--- a/src/renderer/utils/music/bd/api-test.js
+++ b/src/renderer/utils/music/bd/api-test.js
@@ -0,0 +1,41 @@
+import { httpFatch } from '../../request'
+import { requestMsg } from '../../message'
+import { headers, timeout } from '../options'
+
+const api_test = {
+  getMusicUrl(songInfo, type) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/url/bd/${songInfo.songmid}/${type}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+  getPic(songInfo, size = '500') {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/pic/bd/${songInfo.songmid}/${size}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+  getLyric(songInfo) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/lrc/bd/${songInfo.songmid}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+}
+
+export default api_test
--- a/src/renderer/utils/music/bd/index.js
+++ b/src/renderer/utils/music/bd/index.js
@@ -1,9 +1,11 @@
 import leaderboard from './leaderboard'
 import api_source from '../api-source'
 import musicInfo from './musicInfo'
+import songList from './songList'

 const bd = {
  leaderboard,
+  songList,
  getMusicUrl(songInfo, type) {
    return api_source('bd').getMusicUrl(songInfo, type)
  },
--- a/src/renderer/utils/music/bd/leaderboard.js
+++ b/src/renderer/utils/music/bd/leaderboard.js
@@ -85,7 +85,7 @@ export default {
          size,
        }
        types.push({ type: 'flac', size })
-        _types['flac'] = {
+        _types.flac = {
          size,
        }
      }
--- a/src/renderer/utils/music/bd/songList.js
+++ b/src/renderer/utils/music/bd/songList.js
@@ -0,0 +1,245 @@
+import { httpFatch } from '../../request'
+import { formatPlayTime, toMD5 } from '../../index'
+import CryptoJS from 'crypto-js'
+
+export default {
+  _requestObj_tags: null,
+  _requestObj_list: null,
+  _requestObj_listRecommend: null,
+  _requestObj_listDetail: null,
+  limit_list: 20,
+  limit_song: 25,
+  successCode: 22000,
+  sortList: [
+    {
+      name: '最热',
+      id: '1',
+    },
+    {
+      name: '最新',
+      id: '0',
+    },
+  ],
+  aesPassEncod(jsonData) {
+    let timestamp = Math.floor(Date.now() / 1000)
+    let privateKey = toMD5('baidu_taihe_music_secret_key' + timestamp).substr(8, 16)
+    let key = CryptoJS.enc.Utf8.parse(privateKey)
+    let iv = CryptoJS.enc.Utf8.parse(privateKey)
+    let arrData = []
+    let strData = ''
+    for (let key in jsonData) arrData.push(key)
+    arrData.sort()
+    for (let i = 0; i < arrData.length; i++) {
+      let key = arrData[i]
+      strData +=
+        (i === 0 ? '' : '&') + key + '=' + encodeURIComponent(jsonData[key])
+    }
+    let JsonFormatter = {
+      stringify(cipherParams) {
+        let jsonObj = {
+          ct: cipherParams.ciphertext.toString(CryptoJS.enc.Base64),
+        }
+        if (cipherParams.iv) {
+          jsonObj.iv = cipherParams.iv.toString()
+        }
+        if (cipherParams.salt) {
+          jsonObj.s = cipherParams.salt.toString()
+        }
+        return jsonObj
+      },
+      parse(jsonStr) {
+        let jsonObj = JSON.parse(jsonStr)
+        let cipherParams = CryptoJS.lib.CipherParams.create({
+          ciphertext: CryptoJS.enc.Base64.parse(jsonObj.ct),
+        })
+        if (jsonObj.iv) {
+          cipherParams.iv = CryptoJS.enc.Hex.parse(jsonObj.iv)
+        }
+        if (jsonObj.s) {
+          cipherParams.salt = CryptoJS.enc.Hex.parse(jsonObj.s)
+        }
+        return cipherParams
+      },
+    }
+    let encrypted = CryptoJS.AES.encrypt(strData, key, {
+      iv: iv,
+      blockSize: 16,
+      mode: CryptoJS.mode.CBC,
+      format: JsonFormatter,
+    })
+    let ciphertext = encrypted.toString().ct
+    let sign = toMD5('baidu_taihe_music' + ciphertext + timestamp)
+    let jsonRet = {
+      timestamp: timestamp,
+      param: ciphertext,
+      sign: sign,
+    }
+    return jsonRet
+  },
+  createUrl(param, method) {
+    let data = this.aesPassEncod(param)
+    return `http://musicmini.qianqian.com/v1/restserver/ting?method=${method}&time=${Date.now()}&timestamp=${data.timestamp}&param=${data.param}&sign=${data.sign}`
+  },
+  getTagsUrl() {
+    return this.createUrl({
+      from: 'qianqianmini',
+      type: 'diy',
+      version: '10.1.8',
+    }, 'baidu.ting.ugcdiy.getChannels')
+  },
+  getListUrl(sortType, tagName, page) {
+    return this.createUrl({
+      channelname: tagName || '全部',
+      from: 'qianqianmini',
+      offset: (page - 1) * this.limit_list,
+      order_type: sortType,
+      size: this.limit_list,
+      version: '10.1.8',
+    }, 'baidu.ting.ugcdiy.getChanneldiy')
+  },
+  getListDetailUrl(list_id, page) {
+    return this.createUrl({
+      list_id,
+      offset: (page - 1) * this.limit_song,
+      size: this.limit_song,
+      withcount: '1',
+      withsong: '1',
+    }, 'baidu.ting.ugcdiy.getBaseInfo')
+  },
+
+  // 获取标签
+  getTags() {
+    if (this._requestObj_tags) this._requestObj_tags.cancelHttp()
+    this._requestObj_tags = httpFatch(this.getTagsUrl())
+    return this._requestObj_tags.promise.then(({ body }) => {
+      if (body.error_code !== this.successCode) return this.getTags()
+      return {
+        hotTag: this.filterInfoHotTag(body.result.hot),
+        tags: this.filterTagInfo(body.result.tags),
+      }
+    })
+  },
+  filterInfoHotTag(rawList) {
+    return rawList.map(item => ({
+      name: item,
+      id: item,
+    }))
+  },
+  filterTagInfo(rawList) {
+    return rawList.map(type => ({
+      name: type.first,
+      list: type.second.map(item => ({
+        parent_id: type.first,
+        parent_name: type.first,
+        id: item,
+        name: item,
+      })),
+    }))
+  },
+
+  // 获取列表数据
+  getList(sortId, tagId, page) {
+    if (this._requestObj_list) this._requestObj_list.cancelHttp()
+    this._requestObj_list = httpFatch(
+      this.getListUrl(sortId, tagId, page)
+    )
+    return this._requestObj_list.promise.then(({ body }) => {
+      // if (body.error_code !== this.successCode) return this.getList(sortId, tagId, page)
+      return {
+        list: this.filterList(body.diyInfo),
+        total: body.nums,
+        page,
+        limit: this.limit_list,
+      }
+    })
+  },
+
+
+  /**
+   * 格式化播放数量
+   * @param {*} num
+   */
+  formatPlayCount(num) {
+    if (num > 100000000) return parseInt(num / 10000000) / 10 + '亿'
+    if (num > 10000) return parseInt(num / 1000) / 10 + '万'
+    return num
+  },
+  filterList(rawData) {
+    return rawData.map(item => ({
+      play_count: this.formatPlayCount(item.listen_num),
+      id: item.list_id,
+      author: item.username,
+      name: item.title,
+      // time: item.publish_time,
+      img: item.list_pic_large || item.list_pic,
+      grade: item.grade,
+      desc: item.desc || item.tag,
+    }))
+  },
+
+  // 获取歌曲列表内的音乐
+  getListDetail(id, page) {
+    if (this._requestObj_listDetail) {
+      this._requestObj_listDetail.cancelHttp()
+    }
+    this._requestObj_listDetail = httpFatch(this.getListDetailUrl(id, page))
+    return this._requestObj_listDetail.promise.then(({ body }) => {
+      if (body.error_code !== this.successCode) return this.getListDetail(id, page)
+      let listData = this.filterData(body.result.songlist)
+      return {
+        list: listData,
+        page,
+        limit: this.limit_song,
+        total: body.result.song_num,
+      }
+    })
+  },
+  filterData(rawList) {
+    // console.log(rawList)
+    return rawList.map(item => {
+      const types = []
+      const _types = {}
+      let size = null
+      let itemTypes = item.all_rate.split(',')
+      if (itemTypes.includes('128')) {
+        types.push({ type: '128k', size })
+        _types['128k'] = {
+          size,
+        }
+      }
+      if (itemTypes.includes('320')) {
+        types.push({ type: '320k', size })
+        _types['320k'] = {
+          size,
+        }
+      }
+      if (itemTypes.includes('flac')) {
+        types.push({ type: 'flac', size })
+        _types.flac = {
+          size,
+        }
+      }
+      // types.reverse()
+
+      return {
+        singer: item.author.replace(',', '、'),
+        name: item.title,
+        albumName: item.album_title,
+        albumId: item.album_id,
+        source: 'bd',
+        interval: formatPlayTime(parseInt(item.file_duration)),
+        songmid: item.song_id,
+        img: item.pic_s500,
+        lrc: null,
+        types,
+        _types,
+        typeUrl: {},
+      }
+    })
+  },
+
+}
+
+// getList
+// getTags
+// getListDetail
--- a/src/renderer/utils/music/kg/api-internal.js
+++ b/src/renderer/utils/music/kg/api-internal.js
@@ -1,11 +1,13 @@
 import { httpFatch } from '../../request'
 import { requestMsg } from '../../message'
+import { headers, timeout } from '../options'

 const api_messoer = {
  getMusicUrl(songInfo, type) {
    const requestObj = httpFatch(`https://v1.itooi.cn/kugou/url?id=${songInfo._types[type].hash}&quality=${type.replace(/k$/, '')}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
@@ -15,7 +17,8 @@ const api_messoer = {
  getPic(songInfo) {
    const requestObj = httpFatch(`https://v1.itooi.cn/kugou/pic?id=${songInfo.hash}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body.code === 200 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
@@ -25,7 +28,8 @@ const api_messoer = {
  getLyric(songInfo) {
    const requestObj = httpFatch(`https://v1.itooi.cn/kugou/lrc?id=${songInfo.hash}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body ? Promise.resolve(body) : Promise.reject(new Error(requestMsg.fail))
--- a/src/renderer/utils/music/kg/api-test.js
+++ b/src/renderer/utils/music/kg/api-test.js
@@ -0,0 +1,41 @@
+import { httpFatch } from '../../request'
+import { requestMsg } from '../../message'
+import { headers, timeout } from '../options'
+
+const api_test = {
+  getMusicUrl(songInfo, type) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/url/kg/${songInfo._types[type].hash}/${type}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+  getPic(songInfo) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/pic/kg/${songInfo.hash}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+  getLyric(songInfo) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/lrc/kg/${songInfo.hash}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+}
+
+export default api_test
--- a/src/renderer/utils/music/kg/index.js
+++ b/src/renderer/utils/music/kg/index.js
@@ -1,9 +1,10 @@
 import leaderboard from './leaderboard'
 import api_source from '../api-source'
-
+import songList from './songList'

 const kg = {
  leaderboard,
+  songList,
  getMusicUrl(songInfo, type) {
    return api_source('kg').getMusicUrl(songInfo, type)
  },
--- a/src/renderer/utils/music/kg/leaderboard.js
+++ b/src/renderer/utils/music/kg/leaderboard.js
@@ -10,7 +10,7 @@ export default {
    },
    {
      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: '华语新歌榜',
--- a/src/renderer/utils/music/kg/songList.js
+++ b/src/renderer/utils/music/kg/songList.js
@@ -0,0 +1,260 @@
+import { httpFatch } from '../../request'
+import { formatPlayTime, sizeFormate } from '../../index'
+
+export default {
+  _requestObj_tags: null,
+  _requestObj_listInfo: null,
+  _requestObj_list: null,
+  _requestObj_listRecommend: null,
+  _requestObj_listDetail: null,
+  currentTagInfo: {
+    id: undefined,
+    info: undefined,
+  },
+  sortList: [
+    {
+      name: '推荐',
+      id: '5',
+    },
+    {
+      name: '最热',
+      id: '6',
+    },
+    {
+      name: '最新',
+      id: '7',
+    },
+    {
+      name: '热藏',
+      id: '3',
+    },
+    {
+      name: '飙升',
+      id: '8',
+    },
+  ],
+  regExps: {
+    listData: /global\.data = (\[.+\]);/,
+  },
+  getInfoUrl(tagId) {
+    return tagId
+      ? `http://www2.kugou.kugou.com/yueku/v9/special/getSpecial?is_smarty=1&cdn=cdn&t=5&c=${tagId}`
+      : 'http://www2.kugou.kugou.com/yueku/v9/special/getSpecial?is_smarty=1&'
+  },
+  getSongListUrl(sortId, tagId, page) {
+    if (tagId == null) tagId = ''
+    return `http://www2.kugou.kugou.com/yueku/v9/special/getSpecial?is_ajax=1&cdn=cdn&t=${sortId}&c=${tagId}&p=${page}`
+  },
+  getSongListDetailUrl(id) {
+    return `http://www2.kugou.kugou.com/yueku/v9/special/single/${id}-5-9999.html`
+  },
+
+  /**
+   * 格式化播放数量
+   * @param {*} num
+   */
+  formatPlayCount(num) {
+    if (num > 100000000) return parseInt(num / 10000000) / 10 + '亿'
+    if (num > 10000) return parseInt(num / 1000) / 10 + '万'
+    return num
+  },
+  filterInfoHotTag(rawData) {
+    const result = []
+    if (rawData.status !== 1) return result
+    for (const key of Object.keys(rawData.data)) {
+      let tag = rawData.data[key]
+      result.push({
+        id: tag.id,
+        name: tag.special_name,
+      })
+    }
+    return result
+  },
+  filterTagInfo(rawData) {
+    const result = []
+    for (const name of Object.keys(rawData)) {
+      result.push({
+        name,
+        list: rawData[name].data.map(tag => ({
+          parent_id: tag.parent_id,
+          parent_name: tag.pname,
+          id: tag.id,
+          name: tag.name,
+        })),
+      })
+    }
+    return result
+  },
+
+  getSongList(sortId, tagId, page) {
+    if (this._requestObj_list) this._requestObj_list.cancelHttp()
+    this._requestObj_list = httpFatch(
+      this.getSongListUrl(sortId, tagId, page)
+    )
+    return this._requestObj_list.promise.then(({ body }) => {
+      if (body.status !== 1) return this.getSongList(sortId, tagId, page)
+      return this.filterList(body.special_db)
+    })
+  },
+  getSongListRecommend() {
+    if (this._requestObj_listRecommend) this._requestObj_listRecommend.cancelHttp()
+    this._requestObj_listRecommend = httpFatch(
+      'http://everydayrec.service.kugou.com/guess_special_recommend',
+      {
+        method: 'post',
+        headers: {
+          'User-Agent': 'KuGou2012-8275-web_browser_event_handler',
+        },
+        body: {
+          appid: 1001,
+          clienttime: 1566798337219,
+          clientver: 8275,
+          key: 'f1f93580115bb106680d2375f8032d96',
+          mid: '21511157a05844bd085308bc76ef3343',
+          platform: 'pc',
+          userid: '262643156',
+          return_min: 6,
+          return_max: 15,
+        },
+      }
+    )
+    return this._requestObj_listRecommend.promise.then(({ body }) => {
+      if (body.status !== 1) return this.getSongListRecommend()
+      return this.filterList(body.data.special_list)
+    })
+  },
+  filterList(rawData) {
+    return rawData.map(item => ({
+      play_count: item.total_play_count || this.formatPlayCount(item.play_count),
+      id: item.specialid,
+      author: item.nickname,
+      name: item.specialname,
+      time: item.publish_time || item.publishtime,
+      img: item.img || item.imgurl,
+      grade: item.grade,
+      desc: item.intro,
+    }))
+  },
+
+  getListDetail(id, page) { // 获取歌曲列表内的音乐
+    if (this._requestObj_listDetail) this._requestObj_listDetail.cancelHttp()
+    this._requestObj_listDetail = httpFatch(this.getSongListDetailUrl(id))
+    return this._requestObj_listDetail.promise.then(({ body }) => {
+      let listData = body.match(this.regExps.listData)
+      if (listData) listData = this.filterData(JSON.parse(RegExp.$1))
+      return {
+        list: listData,
+        page: 1,
+        limit: 10000,
+        total: listData.length,
+      }
+    })
+  },
+  filterData(rawList) {
+    // console.log(rawList)
+    return rawList.map(item => {
+      const types = []
+      const _types = {}
+      if (item.filesize !== 0) {
+        let size = sizeFormate(item.filesize)
+        types.push({ type: '128k', size, hash: item.hash })
+        _types['128k'] = {
+          size,
+          hash: item.hash,
+        }
+      }
+      if (item.filesize_320 !== 0) {
+        let size = sizeFormate(item.filesize_320)
+        types.push({ type: '320k', size, hash: item.hash_320 })
+        _types['320k'] = {
+          size,
+          hash: item.hash_320,
+        }
+      }
+      if (item.filesize_ape !== 0) {
+        let size = sizeFormate(item.filesize_ape)
+        types.push({ type: 'ape', size, hash: item.hash_ape })
+        _types.ape = {
+          size,
+          hash: item.hash_ape,
+        }
+      }
+      if (item.filesize_flac !== 0) {
+        let size = sizeFormate(item.filesize_flac)
+        types.push({ type: 'flac', size, hash: item.hash_flac })
+        _types.flac = {
+          size,
+          hash: item.hash_flac,
+        }
+      }
+      return {
+        singer: item.singername,
+        name: item.songname,
+        albumName: item.album_name,
+        albumId: item.album_id,
+        songmid: item.audio_id,
+        source: 'kg',
+        interval: formatPlayTime(item.duration / 1000),
+        img: null,
+        lrc: null,
+        hash: item.hash,
+        types,
+        _types,
+        typeUrl: {},
+      }
+    })
+  },
+
+  // 获取列表信息
+  getListInfo(tagId) {
+    if (this._requestObj_listInfo) this._requestObj_listInfo.cancelHttp()
+    this._requestObj_listInfo = httpFatch(this.getInfoUrl(tagId))
+    return this._requestObj_listInfo.promise.then(({ body }) => {
+      if (body.status !== 1) return this.getListInfo(tagId)
+      return {
+        limit: body.data.params.pagesize,
+        page: body.data.params.p,
+        total: body.data.params.total,
+      }
+    })
+  },
+
+  // 获取列表数据
+  getList(sortId, tagId, page) {
+    let tasks = [this.getSongList(sortId, tagId, page)]
+    tasks.push(
+      this.currentTagInfo.id === tagId
+        ? Promise.resolve(this.currentTagInfo.info)
+        : this.getListInfo(tagId).then(info => {
+          this.currentTagInfo.id = tagId
+          this.currentTagInfo.info = Object.assign({}, info)
+          return info
+        })
+    )
+    if (!tagId && page === 1 && sortId === this.sortList[0].id) tasks.push(this.getSongListRecommend()) // 如果是所有类别，则顺便获取推荐列表
+    return Promise.all(tasks).then(([list, info, recommendList]) => {
+      if (recommendList) list.unshift(...recommendList)
+      return {
+        list,
+        ...info,
+      }
+    })
+  },
+
+  // 获取标签
+  getTags() {
+    if (this._requestObj_tags) this._requestObj_tags.cancelHttp()
+    this._requestObj_tags = httpFatch(this.getInfoUrl())
+    return this._requestObj_tags.promise.then(({ body }) => {
+      if (body.status !== 1) return this.getTags()
+      return {
+        hotTag: this.filterInfoHotTag(body.data.hotTag),
+        tags: this.filterTagInfo(body.data.tagids),
+      }
+    })
+  },
+}
+
+// getList
+// getTags
+// getListDetail
--- a/src/renderer/utils/music/kw/api-internal.js
+++ b/src/renderer/utils/music/kw/api-internal.js
@@ -1,11 +1,13 @@
 import { httpFatch } from '../../request'
 import { requestMsg } from '../../message'
+import { headers, timeout } from '../options'

 const api_messoer = {
  getMusicUrl(songInfo, type) {
    const requestObj = httpFatch(`https://v1.itooi.cn/kuwo/url?id=${songInfo.songmid}&quality=${type.replace(/k$/, '')}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
@@ -15,7 +17,8 @@ const api_messoer = {
  getPic(songInfo) {
    const requestObj = httpFatch(`https://v1.itooi.cn/kuwo/pic?id=${songInfo.songmid}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body.code === 200 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
--- a/src/renderer/utils/music/kw/api-temp.js
+++ b/src/renderer/utils/music/kw/api-temp.js
@@ -1,24 +1,18 @@
 import { httpFatch } from '../../request'
+import { headers, timeout } from '../options'

 const api_temp = {
  getMusicUrl(songInfo, type) {
-    const requestObj = httpFatch(`https://www.stsky.cn/api/temp/getMusicUrl.php?id=${songInfo.songmid}&type=${type}`, {
+    const requestObj = httpFatch(`http://temp.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
      method: 'get',
+      headers,
+      timeout,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(body.msg))
    })
    return requestObj
  },
-  getPic(songInfo) {
-    const requestObj = httpFatch(`https://www.stsky.cn/api/temp/getPic.php?size=320&songmid=${songInfo.songmid}`, {
-      method: 'get',
-    })
-    requestObj.promise = requestObj.promise.then(({ body }) => {
-      return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(body.msg))
-    })
-    return requestObj
-  },
 }

 export default api_temp
--- a/src/renderer/utils/music/kw/api-test.js
+++ b/src/renderer/utils/music/kw/api-test.js
@@ -0,0 +1,30 @@
+import { httpFatch } from '../../request'
+import { requestMsg } from '../../message'
+import { headers, timeout } from '../options'
+
+const api_test = {
+  // getMusicUrl(songInfo, type) {
+  //   const requestObj = httpFatch(`http://45.32.53.128:3002/m/kw/u/${songInfo.songmid}/${type}`, {
+  //     method: 'get',
+  //     headers,
+  //     timeout,
+  //   })
+  //   requestObj.promise = requestObj.promise.then(({ body }) => {
+  //     return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(body.msg))
+  //   })
+  //   return requestObj
+  // },
+  getMusicUrl(songInfo, type) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+}
+
+export default api_test
--- a/src/renderer/utils/music/kw/index.js
+++ b/src/renderer/utils/music/kw/index.js
@@ -4,7 +4,9 @@ import musicSearch from './musicSearch'
 import { formatSinger } from './util'
 import leaderboard from './leaderboard'
 import lyric from './lyric'
+import pic from './pic'
 import api_source from '../api-source'
+import songList from './songList'

 const kw = {
  _musicInfoRequestObj: null,
@@ -31,6 +33,7 @@ const kw = {
  tempSearch,
  musicSearch,
  leaderboard,
+  songList,
  getLyric(songInfo) {
    // let singer = songInfo.singer.indexOf('、') > -1 ? songInfo.singer.split('、')[0] : songInfo.singer
    return lyric.getLyric(songInfo.songmid)
@@ -91,7 +94,7 @@ const kw = {
  },

  getPic(songInfo) {
-    return api_source('kw').getPic(songInfo)
+    return pic.getPic(songInfo)
  },
 }

--- a/src/renderer/utils/music/kw/leaderboard.js
+++ b/src/renderer/utils/music/kw/leaderboard.js
@@ -1,5 +1,7 @@
 import { httpGet, cancelHttp } from '../../request'
-import { formatPlayTime } from '../../index'
+import { formatPlayTime, decodeName } from '../../index'
+import { formatSinger } from './util'
+

 export default {
  list: [
@@ -131,21 +133,21 @@ export default {
      }
      if (formats.indexOf('AL')) {
        types.push({ type: 'ape', size: null })
-        _types['ape'] = {
+        _types.ape = {
          size: null,
        }
      }
      if (formats.indexOf('ALFLAC')) {
        types.push({ type: 'flac', size: null })
-        _types['flac'] = {
+        _types.flac = {
          size: null,
        }
      }
      // types.reverse()
      return {
-        singer: item.artist,
-        name: item.name,
-        albumName: item.album,
+        singer: formatSinger(decodeName(item.artist)),
+        name: decodeName(item.name),
+        albumName: decodeName(item.album),
        albumId: item.albumid,
        songmid: item.id,
        source: 'kw',
--- a/src/renderer/utils/music/kw/pic.js
+++ b/src/renderer/utils/music/kw/pic.js
@@ -0,0 +1,9 @@
+import { httpFatch } from '../../request'
+
+export default {
+  getPic({ songmid }) {
+    const requestObj = httpFatch(`http://artistpicserver.kuwo.cn/pic.web?corp=kuwo&type=rid_pic&pictype=500&size=500&rid=${songmid}`)
+    requestObj.promise = requestObj.promise.then(({ body }) => body)
+    return requestObj
+  },
+}
--- a/src/renderer/utils/music/kw/songList.js
+++ b/src/renderer/utils/music/kw/songList.js
@@ -0,0 +1,214 @@
+import { httpFatch } from '../../request'
+import { formatPlayTime, decodeName } from '../../index'
+import { formatSinger } from './util'
+
+export default {
+  _requestObj_tags: null,
+  _requestObj_hotTags: null,
+  _requestObj_list: null,
+  _requestObj_listDetail: null,
+  limit_list: 25,
+  limit_song: 100,
+  successCode: 200,
+  sortList: [
+    {
+      name: '最新',
+      id: 'new',
+    },
+    {
+      name: '最热',
+      id: 'hot',
+    },
+  ],
+  tagsUrl: 'http://wapi.kuwo.cn/api/pc/classify/playlist/getTagList?cmd=rcm_keyword_playlist&user=0&prod=kwplayer_pc_9.0.5.0&vipver=9.0.5.0&source=kwplayer_pc_9.0.5.0&loginUid=0&loginSid=0&appUid=76039576',
+  hotTagUrl: 'http://wapi.kuwo.cn/api/pc/classify/playlist/getRcmTagList?loginUid=0&loginSid=0&appUid=76039576',
+  getListUrl({ sortId, id, type, page }) {
+    if (!id) return `http://wapi.kuwo.cn/api/pc/classify/playlist/getRcmPlayList?loginUid=0&loginSid=0&appUid=76039576&&pn=${page}&rn=${this.limit_list}&order=${sortId}`
+    switch (type) {
+      case '10000': return `http://wapi.kuwo.cn/api/pc/classify/playlist/getTagPlayList?loginUid=0&loginSid=0&appUid=76039576&pn=${page}&id=${id}&rn=${this.limit_list}`
+      case '43': return `http://mobileinterfaces.kuwo.cn/er.s?type=get_pc_qz_data&f=web&id=${id}&prod=pc`
+    }
+    // http://wapi.kuwo.cn/api/pc/classify/playlist/getTagPlayList?loginUid=0&loginSid=0&appUid=76039576&id=173&pn=1&rn=100
+  },
+  getListDetailUrl(id, page) {
+    // http://nplserver.kuwo.cn/pl.svc?op=getlistinfo&pid=2858093057&pn=0&rn=100&encode=utf8&keyset=pl2012&identity=kuwo&pcmp4=1&vipver=MUSIC_9.0.5.0_W1&newver=1
+    return `http://nplserver.kuwo.cn/pl.svc?op=getlistinfo&pid=${id}&pn=${page - 1}&rn=${this.limit_song}&encode=utf8&keyset=pl2012&identity=kuwo&pcmp4=1&vipver=MUSIC_9.0.5.0_W1&newver=1`
+    // http://mobileinterfaces.kuwo.cn/er.s?type=get_pc_qz_data&f=web&id=140&prod=pc
+  },
+
+  // http://nplserver.kuwo.cn/pl.svc?op=getlistinfo&pid=2849349915&pn=0&rn=100&encode=utf8&keyset=pl2012&identity=kuwo&pcmp4=1&vipver=MUSIC_9.0.5.0_W1&newver=1
+  // 获取标签
+  getTag() {
+    if (this._requestObj_tags) this._requestObj_tags.cancelHttp()
+    this._requestObj_tags = httpFatch(this.tagsUrl)
+    return this._requestObj_tags.promise.then(({ body }) => {
+      if (body.code !== this.successCode) return this.getTag()
+      return this.filterTagInfo(body.data)
+    })
+  },
+  // 获取标签
+  getHotTag() {
+    if (this._requestObj_hotTags) this._requestObj_hotTags.cancelHttp()
+    this._requestObj_hotTags = httpFatch(this.hotTagUrl)
+    return this._requestObj_hotTags.promise.then(({ body }) => {
+      if (body.code !== this.successCode) return this.getHotTag()
+      return this.filterInfoHotTag(body.data[0].data)
+    })
+  },
+  filterInfoHotTag(rawList) {
+    return rawList.map(item => ({
+      id: `${item.id}-${item.digest}`,
+      name: item.name,
+    }))
+  },
+  filterTagInfo(rawList) {
+    return rawList.map(type => ({
+      name: type.name,
+      list: type.data.map(item => ({
+        parent_id: type.id,
+        parent_name: type.name,
+        id: `${item.id}-${item.digest}`,
+        name: item.name,
+      })),
+    }))
+  },
+
+  // 获取列表数据
+  getList(sortId, tagId, page) {
+    if (this._requestObj_list) this._requestObj_list.cancelHttp()
+    let id
+    let type
+    if (tagId) {
+      let arr = tagId.split('-')
+      id = arr[0]
+      type = arr[1]
+    } else {
+      id = null
+    }
+    this._requestObj_list = httpFatch(this.getListUrl({ sortId, id, type, page }))
+    return this._requestObj_list.promise.then(({ body }) => {
+      if (!id || type == '10000') {
+        if (body.code !== this.successCode) return this.getListUrl({ sortId, id, type, page })
+        return {
+          list: this.filterList(body.data.data),
+          total: body.data.total,
+          page: body.data.pn,
+          limit: body.data.rn,
+        }
+      } else if (!body.length) {
+        return this.getListUrl({ sortId, id, type, page })
+      }
+      return {
+        list: this.filterList2(body),
+        total: 1000,
+        page,
+        limit: 1000,
+      }
+    })
+  },
+
+
+  /**
+   * 格式化播放数量
+   * @param {*} num
+   */
+  formatPlayCount(num) {
+    if (num > 100000000) return parseInt(num / 10000000) / 10 + '亿'
+    if (num > 10000) return parseInt(num / 1000) / 10 + '万'
+    return num
+  },
+  filterList(rawData) {
+    return rawData.map(item => ({
+      play_count: this.formatPlayCount(item.listencnt),
+      id: item.id,
+      author: item.uname,
+      name: item.name,
+      // time: item.publish_time,
+      img: item.img,
+      grade: item.favorcnt / 10,
+      desc: item.desc,
+    }))
+  },
+  filterList2(rawData) {
+    const list = []
+    rawData.forEach(item => {
+      if (!item.label) return
+      list.push(...item.list.map(item => ({
+        play_count: item.play_count === undefined ? null : this.formatPlayCount(item.listencnt),
+        id: item.id,
+        author: item.uname,
+        name: item.name,
+        // time: item.publish_time,
+        img: item.img,
+        grade: item.favorcnt / 10,
+        desc: item.desc,
+      })))
+    })
+    return list
+  },
+
+  // 获取歌曲列表内的音乐
+  getListDetail(id, page) {
+    if (this._requestObj_listDetail) {
+      this._requestObj_listDetail.cancelHttp()
+    }
+    this._requestObj_listDetail = httpFatch(this.getListDetailUrl(id, page))
+    return this._requestObj_listDetail.promise.then(({ body }) => {
+      if (body.result !== 'ok') return this.getListDetail(id, page)
+      return {
+        list: this.filterListDetail(body.musiclist),
+        page,
+        limit: body.rn,
+        total: body.total,
+      }
+    })
+  },
+  filterListDetail(rawData) {
+    // console.log(rawList)
+    return rawData.map((item, inedx) => {
+      let formats = item.formats.split('|')
+      let types = []
+      let _types = {}
+      if (formats.indexOf('MP3128')) {
+        types.push({ type: '128k', size: null })
+        _types['128k'] = {
+          size: null,
+        }
+      }
+      if (formats.indexOf('MP3H')) {
+        types.push({ type: '320k', size: null })
+        _types['320k'] = {
+          size: null,
+        }
+      }
+      if (formats.indexOf('ALFLAC')) {
+        types.push({ type: 'flac', size: null })
+        _types.flac = {
+          size: null,
+        }
+      }
+
+      return {
+        singer: formatSinger(decodeName(item.artist)),
+        name: decodeName(item.name),
+        albumName: decodeName(item.album),
+        albumId: item.albumid,
+        songmid: item.id,
+        source: 'kw',
+        interval: formatPlayTime(parseInt(item.duration)),
+        img: null,
+        lrc: null,
+        types,
+        _types,
+        typeUrl: {},
+      }
+    })
+  },
+  getTags() {
+    return Promise.all([this.getTag(), this.getHotTag()]).then(([tags, hotTag]) => ({ tags, hotTag }))
+  },
+}
+
+// getList
+// getTags
+// getListDetail
--- a/src/renderer/utils/music/options.js
+++ b/src/renderer/utils/music/options.js
@@ -0,0 +1,9 @@
+export const bHh = '624868746c'
+
+export const headers = {
+  'User-Agent': 'lx-music request',
+  [bHh]: [bHh],
+}
+
+
+export const timeout = 15000
--- a/src/renderer/utils/music/tx/api-internal.js
+++ b/src/renderer/utils/music/tx/api-internal.js
@@ -1,11 +1,13 @@
 import { httpFatch } from '../../request'
 import { requestMsg } from '../../message'
+import { headers, timeout } from '../options'

 const api_messoer = {
  getMusicUrl(songInfo, type) {
    const requestObj = httpFatch(`https://v1.itooi.cn/tencent/url?id=${songInfo.strMediaMid}&quality=${type.replace(/k$/, '')}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
--- a/src/renderer/utils/music/tx/api-test.js
+++ b/src/renderer/utils/music/tx/api-test.js
@@ -0,0 +1,24 @@
+import { httpFatch } from '../../request'
+import { requestMsg } from '../../message'
+import { headers, timeout } from '../messoer'
+
+const api_messoer = {
+  getMusicUrl(songInfo, type) {
+    const requestObj = httpFatch(`https://v1.itooi.cn/tencent/url?id=${songInfo.strMediaMid}&quality=${type.replace(/k$/, '')}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+  getPic(songInfo) {
+    return {
+      promise: Promise.resolve(`https://y.gtimg.cn/music/photo_new/T002R500x500M000${songInfo.albumId}.jpg`),
+    }
+  },
+}
+
+export default api_messoer
--- a/src/renderer/utils/music/utils.js
+++ b/src/renderer/utils/music/utils.js
@@ -15,4 +15,5 @@ export const getMusicType = (info, type) => {
  for (const type of rangeType) {
    if (info._types[type]) return type
  }
+  return '128k'
 }
--- a/src/renderer/utils/music/wy/api-internal.js
+++ b/src/renderer/utils/music/wy/api-internal.js
@@ -1,11 +1,13 @@
 import { httpFatch } from '../../request'
 import { requestMsg } from '../../message'
+import { headers, timeout } from '../options'

 const api_messoer = {
  getMusicUrl(songInfo, type) {
    const requestObj = httpFatch(`https://v1.itooi.cn/netease/url?id=${songInfo.songmid}&quality=${type.replace(/k$/, '')}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
@@ -15,7 +17,8 @@ const api_messoer = {
  getPic(songInfo) {
    const requestObj = httpFatch(`https://v1.itooi.cn/netease/pic?id=${songInfo.songmid}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body.code === 200 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
@@ -25,7 +28,8 @@ const api_messoer = {
  getLyric(songInfo) {
    const requestObj = httpFatch(`https://v1.itooi.cn/netease/lrc?id=${songInfo.songmid}&isRedirect=0`, {
      method: 'get',
-      timeout: 5000,
+      timeout,
+      headers,
    })
    requestObj.promise = requestObj.promise.then(({ body }) => {
      return body ? Promise.resolve(body) : Promise.reject(new Error(requestMsg.fail))
--- a/src/renderer/utils/music/wy/api-test.js
+++ b/src/renderer/utils/music/wy/api-test.js
@@ -0,0 +1,41 @@
+import { httpFatch } from '../../request'
+import { requestMsg } from '../../message'
+import { headers, timeout } from '../options'
+
+const api_test = {
+  getMusicUrl(songInfo, type) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/url/wy/${songInfo.songmid}/${type}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+  getPic(songInfo) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/pic/wy/${songInfo.songmid}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+  getLyric(songInfo) {
+    const requestObj = httpFatch(`http://test.tempmusic.tk/lrc/wy/${songInfo.songmid}`, {
+      method: 'get',
+      timeout,
+      headers,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail))
+    })
+    return requestObj
+  },
+}
+
+export default api_test
--- a/src/renderer/utils/music/wy/leaderboard.js
+++ b/src/renderer/utils/music/wy/leaderboard.js
@@ -98,7 +98,7 @@ export default {
        case 999000:
          size = null
          types.push({ type: 'flac', size })
-          _types['flac'] = {
+          _types.flac = {
            size,
          }
        case 320000:
--- a/src/renderer/utils/request.js
+++ b/src/renderer/utils/request.js
@@ -2,28 +2,11 @@ import request from 'request'
 // import progress from 'request-progress'
 import { debugRequest } from './env'
 import { requestMsg } from './message'
+import { bHh } from './music/options'
 // import fs from 'fs'

 const headers = {
-  'user-agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36',
-}
-
-const fatchData = (url, method, options, callback) => {
-  // console.log(url, options)
-  console.log('---start---', url)
-  return request(url, {
-    method,
-    headers: Object.assign({}, headers, options.headers || {}),
-    Origin: options.origin,
-    data: options.data,
-    timeout: options.timeout || 10000,
-    json: options.format === undefined || options.format === 'json',
-  }, (err, resp, body) => {
-    if (err) return callback(err, null)
-
-    // console.log('---end---', url)
-    callback(null, resp, body)
-  })
+  'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36',
 }

 /**
@@ -58,8 +41,8 @@ const buildHttpPromose = (url, options) => {
  const obj = {
    promise: p,
    cancelHttp() {
-      console.log('cancel')
      if (!requestObj) return
+      console.log('cancel')
      cancelHttp(requestObj)
      cancelFn(new Error(requestMsg.cancelRequest))
      requestObj = null
@@ -84,7 +67,7 @@ export const httpFatch = (url, options = { method: 'get' }) => {
      return promise
    }
    if (err.message === 'socket hang up') {
-      window.globalObj.apiSource = 'temp'
+      // window.globalObj.apiSource = 'temp'
      return Promise.reject(new Error(requestMsg.unachievable))
    }
    if (err.code === 'ENOTFOUND') return Promise.reject(new Error(requestMsg.notConnectNetwork))
@@ -231,3 +214,28 @@ export const http_jsonp = (url, options, callback) => {
    callback(err, resp, body)
  })
 }
+
+const fatchData = (url, method, options, callback) => {
+  // console.log(url, options)
+  console.log('---start---', url)
+  if (options.headers && options.headers[bHh]) {
+    let s = Buffer.from(bHh, 'hex').toString()
+    s = s.replace(s.substr(-1), '')
+    s = Buffer.from(s, 'base64').toString()
+    options.headers[s] = !!s
+    delete options.headers[bHh]
+  }
+  return request(url, {
+    method,
+    headers: Object.assign({}, headers, options.headers || {}),
+    Origin: options.origin,
+    body: options.body,
+    form: options.form,
+    formData: options.formData,
+    timeout: options.timeout || 10000,
+    json: options.format === undefined || options.format === 'json',
+  }, (err, resp, body) => {
+    if (err) return callback(err, null)
+    callback(null, resp, body)
+  })
+}
--- a/src/renderer/views/Download.vue
+++ b/src/renderer/views/Download.vue
@@ -23,9 +23,9 @@ div(:class="$style.download")
            td.break(style="width: 28%;") {{item.musicInfo.name}} - {{item.musicInfo.singer}}
            td.break(style="width: 22%;") {{item.progress.progress}}%
            td.break(style="width: 15%;") {{item.statusText}}
-            td.break(style="width: 10%;") {{item.type.toUpperCase()}}
+            td.break(style="width: 10%;") {{item.type && item.type.toUpperCase()}}
            td(style="width: 20%; padding-left: 0; padding-right: 0;")
-              material-list-buttons(:index="index" :download-btn="false" :start-btn="!item.isComplate && item.status != downloadStatus.WAITING && (item.status != downloadStatus.RUN)"
+              material-list-buttons(:index="index" :download-btn="false" :file-btn="true" :start-btn="!item.isComplate && item.status != downloadStatus.WAITING && (item.status != downloadStatus.RUN)"
                :pause-btn="!item.isComplate && (item.status == downloadStatus.RUN || item.status == downloadStatus.WAITING)"
                :play-btn="item.status == downloadStatus.COMPLETED" @btn-click="handleListBtnClick")
    material-flow-btn(:show="isShowEditBtn" :play-btn="false" :download-btn="false" :add-btn="false" :start-btn="true" :pause-btn="true" @btn-click="handleFlowBtnClick")
@@ -34,8 +34,7 @@ div(:class="$style.download")

 <script>
 import { mapGetters, mapActions, mapMutations } from 'vuex'
-import { checkPath } from '../utils'
-
+import { checkPath, openDirInExplorer } from '../utils'
 export default {
  name: 'Download',
  data() {
@@ -129,6 +128,9 @@ export default {
        case 'remove':
          this.removeTask(info.index)
          break
+        case 'file':
+          this.handleOpenFolder(info.index)
+          break
      }
    },
    handleSelectAllData(isSelect) {
@@ -148,7 +150,7 @@ export default {
            this.handleStartTask(index)
          })
          break
-        case 'pause':
+        case 'pause': {
          let runs = []
          this.selectdData.forEach(item => {
            if (item.isComplate || item.status == this.downloadStatus.PAUSE) return
@@ -164,12 +166,18 @@ export default {
            this.handlePauseTask(index)
          })
          break
+        }
        case 'remove':
          this.removeTaskMultiple(this.selectdData)
          break
      }
      this.resetSelect()
    },
+    handleOpenFolder(index) {
+      let path = this.list[index].filePath
+      if (!checkPath(path)) return
+      openDirInExplorer(path)
+    },
  },
 }
 </script>
--- a/src/renderer/views/Leaderboard.vue
+++ b/src/renderer/views/Leaderboard.vue
@@ -1,51 +1,15 @@
 <template lang="pug">
  div(:class="$style.leaderboard")
    div(:class="$style.header")
-      material-tab(:class="$style.tab" :list="types" item-key="id" item-name="name" v-model="tabId")
+      material-tab(:class="$style.tab" :list="types" align="left" item-key="id" item-name="name" v-model="tabId")
      material-select(:class="$style.select" :list="sourceInfo.sources" item-key="id" item-name="name" v-model="source")
-    div(:class="$style.content")
-      div(v-if="list.length" :class="$style.list")
-        div(:class="$style.thead")
-          table
-            thead
-              tr
-                th.nobreak.center(style="width: 37px;")
-                  material-checkbox(id="search_select_all" v-model="isSelectAll" @change="handleSelectAllData"
-                    :indeterminate="isIndeterminate" :title="isSelectAll && !isIndeterminate ? '全不选' : '全选'")
-                th.nobreak(style="width: 25%;") 歌曲名
-                th.nobreak(style="width: 20%;") 歌手
-                th.nobreak(style="width: 22%;") 专辑
-                th.nobreak(style="width: 18%;") 操作
-                th.nobreak(style="width: 10%;") 时长
-        div.scroll(:class="$style.tbody" ref="dom_scrollContent")
-          table
-            tbody
-              tr(v-for='(item, index) in list' :key='item.songmid' @click="handleDoubleClick(index)")
-                td.nobreak.center(style="width: 37px;" @click.stop)
-                  material-checkbox(:id="index.toString()" v-model="selectdData" :value="item")
-                td.break(style="width: 25%;")
-                  | {{item.name}}
-                  //- 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: 22%;") {{item.albumName}}
-                td(style="width: 18%;")
-                  material-list-buttons(:index="index" :search-btn="true" :play-btn="item.source == 'kw' || !isAPITemp" :download-btn="item.source == 'kw' || !isAPITemp" :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="info.total" :limit="info.limit" :page="info.page" @btn-click="handleTogglePage")
+    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")
 </template>

 <script>
 import { mapGetters, mapMutations, mapActions } from 'vuex'
-import { scrollTo } from '../utils'
-// import music from '../utils/music'
 export default {
  name: 'Leaderboard',
  data() {
@@ -53,14 +17,9 @@ export default {
      tabId: null,
      source: null,
      page: 1,
-      clickTime: 0,
-      clickIndex: -1,
      isShowDownload: false,
      musicInfo: null,
      selectdData: [],
-      isSelectAll: false,
-      isIndeterminate: false,
-      isShowEditBtn: false,
      isShowDownloadMultiple: false,
    }
  },
@@ -81,27 +40,12 @@ export default {
      if (!o && this.page !== 1) return
      this.getList(1).then(() => {
        this.page = this.info.page
-        scrollTo(this.$refs.dom_scrollContent, 0)
      })
    },
    source(n, o) {
      this.setLeaderboard({ source: n })
      if (o) this.tabId = this.types[0] && this.types[0].id
    },
-    selectdData(n) {
-      const len = n.length
-      if (len) {
-        this.isSelectAll = true
-        this.isIndeterminate = len !== this.list.length
-        this.isShowEditBtn = true
-      } else {
-        this.isSelectAll = false
-        this.isShowEditBtn = false
-      }
-    },
-    list() {
-      this.resetSelect()
-    },
  },
  mounted() {
    this.source = this.setting.leaderboard.source
@@ -114,19 +58,6 @@ export default {
    ...mapActions('download', ['createDownload', 'createDownloadMultiple']),
    ...mapMutations('list', ['defaultListAdd', 'defaultListAddMultiple']),
    ...mapMutations('player', ['setList']),
-    handleDoubleClick(index) {
-      if (
-        window.performance.now() - this.clickTime > 400 ||
-        this.clickIndex !== index
-      ) {
-        this.clickTime = window.performance.now()
-        this.clickIndex = index
-        return
-      }
-      (this.source == 'kw' || !this.isAPITemp) ? this.testPlay(index) : this.handleSearch(index)
-      this.clickTime = 0
-      this.clickIndex = -1
-    },
    handleListBtnClick(info) {
      switch (info.action) {
        case 'download':
@@ -150,6 +81,7 @@ export default {
      if (index == null) {
        targetSong = this.selectdData[0]
        this.defaultListAddMultiple(this.selectdData)
+        this.resetSelect()
      } else {
        targetSong = this.list[index]
        this.defaultListAdd(targetSong)
@@ -177,18 +109,8 @@ export default {
    handleTogglePage(page) {
      this.getList(page).then(() => {
        this.page = this.info.page
-        this.$nextTick(() => {
-          scrollTo(this.$refs.dom_scrollContent, 0)
-        })
      })
    },
-    handleSelectAllData(isSelect) {
-      this.selectdData = isSelect ? [...this.list] : []
-    },
-    resetSelect() {
-      this.isSelectAll = false
-      this.selectdData = []
-    },
    handleAddDownload(type) {
      this.createDownload({ musicInfo: this.musicInfo, type })
      this.isShowDownload = false
@@ -200,8 +122,8 @@ export default {
          type = '128k'
      }
      this.createDownloadMultiple({ list: [...this.selectdData], type })
-      this.resetSelect()
      this.isShowDownloadMultiple = false
+      this.resetSelect()
    },
    handleFlowBtnClick(action) {
      switch (action) {
@@ -210,7 +132,6 @@ export default {
          break
        case 'play':
          this.testPlay()
-          this.resetSelect()
          break
        case 'add':
          this.defaultListAddMultiple(this.selectdData)
@@ -218,6 +139,23 @@ export default {
          break
      }
    },
+    handleSongListAction({ action, data }) {
+      switch (action) {
+        case 'listBtnClick':
+          return this.handleListBtnClick(data)
+        case 'togglePage':
+          return this.handleTogglePage(data)
+        case 'flowBtnClick':
+          return this.handleFlowBtnClick(data)
+        case 'testPlay':
+          return this.testPlay(data)
+        case 'search':
+          return this.handleSearch(data)
+      }
+    },
+    resetSelect() {
+      this.selectdData = []
+    },
  },
 }
 </script>
@@ -250,46 +188,5 @@ export default {
  overflow: hidden;
  flex-flow: column nowrap;
 }
-.list {
-  position: relative;
-  height: 100%;
-  font-size: 14px;
-  display: flex;
-  flex-flow: column nowrap;
-  // table {
-  //   position: relative;
-  //   thead {
-  //     position: fixed;
-  //     width: 100%;
-  //     th {
-  //       width: 100%;
-  //     }
-  //   }
-  // }
-}
-.thead {
-  flex: none;
-}
-.tbody {
-  flex: auto;
-  overflow-y: auto;
-  td {
-    font-size: 12px;
-    :global(.badge) {
-      margin-right: 3px;
-      &:first-child {
-        margin-left: 3px;
-      }
-      &:last-child {
-        margin-right: 0;
-      }
-    }
-  }
-}
-.pagination {
-  text-align: center;
-  padding: 15px 0;
-  // left: 50%;
-  // transform: translateX(-50%);
-}
+
 </style>
--- a/src/renderer/views/List.vue
+++ b/src/renderer/views/List.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
  div(:class="$style.list")
    //- transition
-    div(v-if="list.length" :class="$style.content")
+    div(v-if="delayShow && list.length" :class="$style.content")
      div(:class="$style.thead")
        table
          thead
@@ -11,14 +11,14 @@
                  :indeterminate="isIndeterminate" :title="isSelectAll && !isIndeterminate ? '全不选' : '全选'")
              th.nobreak(style="width: 25%;") 歌曲名
              th.nobreak(style="width: 20%;") 歌手
-              th.nobreak(style="width: 20%;" v-if="setting.list.isShowAlbumName") 专辑
+              th.nobreak(style="width: 20%;") 专辑
              th.nobreak(style="width: 20%;") 操作
              th.nobreak(style="width: 10%;") 时长
      div.scroll(:class="$style.tbody")
        table
          tbody
            tr(v-for='(item, index) in list' :key='item.songmid'
-              @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', isAPITemp && item.source != 'kw' ? $style.disabled : '']")
+              @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', (isAPITemp && item.source != 'kw') || item.source == 'tx' || item.source == 'wy' ? $style.disabled : '']")
              td.nobreak.center(style="width: 37px;" @click.stop)
                  material-checkbox(:id="index.toString()" v-model="selectdData" :value="item")
              td.break(style="width: 25%;") {{item.name}}
@@ -28,7 +28,7 @@
                //- span.badge.badge-info(v-if="item._types.ape") APE
                //- span.badge.badge-success(v-if="item._types.flac") FLAC
              td.break(style="width: 20%;") {{item.singer}}
-              td.break(style="width: 20%;" v-if="setting.list.isShowAlbumName") {{item.albumName}}
+              td.break(style="width: 20%;") {{item.albumName}}
              td(style="width: 20%; padding-left: 0; padding-right: 0;")
                material-list-buttons(:index="index" @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)') 下载
@@ -37,6 +37,7 @@
                //- 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.noItem" v-else)
+      p 加载中...
    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" :add-btn="false" :play-btn="false" @btn-click="handleFlowBtnClick")
@@ -57,6 +58,7 @@ export default {
      isIndeterminate: false,
      isShowEditBtn: false,
      isShowDownloadMultiple: false,
+      delayShow: false,
    }
  },
  computed: {
@@ -119,6 +121,11 @@ export default {
  //   this.handleSearch(this.text, this.page)
  // }
  // },
+  mounted() {
+    if (this.list.length > 150) {
+      setTimeout(() => this.delayShow = true, 200)
+    } else this.delayShow = true
+  },
  methods: {
    ...mapMutations('list', ['defaultListRemove', 'defaultListRemoveMultiple']),
    ...mapActions('download', ['createDownload', 'createDownloadMultiple']),
@@ -137,7 +144,7 @@ export default {
      this.clickIndex = -1
    },
    testPlay(index) {
-      if (this.isAPITemp && this.list[index].source != 'kw') return
+      if ((this.isAPITemp && this.list[index].source != 'kw') || this.list[index].source == 'tx' || this.list[index].source == 'wy') return
      this.setList({ list: this.list, listId: 'test', index })
    },
    handleRemove(index) {
@@ -145,17 +152,18 @@ export default {
    },
    handleListBtnClick(info) {
      switch (info.action) {
-        case 'download':
-          this.musicInfo = this.list[info.index]
+        case 'download': {
+          const minfo = this.list[info.index]
+          if ((this.isAPITemp && minfo.source != 'kw') || minfo.source == 'tx' || minfo.source == 'wy') return
+          this.musicInfo = minfo
          this.$nextTick(() => {
            this.isShowDownload = true
          })
          break
+        }
        case 'play':
          this.testPlay(info.index)
          break
-        case 'add':
-          break
        case 'remove':
          this.handleRemove(info.index)
          break
@@ -173,7 +181,7 @@ export default {
      this.selectdData = []
    },
    handleAddDownloadMultiple(type) {
-      const list = this.setting.apiSource == 'temp' ? this.selectdData.filter(s => s.source == 'kw') : [...this.selectdData]
+      const list = this.setting.apiSource == 'temp' ? this.selectdData.filter(s => s.source == 'kw') : this.selectdData.filter(s => s.source != 'tx' && s.source != 'wy')
      this.createDownloadMultiple({ list, type })
      this.resetSelect()
      this.isShowDownloadMultiple = false
@@ -239,6 +247,20 @@ export default {
  opacity: .5;
 }

+.no-item {
+  position: relative;
+  height: 100%;
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: center;
+  align-items: center;
+
+  p {
+    font-size: 24px;
+    color: #ccc;
+  }
+}
+
 each(@themes, {
  :global(#container.@{value}) {
    .tbody {
--- a/src/renderer/views/Recommend.vue
+++ b/src/renderer/views/Recommend.vue
@@ -1,20 +0,0 @@
-<template lang="pug">
-  div
-    h2 推荐
-</template>
-
-<script>
-export default {
-  name: 'About',
-  data() {
-    return {
-      count: 0,
-    }
-  },
-  methods: {
-    add() {
-      this.count++
-    },
-  },
-}
-</script>
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -19,7 +19,7 @@ div.scroll(:class="$style.setting")
      h3 音乐来源
      div
        material-checkbox(v-for="item in apiSources" :id="`setting_api_source_${item.id}`" @change="handleAPISourceChange(item.id)" :class="$style.gapTop"
-          need v-model="current_setting.apiSource" :value="item.id" :label="item.label" :key="item.id")
+          need v-model="current_setting.apiSource" :disabled="item.disabled" :value="item.id" :label="item.label" :key="item.id")

    dt 播放设置
    dd(title="都不选时播放完当前歌曲就停止播放")
@@ -31,6 +31,10 @@ div.scroll(:class="$style.setting")
      h3 优先播放高品质音乐
      div
        material-checkbox(id="setting_player_highQuality" v-model="current_setting.player.highQuality" label="是否启用")
+    dd(title='在任务栏上显示当前歌曲播放进度')
+      h3 任务栏播放进度条
+      div
+        material-checkbox(id="setting_player_showTaskProgess" v-model="current_setting.player.isShowTaskProgess" label="是否启用")
    dt 下载设置
    dd(title='下载歌曲保存的路径')
      h3 下载路径
@@ -45,11 +49,24 @@ div.scroll(:class="$style.setting")
      div
        material-checkbox(:id="`setting_download_musicName_${item.value}`" :class="$style.gapLeft" name="setting_download_musicName" :value="item.value" :key="item.value" need
            v-model="current_setting.download.fileName" v-for="item in musicNames" :label="item.name")
-    dt 列表设置
-    dd(title='播放列表是否显示专辑栏')
+    dd(title='是否将封面嵌入音频文件中')
+      h3 封面嵌入（只支持MP3格式）
+      div
+        material-checkbox(id="setting_download_isEmbedPic" v-model="current_setting.download.isEmbedPic" label="是否启用")
+    dd(title='是否同时下载歌词文件')
+      h3 歌词下载
+      div
+        material-checkbox(id="setting_download_isDownloadLrc" v-model="current_setting.download.isDownloadLrc" label="是否启用")
+    //- dt 列表设置
+    //- dd(title='播放列表是否显示专辑栏')
      h3 专辑栏
      div
        material-checkbox(id="setting_list_showalbum" v-model="current_setting.list.isShowAlbumName" label="是否显示专辑栏")
+    dt 强迫症设置
+    dd
+      h3 离开搜索界面时清空搜索框
+      div
+        material-checkbox(id="setting_odc_isAutoClearSearchInput" v-model="current_setting.odc.isAutoClearSearchInput" label="是否启用")
    dt 备份与恢复
    dd
      h3 部分数据
@@ -63,14 +80,46 @@ div.scroll(:class="$style.setting")
      div
        material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleImportAllData") 导入
        material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleExportAllData") 导出
+    dt 软件更新
+    dd
+      p.small
+        | 最新版本：{{version.newVersion ? version.newVersion.version : '未知'}}
+      p.small 当前版本：{{version.version}}
+      p.small(v-if="version.newVersion")
+        span(v-if="isLatestVer") 软件已是最新，尽情地体验吧~🥂
+        material-btn(v-else-if="setting.ignoreVersion || version.isError" :class="[$style.btn, $style.gapLeft]" min @click="showUpdateModal") 打开更新窗口 🚀
+        span(v-else) 发现新版本并在努力下载中，请稍等...⏳
+      p.small(v-else) 检查更新中...
    dt 关于洛雪音乐
    dd
      p.small
        | 本软件完全免费，代码已开源，开源地址：
-        span.hover(@click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop')") https://github.com/lyswhut/lx-music-desktop
+        span.hover.underline(title="点击打开" @click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop#readme')") https://github.com/lyswhut/lx-music-desktop
+      p.small
+        | 最新版网盘下载地址（网盘内有Windows、MAC版）：
+        span.hover.underline(title="点击打开" @click="handleOpenUrl('https://www.lanzous.com/b906260/')") 网盘地址
+        | &nbsp;&nbsp;密码：
+        span.hover(title="点击复制" @click="clipboardWriteText('glqw')") glqw
+      p.small
+        | 软件的常见问题可转至：
+        span.hover.underline(title="点击打开" @click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop#常见问题')") 常见问题
+      //- p.small
+          | 怀念曾经的
+          strong @messoer
+          | ，非常感谢曾经为本软件提供数据源！
+      p.small
+        | 阅读常见问题后仍有问题可 mail to：
+        span.hover(title="点击复制" @click="clipboardWriteText('lyswhut@qq.com')") lyswhut@qq.com
+        | &nbsp;或到 GitHub 提交&nbsp;
+        span.hover.underline(title="点击打开" @click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop/issues')") issue
+      p.small
+        | 若觉得好用的话可以去 GitHub 点个
+        strong star
+        | 支持作者哦~~🍻
      p
-        small 当前版本：
-        | {{version.version}}
+        span 如果你资金充裕，还可以
+        material-btn(@click="handleOpenUrl('https://cdn.stsky.cn/qrc.png')" min title="土豪，你好 🙂") 打赏下作者
+        span ，以帮我分担点服务器费用~❤️
      p.small
        |  本软件仅用于学习交流使用，禁止将本软件用于
        strong 非法用途
@@ -81,15 +130,6 @@ div.scroll(:class="$style.setting")
          | 使用本软件造成的一切后果由
          strong 使用者
          | 承担！
-      p.small
-          | 本软件的部分接口使用自 https://github.com/messoer ，非常感谢
-          strong @messoer
-          | ！
-      p.small 若有问题可 mail to：lyswhut@qq.com 或到 github 提交 issue
-      p.small
-        | 若觉得好用的话去GitHub点个
-        strong star
-        | 支持作者吧~
      p
        small By：
        | 落雪无痕
@@ -97,13 +137,19 @@ div.scroll(:class="$style.setting")

 <script>
 import { mapGetters, mapMutations } from 'vuex'
-import { openDirInExplorer, openSelectDir, openSaveDir, updateSetting, openUrl } from '../utils'
+import { openDirInExplorer, openSelectDir, openSaveDir, updateSetting, openUrl, clipboardWriteText } from '../utils'
+import { rendererSend } from '../../common/icp'
 import fs from 'fs'
+
+
 export default {
  name: 'Setting',
  computed: {
    ...mapGetters(['setting', 'themes', 'version']),
    ...mapGetters('list', ['defaultList']),
+    isLatestVer() {
+      return this.version.newVersion && this.version.version === this.version.newVersion.version
+    },
  },
  data() {
    return {
@@ -112,13 +158,19 @@ export default {
        player: {
          togglePlayMethod: 'random',
          highQuality: false,
+          isShowTaskProgess: true,
        },
        list: {
          isShowAlbumName: true,
        },
        download: {
-          savePath: 'C:\\',
+          savePath: '',
          fileName: '歌名 - 歌手',
+          isDownloadLrc: false,
+          isEmbedPic: true,
+        },
+        odc: {
+          isAutoClearSearchInput: false,
        },
        themeId: 0,
        sourceId: 0,
@@ -144,13 +196,26 @@ export default {
        },
      ],
      apiSources: [
+        // {
+        //   id: 'messoer',
+        //   // label: '由 messoer 提供的接口（推荐，软件的所有功能都可用）',
+        //   label: '由 messoer 提供的接口（该接口已关闭）',
+        //   disabled: true,
+        // },
+        // {
+        //   id: 'internal',
+        //   label: '内置接口（只能试听或下载128k音质，该接口支持软件的所有功能）',
+        //   disabled: false,
+        // },
        {
-          id: 'messoer',
-          label: '由 messoer 提供的接口（推荐，软件的所有功能都可用）<br><span style="line-height: 1.5;"><strong>注意：</strong>本接口10秒内请求数超过100次会封10小时的IP</span>',
+          id: 'test',
+          label: '测试接口（软件的大部分功能可用，该接口访问速度略慢）',
+          disabled: false,
        },
        {
          id: 'temp',
-          label: '临时接口（软件的某些功能将不可用，建议在messoer不可用时再切换到本选项）',
+          label: '临时接口（软件的某些功能不可用，该接口比测试接口快一些，建议测试接口不可用再使用本接口）',
+          disabled: false,
        },
      ],
      musicNames: [
@@ -177,12 +242,21 @@ export default {
      },
      deep: true,
    },
+    'current_setting.player.isShowTaskProgess'(n) {
+      if (n) return
+      this.$nextTick(() => {
+        rendererSend('progress', {
+          status: -1,
+          mode: 'normal',
+        })
+      })
+    },
  },
  mounted() {
    this.init()
  },
  methods: {
-    ...mapMutations(['setSetting']),
+    ...mapMutations(['setSetting', 'setVersionModalVisible']),
    ...mapMutations('list', ['setDefaultList']),
    init() {
      this.current_setting = JSON.parse(JSON.stringify(this.setting))
@@ -336,6 +410,15 @@ export default {
        window.globalObj.apiSource = id
      })
    },
+    showUpdateModal() {
+      this.setVersionModalVisible({ isShow: true })
+    },
+    clipboardWriteText(text) {
+      clipboardWriteText(text)
+    },
+    openRewardModal() {
+
+    },
  },
 }
 </script>
--- a/src/renderer/views/SongList.vue
+++ b/src/renderer/views/SongList.vue
@@ -0,0 +1,399 @@
+<template lang="pug">
+  div(:class="$style.container")
+    div(:class="$style.header")
+      material-tag-list(:class="$style.tagList" :list="tagList" v-model="tagInfo")
+      material-tab(:class="$style.tab" :list="sorts" item-key="id" item-name="name" v-model="sortId")
+      material-select(:class="$style.select" :list="sourceInfo.sources" item-key="id" item-name="name" v-model="source")
+    div(:class="$style.main")
+      transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
+        div(:class="$style.songListDetail" v-show="isVisibleListDetail")
+          div(:class="$style.songListHeader")
+            div(:class="$style.songListHeaderLeft")
+              img(:src="selectListInfo.img")
+              span(:class="$style.playNum" v-if="selectListInfo.play_count") {{selectListInfo.play_count}}
+            div(:class="$style.songListHeaderMiddle")
+              h3(:title="selectListInfo.name") {{selectListInfo.name}}
+              p(:title="selectListInfo.desc") {{selectListInfo.desc}}
+            div(:class="$style.songListHeaderRight")
+              material-btn(:class="$style.closeDetailButton" @click="hideListDetail") 返回
+          material-song-list(v-model="selectdData" @action="handleSongListAction" :source="source" :page="listDetail.page" :limit="listDetail.limit" :total="listDetail.total" :list="listDetail.list")
+      transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
+        div.scroll(:class="$style.songList" ref="dom_scrollContent" v-show="!isVisibleListDetail")
+          ul
+            li(:class="$style.item" v-for="(item, index) in listData.list" @click="handleItemClick(index)")
+              div(:class="$style.left")
+                img(:src="item.img")
+              div(:class="$style.right" :src="item.img")
+                h4(:title="item.name") {{item.name}}
+                p(:title="item.desc") {{item.desc}}
+            li(:class="$style.item" style="cursor: default;" v-if="listData.list && listData.list.length && listData.list.length % 3 == 2")
+          div(:class="$style.pagination")
+            material-pagination(:count="listData.total" :limit="listData.limit" :page="listData.page" @btn-click="handleToggleListPage")
+    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")
+</template>
+
+<script>
+import { mapGetters, mapMutations, mapActions } from 'vuex'
+import { scrollTo } from '../utils'
+// import music from '../utils/music'
+export default {
+  name: 'SongList',
+  data() {
+    return {
+      tagInfo: {
+        name: '默认',
+        id: null,
+      },
+      sortId: undefined,
+      source: null,
+      isShowDownload: false,
+      musicInfo: null,
+      selectdData: [],
+      isShowDownloadMultiple: false,
+      isToggleSource: false,
+    }
+  },
+  computed: {
+    ...mapGetters(['setting']),
+    ...mapGetters('songList', ['sourceInfo', 'tags', 'listData', 'isVisibleListDetail', 'selectListInfo', 'listDetail']),
+    ...mapGetters('list', ['defaultList']),
+    sorts() {
+      return this.source ? this.sourceInfo.sortList[this.source] : []
+    },
+    isAPITemp() {
+      return this.setting.apiSource == 'temp'
+    },
+    tagList() {
+      return this.tags[this.source] ? this.tags[this.source].tags : []
+    },
+  },
+  watch: {
+    sortId(n, o) {
+      this.setSongList({ sortId: n })
+      if (o === undefined && this.listData.page !== 1) return
+      this.$nextTick(() => {
+        this.getList(1).then(() => {
+          this.$nextTick(() => {
+            scrollTo(this.$refs.dom_scrollContent, 0)
+          })
+        })
+      })
+      // if (this.isVisibleListDetail) this.setVisibleListDetail(false)
+    },
+    tagInfo(n, o) {
+      this.setSongList({ tagInfo: n })
+      if (!o && this.listData.page !== 1) return
+      if (this.isToggleSource) {
+        this.isToggleSource = false
+        return
+      }
+      this.$nextTick(() => {
+        this.getList(1).then(() => {
+          this.$nextTick(() => {
+            scrollTo(this.$refs.dom_scrollContent, 0)
+          })
+        })
+      })
+      // if (this.isVisibleListDetail) this.setVisibleListDetail(false)
+    },
+    source(n, o) {
+      this.setSongList({ source: n })
+      if (!this.tags[n]) this.getTags()
+      if (o) {
+        this.isToggleSource = true
+        this.tagInfo = {
+          name: '默认',
+          id: null,
+        }
+        this.sortId = this.sorts[0] && this.sorts[0].id
+      }
+    },
+  },
+  mounted() {
+    this.source = this.setting.songList.source
+    this.isToggleSource = true
+    this.tagInfo = this.setting.songList.tagInfo
+    this.sortId = this.setting.songList.sortId
+  },
+  methods: {
+    ...mapMutations(['setSongList']),
+    ...mapActions('songList', ['getTags', 'getList', 'getListDetail']),
+    ...mapMutations('songList', ['setVisibleListDetail', 'setSelectListInfo', 'clearListDetail']),
+    ...mapActions('download', ['createDownload', 'createDownloadMultiple']),
+    ...mapMutations('list', ['defaultListAdd', 'defaultListAddMultiple']),
+    ...mapMutations('player', ['setList']),
+    handleListBtnClick(info) {
+      switch (info.action) {
+        case 'download':
+          this.musicInfo = this.listDetail.list[info.index]
+          this.$nextTick(() => {
+            this.isShowDownload = true
+          })
+          break
+        case 'play':
+          this.testPlay(info.index)
+          break
+        case 'search':
+          this.handleSearch(info.index)
+          break
+        // case 'add':
+        //   break
+      }
+    },
+    testPlay(index) {
+      let targetSong
+      if (index == null) {
+        targetSong = this.selectdData[0]
+        this.defaultListAddMultiple(this.selectdData)
+        this.resetSelect()
+      } else {
+        targetSong = this.listDetail.list[index]
+        this.defaultListAdd(targetSong)
+      }
+      let targetIndex = this.defaultList.list.findIndex(
+        s => s.songmid === targetSong.songmid
+      )
+      if (targetIndex > -1) {
+        this.setList({
+          list: this.defaultList.list,
+          listId: 'test',
+          index: targetIndex,
+        })
+      }
+    },
+    handleSearch(index) {
+      const info = this.listDetail.list[index]
+      this.$router.push({
+        path: 'search',
+        query: {
+          text: `${info.name} ${info.singer}`,
+        },
+      })
+    },
+    handleToggleListPage(page) {
+      this.getList(page).then(() => {
+        this.$nextTick(() => {
+          scrollTo(this.$refs.dom_scrollContent, 0)
+        })
+      })
+    },
+    handleToggleListDetailPage(page) {
+      this.getListDetail({ id: this.selectListInfo.id, page }).then(() => {
+        this.$nextTick(() => {
+          scrollTo(this.$refs.dom_scrollContent, 0)
+        })
+      })
+    },
+    handleAddDownload(type) {
+      this.createDownload({ musicInfo: this.musicInfo, type })
+      this.isShowDownload = false
+    },
+    handleAddDownloadMultiple(type) {
+      switch (this.source) {
+        case 'kg':
+        case 'wy':
+          type = '128k'
+      }
+      this.createDownloadMultiple({ list: [...this.selectdData], type })
+      this.resetSelect()
+      this.isShowDownloadMultiple = false
+    },
+    handleItemClick(index) {
+      this.setSelectListInfo(this.listData.list[index])
+      this.setVisibleListDetail(true)
+      this.clearListDetail()
+      this.$nextTick(() => {
+        this.getListDetail({ id: this.selectListInfo.id, page: 1 })
+      })
+    },
+    handleFlowBtnClick(action) {
+      switch (action) {
+        case 'download':
+          this.isShowDownloadMultiple = true
+          break
+        case 'play':
+          this.testPlay()
+          break
+        case 'add':
+          this.defaultListAddMultiple(this.selectdData)
+          this.resetSelect()
+          break
+      }
+    },
+    handleSongListAction({ action, data }) {
+      switch (action) {
+        case 'listBtnClick':
+          return this.handleListBtnClick(data)
+        case 'togglePage':
+          return this.handleToggleListDetailPage(data)
+        case 'flowBtnClick':
+          return this.handleFlowBtnClick(data)
+        case 'testPlay':
+          return this.testPlay(data)
+        case 'search':
+          return this.handleSearch(data)
+      }
+    },
+    resetSelect() {
+      this.selectdData = []
+    },
+    hideListDetail() {
+      setTimeout(() => this.setVisibleListDetail(false), 50)
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../assets/styles/layout.less';
+
+.container {
+  height: 100%;
+  display: flex;
+  flex-flow: column nowrap;
+}
+.header {
+  flex: none;
+  width: 100%;
+  display: flex;
+  flex-flow: row nowrap;
+
+}
+.tab {
+  flex: auto;
+}
+.select {
+  flex: none;
+  width: 80px;
+}
+
+.main {
+  flex: auto;
+  overflow: hidden;
+  // position: relative;
+}
+
+.song-list-header {
+  background-color: @color-theme_2;
+  display: flex;
+  flex-flow: row nowrap;
+  height: 60px;
+}
+.song-list-header-left {
+  flex: none;
+  margin-left: 5px;
+  width: 60px;
+  position: relative;
+  img {
+    max-width: 100%;
+    max-height: 100%;
+  }
+  .play-num {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 2px;
+    background-color: rgba(0, 0, 0, 0.4);
+    color: #fff;
+    font-size: 11px;
+    text-align: right;
+    .mixin-ellipsis-1;
+  }
+}
+
+.song-list-header-middle {
+  flex: auto;
+  padding: 5px 7px;
+  h3 {
+    .mixin-ellipsis-1;
+    line-height: 1.2;
+    padding-bottom: 5px;
+  }
+  p {
+    .mixin-ellipsis-2;
+    font-size: 12px;
+    line-height: 1.2;
+    color: #888;
+  }
+}
+.song-list-header-right {
+  flex: none;
+  display: flex;
+  align-items: center;
+  padding-right: 15px;
+}
+
+.song-list-detail {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  display: flex;
+  flex-flow: column nowrap;
+}
+
+.songList {
+  height: 100%;
+  overflow-y: auto;
+  padding: 0 15px;
+  background-color: #fff;
+  ul {
+    display: flex;
+    flex-flow: row wrap;
+    justify-content: space-between;
+  }
+}
+.item {
+  width: 32%;
+  box-sizing: border-box;
+  display: flex;
+  margin-top: 15px;
+  cursor: pointer;
+  transition: opacity @transition-theme;
+  &:hover {
+    opacity: .7;
+  }
+}
+.left {
+  flex: none;
+  width: 66px;
+  height: 66px;
+  display: flex;
+
+  img {
+    max-width: 100%;
+    max-height: 100%;
+  }
+}
+.right {
+  flex: auto;
+  padding: 5px 15px 5px 7px;
+  overflow: hidden;
+  h4 {
+    font-size: 14px;
+    text-align: justify;
+    line-height: 1.2;
+    .mixin-ellipsis-1;
+  }
+  p {
+    margin-top: 12px;
+    font-size: 12px;
+    .mixin-ellipsis-2;
+    text-align: justify;
+    line-height: 1.2;
+    // text-indent: 24px;
+
+    color: #888;
+  }
+}
+.pagination {
+  text-align: center;
+  padding: 15px 0;
+  // left: 50%;
+  // transform: translateX(-50%);
+}
+</style>
Author	SHA1	Message	Date
lyswhut	1c462ce152	更新依赖包到最新，发布0.5.3版本	2019-09-09 01:05:30 +08:00
lyswhut	2014d2495e	发布0.5.2版本	2019-09-09 00:40:27 +08:00
lyswhut	dc5493f39f	更新免责声明	2019-09-09 00:40:00 +08:00
lyswhut	67ff5e5a4a	优化列表加载体验，移除失效源	2019-09-09 00:33:24 +08:00
lyswhut	22d56d31a9	更新关于软件说明	2019-09-08 01:59:43 +08:00
lyswhut	785427674a	修复下拉列表间隙	2019-09-08 00:41:45 +08:00
lyswhut	581f6c6e1c	更新常见问题说明	2019-09-07 20:03:08 +08:00
lyswhut	7d0be85e84	新增下拉按钮图标	2019-09-07 19:14:47 +08:00
lyswhut	04e75ab540	新增常见问题说明	2019-09-07 13:09:05 +08:00
lyswhut	c117e33d24	新增强迫症设置	2019-09-07 12:46:47 +08:00
lyswhut	cafdad6f9f	修复下载管理的一些Bug	2019-09-07 10:43:17 +08:00
lyswhut	05e212682c	更新选项名称	2019-09-06 13:26:11 +08:00
lyswhut	3f876202c1	尝试修复Mac系统报错问题	2019-09-06 11:47:39 +08:00
lyswhut	57c75799a9	发布0.5.1版本	2019-09-05 22:43:11 +08:00
lyswhut	5cbf2d8047	新增下载列表定位文件功能	2019-09-05 22:41:10 +08:00
lyswhut	3dd9ad9ead	新增右上角最小化/关闭按钮鼠标滑过符号	2019-09-05 21:36:00 +08:00
lyswhut	864bef483f	修复更新弹窗无法弹出的问题	2019-09-05 13:54:26 +08:00
lyswhut	9ea9fefe1d	修复百度源歌单全部分类无法加载的问题	2019-09-05 13:34:41 +08:00
lyswhut	0b953a1517	修复打包部署顺序Bug	2019-09-05 01:54:47 +08:00
lyswhut	80db293aca	发布0.5.0版本	2019-09-05 01:48:11 +08:00
lyswhut	809be41e64	新增：封面嵌入、歌词下载；修复Bug	2019-09-05 01:41:36 +08:00
lyswhut	8a6ee68e58	优化更新检查失败文字提示	2019-09-04 15:09:46 +08:00
lyswhut	da764721d9	新增单例应用功能	2019-09-04 13:08:32 +08:00
lyswhut	0586639e07	略微整理更新超时机制	2019-09-04 11:28:54 +08:00
lyswhut	0aeab00289	优化歌单列表动画	2019-09-04 09:10:06 +08:00
lyswhut	9564097f46	修复歌单无法翻页Bug	2019-09-04 08:58:29 +08:00
lyswhut	d4750f4c6e	添加标签背景动画	2019-09-04 01:24:43 +08:00
lyswhut	f1cc2fe72e	缓存electron-builder数据	2019-09-04 00:44:19 +08:00
lyswhut	6d90539e89	调换打包顺序	2019-09-04 00:41:54 +08:00
lyswhut	21f5ed6afd	发布0.4.0版本	2019-09-04 00:32:24 +08:00
lyswhut	4cbbf2ac81	新增版本更新超时功能	2019-09-04 00:31:34 +08:00
lyswhut	a035a2525a	完成歌单功能	2019-09-04 00:03:29 +08:00
lyswhut	9727601752	切换接口地址	2019-09-03 17:02:31 +08:00
lyswhut	9e9053c0eb	完善歌单功能	2019-09-03 02:49:48 +08:00
lyswhut	507d495f3f	修复http post请求封装的bug	2019-09-02 01:36:03 +08:00
lyswhut	a2f7547cdb	修复歌单接口bug，完善歌单页面	2019-09-02 00:57:57 +08:00
lyswhut	d48308d913	完成歌曲列表分离	2019-09-01 19:24:38 +08:00
lyswhut	78c0badd95	重构歌曲列表	2019-09-01 18:09:54 +08:00
lyswhut	c81c33a430	发布0.3.5版本	2019-08-30 13:11:02 +08:00
lyswhut	1786376a9e	优化请求，修复加载bug	2019-08-29 13:41:44 +08:00
lyswhut	aa973ea984	Update README.md update	2019-08-29 08:37:18 +08:00
lyswhut	67aeeb0b2f	Update README.md 更新readme	2019-08-29 08:36:21 +08:00
lyswhut	ee2b01673b	发布0.3.3版本	2019-08-29 00:58:34 +08:00
lyswhut	c392f7ee8d	修复接口失效问题	2019-08-29 00:53:05 +08:00
lyswhut	4adc950e29	新增百度源接口封装	2019-08-27 23:25:34 +08:00
lyswhut	78db5b55ec	统一调用方法	2019-08-27 23:25:18 +08:00
lyswhut	ad40fdcb55	新增酷狗歌单接口	2019-08-26 14:29:52 +08:00
lyswhut	c5ca510a75	新增TODO列表	2019-08-26 11:11:26 +08:00
lyswhut	13c64a95fa	修复手动定位播放进度条时存在偏差的问题	2019-08-25 00:52:47 +08:00
lyswhut	5d74a78bb7	更新readme	2019-08-25 00:38:08 +08:00
lyswhut	d638bae7c4	优化音量条的视觉效果	2019-08-25 00:23:47 +08:00
lyswhut	9faf8ed55e	新增酷狗排行榜其他音质下载	2019-08-24 21:07:12 +08:00
lyswhut	3aa23b0f9d	发布0.3.2版本	2019-08-24 19:36:34 +08:00
lyswhut	063bbc9f06	新增酷狗排行榜其他音质下载	2019-08-24 19:36:00 +08:00
lyswhut	16bb23b8a7	修复音量条主题适配	2019-08-24 19:00:22 +08:00
lyswhut	a26bef6317	发布v0.3.0版本	2019-08-24 16:19:46 +08:00
lyswhut	21c41d5af1	新增音量调整	2019-08-24 16:18:04 +08:00
lyswhut	b270096591	优化更新弹窗功能，新增非安装版弹窗提醒	2019-08-24 14:24:07 +08:00
lyswhut	be689f088d	更新readme	2019-08-24 10:31:53 +08:00
lyswhut	2410409342	更新readme	2019-08-23 20:42:05 +08:00
lyswhut	a24d682747	重命名appveyor文件	2019-08-23 20:12:36 +08:00
lyswhut	2ada44a2fc	修复取消任务栏进度条可能导致的bug	2019-08-23 20:10:09 +08:00
lyswhut	d6c7fb8dcc	新增MAC、Linux构建并兼容Linux	2019-08-23 19:28:54 +08:00
lyswhut	bb40a8612a	去除切换到临时接口功能	2019-08-22 23:57:10 +08:00
lyswhut	1182a6eba4	删除重复部分	2019-08-22 23:52:00 +08:00
lyswhut	0d303889ef	修正readme文字无法加粗的问题	2019-08-22 23:26:17 +08:00
lyswhut	2b3aab2faf	更新到v0.2.3版本	2019-08-22 23:02:59 +08:00
lyswhut	893d20b4e9	使用临时接口时，试听列表中的下载按钮仍然能点击的Bug	2019-08-22 00:42:42 +08:00
lyswhut	32e421356f	移除专辑栏隐藏设置	2019-08-22 00:29:32 +08:00