发布0.6.0版本

调整失败更新提示
修改更新失败提示
2019-09-21 21:09:15 +08:00 · 2019-09-21 21:07:36 +08:00 · 2019-09-21 21:04:45 +08:00 · 2019-09-21 20:53:03 +08:00 · 2019-09-21 20:34:40 +08:00 · 2019-09-21 20:05:56 +08:00
55 changed files with 1274 additions and 510 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,44 @@ 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.6.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.5...v0.6.0) - 2019-09-21
+
+### 新增
+
+- 新增音乐**聚合搜索**，目前支持酷我、酷狗、百度源搜索
+- 新增代理功能
+
+### 优化
+
+- 优化从《梦里嫦娥》皮肤切换到其他皮肤时侧栏动画的切换效果
+
+### 修复
+
+- 修复试听列表没有歌曲时会显示列表加载中的Bug
+- 修复切换歌单列表详情时的UI Bug
+
+## [0.5.5](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.4...v0.5.5) - 2019-09-13
+
+### 新增
+
+- 月是故乡明，祝大家中秋快乐🥮~~新增个性皮肤 **《月里嫦娥》**，时间仓促，皮肤还不是很完善，可以试试喜不喜欢~😉
+- 新增 MAC 版本退出快捷键支持
+- 新增点击播放器中的歌曲标题可以复制标题的功能（遇到好听的歌曲方便分享）
+
+### 修复
+
+- 修复 MAC 系统下软件关闭时再次从 dock 打开时报错的Bug
+- 修复下载的歌曲文件名中包含命名规则不允许的符号时下载失败的问题（若歌曲名包含这些符号会自动将其移除）
+- 修复 MAC 版本不能复制粘贴的问题
+
+## [0.5.4](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.3...v0.5.4) - 2019-09-09
+
+### 移除
+
+- 下载的FLAC文件在修改歌曲信息后，软件无法播放，但使用本地播放器可以播放
+- 为了稳妥起见，暂时移除FLAC格式的meta信息修改
+- MP3格式无此问题
+
 ## [0.5.3](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.2...v0.5.3) - 2019-09-09

 ### 优化
--- a/README.md
+++ b/README.md
@@ -82,8 +82,9 @@ npm run pack

 1. 尝试更新到最新版本
 2. 尝试切换其他歌曲（或直接搜索该歌曲），若全部歌曲都无法试听与下载则进行下一步
-3. 尝试切换网络（比如切到移动网络）
-4. 若还不行请到这个链接查看详情：<https://github.com/lyswhut/lx-music-desktop/issues/5>
+3. 尝试到设置-接口来源切换到其他接口
+4. 尝试切换网络（比如切到移动网络）
+5. 若还不行请到这个链接查看详情：<https://github.com/lyswhut/lx-music-desktop/issues/5>

 #### Windows 7 下界面异常

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "lx-music-desktop",
-  "version": "0.5.2",
+  "version": "0.5.5",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -3202,9 +3202,9 @@
      "dev": true
    },
    "chokidar": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-2.1.6.tgz?cache=0&sync_timestamp=1562457945399&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-2.1.6.tgz",
-      "integrity": "sha1-tsrWU6kp4kTOioNCRBZNJB+pVMU=",
+      "version": "2.1.8",
+      "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-2.1.8.tgz",
+      "integrity": "sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=",
      "dev": true,
      "requires": {
        "anymatch": "^2.0.0",
@@ -3547,16 +3547,18 @@
      }
    },
    "conf": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npm.taobao.org/conf/download/conf-5.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fconf%2Fdownload%2Fconf-5.0.0.tgz",
-      "integrity": "sha1-ZTAwijYEG/AQq5awWg9K/1EBxl0=",
+      "version": "6.0.1",
+      "resolved": "https://registry.npm.taobao.org/conf/download/conf-6.0.1.tgz",
+      "integrity": "sha1-PQ9oGsYuLFKMioVN+3/0Lukxlds=",
      "requires": {
-        "ajv": "^6.10.0",
+        "ajv": "^6.10.2",
        "dot-prop": "^5.0.0",
        "env-paths": "^2.2.0",
-        "json-schema-typed": "^7.0.0",
+        "json-schema-typed": "^7.0.1",
        "make-dir": "^3.0.0",
+        "onetime": "^5.1.0",
        "pkg-up": "^3.0.1",
+        "semver": "^6.2.0",
        "write-file-atomic": "^3.0.0"
      },
      "dependencies": {
@@ -3586,10 +3588,18 @@
            "semver": "^6.0.0"
          }
        },
+        "onetime": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npm.taobao.org/onetime/download/onetime-5.1.0.tgz",
+          "integrity": "sha1-//DzyRYX/mK7UBiWNumayKbfe+U=",
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
        "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.2.0.tgz",
-          "integrity": "sha1-TYE9lZCq+KkZJpPWyFuTRN5ZAds="
+          "version": "6.3.0",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1565627380363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
        },
        "write-file-atomic": {
          "version": "3.0.0",
@@ -3953,25 +3963,31 @@
      }
    },
    "cross-env": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npm.taobao.org/cross-env/download/cross-env-5.2.1.tgz",
-      "integrity": "sha1-ssdsHKet1m3IdNEXmEZglPVRs00=",
+      "version": "6.0.0",
+      "resolved": "https://registry.npm.taobao.org/cross-env/download/cross-env-6.0.0.tgz",
+      "integrity": "sha1-PI5xRA6iCqb6r1rsVBI178Vl2sY=",
      "dev": true,
      "requires": {
-        "cross-spawn": "^6.0.5"
+        "cross-spawn": "^7.0.0"
      }
    },
    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz",
-      "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+      "version": "7.0.0",
+      "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-7.0.0.tgz?cache=0&sync_timestamp=1567511270254&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-7.0.0.tgz",
+      "integrity": "sha1-Ie+UcEQyYvM9uoCycFqR25WbLgM=",
      "dev": true,
      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
+        "path-key": "^3.1.0",
        "shebang-command": "^1.2.0",
        "which": "^1.2.9"
+      },
+      "dependencies": {
+        "path-key": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/path-key/download/path-key-3.1.0.tgz",
+          "integrity": "sha1-maENhwqAO91e5vBHDljfzS+aVNM=",
+          "dev": true
+        }
      }
    },
    "cross-unzip": {
@@ -4327,10 +4343,18 @@
      }
    },
    "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.0.tgz",
+      "integrity": "sha1-MQPN+KttMs9KjfeGVFjyuNM/N0U=",
+      "dev": true,
+      "requires": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      }
    },
    "deep-extend": {
      "version": "0.6.0",
@@ -4682,9 +4706,9 @@
      "dev": true
    },
    "electron": {
-      "version": "6.0.7",
-      "resolved": "https://registry.npm.taobao.org/electron/download/electron-6.0.7.tgz",
-      "integrity": "sha1-zz8CUCqljRUX8779nC2iqVzS60Y=",
+      "version": "6.0.10",
+      "resolved": "https://registry.npm.taobao.org/electron/download/electron-6.0.10.tgz",
+      "integrity": "sha1-NGhUdkDJjtRgYHEcpw9D0LLkCBg=",
      "dev": true,
      "requires": {
        "@types/node": "^10.12.18",
@@ -4884,9 +4908,9 @@
      }
    },
    "electron-log": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npm.taobao.org/electron-log/download/electron-log-3.0.7.tgz",
-      "integrity": "sha1-v9upSJyEsTAdYGcCj84vTLL4nX8="
+      "version": "3.0.8",
+      "resolved": "https://registry.npm.taobao.org/electron-log/download/electron-log-3.0.8.tgz",
+      "integrity": "sha1-6mctxAtWAUPtXYh+/x/xkE/p73E="
    },
    "electron-publish": {
      "version": "21.2.0",
@@ -4904,12 +4928,12 @@
      }
    },
    "electron-store": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/electron-store/download/electron-store-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-store%2Fdownload%2Felectron-store-4.0.0.tgz",
-      "integrity": "sha1-Xwg1Zju3dNXuy1soOzkPmRDsTPw=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npm.taobao.org/electron-store/download/electron-store-5.0.0.tgz",
+      "integrity": "sha1-1NxBCknFDI7zqNs0s73ECXGIJH8=",
      "requires": {
-        "conf": "^5.0.0",
-        "type-fest": "^0.5.2"
+        "conf": "^6.0.0",
+        "type-fest": "^0.7.1"
      }
    },
    "electron-to-chromium": {
@@ -5069,9 +5093,9 @@
      "dev": true
    },
    "eslint": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-6.3.0.tgz",
-      "integrity": "sha1-HxqQL2e/1MNU5yiLgeQGVNkn62o=",
+      "version": "6.4.0",
+      "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-6.4.0.tgz",
+      "integrity": "sha1-WqkifD++khmCsu2pS6DX+uhYYRo=",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
@@ -5119,6 +5143,27 @@
          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
          "dev": true
        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz?cache=0&sync_timestamp=1567511270254&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-6.0.5.tgz",
+          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1565627380363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz",
+              "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
+              "dev": true
+            }
+          }
+        },
        "debug": {
          "version": "4.1.1",
          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.1.1.tgz",
@@ -5567,9 +5612,9 @@
      "dev": true
    },
    "eventemitter3": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-3.1.2.tgz",
-      "integrity": "sha1-LT1I+cNGaY/Og6hdfWZOmFNd9uc=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.0.tgz",
+      "integrity": "sha1-1lF2FjiH7lnzhtZMgmELaWpKdOs=",
      "dev": true
    },
    "events": {
@@ -5610,6 +5655,21 @@
        "p-finally": "^1.0.0",
        "signal-exit": "^3.0.0",
        "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz?cache=0&sync_timestamp=1567511270254&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-6.0.5.tgz",
+          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        }
      }
    },
    "exit-hook": {
@@ -6873,9 +6933,9 @@
      "dev": true
    },
    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz",
-      "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=",
+      "version": "2.0.5",
+      "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz",
+      "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=",
      "dev": true
    },
    "get-stdin": {
@@ -7377,12 +7437,12 @@
      "dev": true
    },
    "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.17.0.tgz",
-      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
+      "version": "1.18.0",
+      "resolved": "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.0.tgz",
+      "integrity": "sha1-2+VfY+daNH2389mZdPJpKjFKajo=",
      "dev": true,
      "requires": {
-        "eventemitter3": "^3.0.0",
+        "eventemitter3": "^4.0.0",
        "follow-redirects": "^1.0.0",
        "requires-port": "^1.0.0"
      }
@@ -7742,6 +7802,12 @@
        }
      }
    },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npm.taobao.org/is-arguments/download/is-arguments-1.0.4.tgz",
+      "integrity": "sha1-P6+WbHy6D/Q3+zH2JQCC/PBEjPM=",
+      "dev": true
+    },
    "is-arrayish": {
      "version": "0.2.1",
      "resolved": "https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz",
@@ -8171,9 +8237,9 @@
      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
    },
    "json-schema-typed": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npm.taobao.org/json-schema-typed/download/json-schema-typed-7.0.0.tgz",
-      "integrity": "sha1-cU87tTljdkS4y5yZoJfE7o+OjI8="
+      "version": "7.0.1",
+      "resolved": "https://registry.npm.taobao.org/json-schema-typed/download/json-schema-typed-7.0.1.tgz",
+      "integrity": "sha1-XlZWS1oJUEI+IrKFowreIZ44CE0="
    },
    "json-stable-stringify-without-jsonify": {
      "version": "1.0.1",
@@ -8681,9 +8747,9 @@
      }
    },
    "loglevel": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npm.taobao.org/loglevel/download/loglevel-1.6.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floglevel%2Fdownload%2Floglevel-1.6.3.tgz",
-      "integrity": "sha1-d/LrZL5VpATJ/QStFtV8HW1rEoA=",
+      "version": "1.6.4",
+      "resolved": "https://registry.npm.taobao.org/loglevel/download/loglevel-1.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floglevel%2Fdownload%2Floglevel-1.6.4.tgz",
+      "integrity": "sha1-9Aj08Abbg1TQV33PbTNIWzy5DVY=",
      "dev": true
    },
    "longest": {
@@ -8807,16 +8873,24 @@
      }
    },
    "markdown-it": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npm.taobao.org/markdown-it/download/markdown-it-9.1.0.tgz?cache=0&sync_timestamp=1565527399027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmarkdown-it%2Fdownload%2Fmarkdown-it-9.1.0.tgz",
-      "integrity": "sha1-35YBwWhWhwTVVLH/+a8MW1YRaNk=",
+      "version": "10.0.0",
+      "resolved": "https://registry.npm.taobao.org/markdown-it/download/markdown-it-10.0.0.tgz",
+      "integrity": "sha1-q/xk8UGxci1mNAIETkOSfx9QqNw=",
      "dev": true,
      "requires": {
        "argparse": "^1.0.7",
-        "entities": "~1.1.1",
+        "entities": "~2.0.0",
        "linkify-it": "^2.0.0",
        "mdurl": "^1.0.1",
        "uc.micro": "^1.0.5"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/entities/download/entities-2.0.0.tgz?cache=0&sync_timestamp=1563403318326&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fentities%2Fdownload%2Fentities-2.0.0.tgz",
+          "integrity": "sha1-aNYITKsbB5dnVA2A5Wo5tCPkq/Q=",
+          "dev": true
+        }
      }
    },
    "md5.js": {
@@ -8981,8 +9055,7 @@
    "mimic-fn": {
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz?cache=0&sync_timestamp=1560442058146&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-fn%2Fdownload%2Fmimic-fn-2.1.0.tgz",
-      "integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=",
-      "dev": true
+      "integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs="
    },
    "mimic-response": {
      "version": "1.0.1",
@@ -9255,14 +9328,14 @@
      }
    },
    "node-downloader-helper": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npm.taobao.org/node-downloader-helper/download/node-downloader-helper-1.0.11.tgz",
-      "integrity": "sha1-/QvfV9Fv1IN7YVGsAQfwvuSUE9Y="
+      "version": "1.0.10",
+      "resolved": "https://registry.npm.taobao.org/node-downloader-helper/download/node-downloader-helper-1.0.10.tgz",
+      "integrity": "sha1-bt5ymVH45yl/HlbkHDgrH7DSPw0="
    },
    "node-forge": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npm.taobao.org/node-forge/download/node-forge-0.7.5.tgz",
-      "integrity": "sha1-bBUsNFzhHFL0ZcKr2VfoY5zWdN8=",
+      "version": "0.8.2",
+      "resolved": "https://registry.npm.taobao.org/node-forge/download/node-forge-0.8.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.8.2.tgz",
+      "integrity": "sha1-tLzFn7Es53qIJfxqeD3+MYJJnFo=",
      "dev": true
    },
    "node-id3": {
@@ -9470,6 +9543,12 @@
      "integrity": "sha1-/eRSCYqVHLFF8Dm7fUVUSd3BJt8=",
      "dev": true
    },
+    "object-is": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/object-is/download/object-is-1.0.1.tgz",
+      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+      "dev": true
+    },
    "object-keys": {
      "version": "1.1.1",
      "resolved": "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz",
@@ -9750,9 +9829,9 @@
      }
    },
    "parse-asn1": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.4.tgz",
-      "integrity": "sha1-N/Zij4I/vesic7TVQENKIvPvH8w=",
+      "version": "5.1.5",
+      "resolved": "https://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.5.tgz?cache=0&sync_timestamp=1568806095714&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-asn1%2Fdownload%2Fparse-asn1-5.1.5.tgz",
+      "integrity": "sha1-ADJxND2ljclMrOSU+u89IUfs6g4=",
      "dev": true,
      "requires": {
        "asn1.js": "^4.0.0",
@@ -9931,9 +10010,9 @@
      }
    },
    "portfinder": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.21.tgz?cache=0&sync_timestamp=1562941556574&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fportfinder%2Fdownload%2Fportfinder-1.0.21.tgz",
-      "integrity": "sha1-YOE5e5WsFwdJ23ADTs4wa5on4yQ=",
+      "version": "1.0.24",
+      "resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.24.tgz?cache=0&sync_timestamp=1567711866999&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fportfinder%2Fdownload%2Fportfinder-1.0.24.tgz",
+      "integrity": "sha1-Ee+8aGXxLzdiS2Ux6tHYCe2WXPo=",
      "dev": true,
      "requires": {
        "async": "^1.5.2",
@@ -11129,6 +11208,15 @@
      "integrity": "sha1-Wxmrk3ftxovDZ5JWhAuymvwVjX8=",
      "dev": true
    },
+    "regexp.prototype.flags": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/regexp.prototype.flags/download/regexp.prototype.flags-1.2.0.tgz",
+      "integrity": "sha1-azByTjBqJ4M+6xcbZqyIkLo35Bw=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2"
+      }
+    },
    "regexpp": {
      "version": "2.0.1",
      "resolved": "https://registry.npm.taobao.org/regexpp/download/regexpp-2.0.1.tgz",
@@ -11284,9 +11372,9 @@
      "dev": true
    },
    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz",
+      "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=",
      "dev": true
    },
    "requires-port": {
@@ -11509,12 +11597,12 @@
      "dev": true
    },
    "selfsigned": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.4.tgz",
-      "integrity": "sha1-zdfsz8pO12NdR6CL8tXTB0CS4s0=",
+      "version": "1.10.6",
+      "resolved": "https://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.6.tgz",
+      "integrity": "sha1-ezzTftnCA0JhoXOvGhquJ9gWm2c=",
      "dev": true,
      "requires": {
-        "node-forge": "0.7.5"
+        "node-forge": "0.8.2"
      }
    },
    "semver": {
@@ -11922,9 +12010,9 @@
      }
    },
    "sockjs-client": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.3.0.tgz",
-      "integrity": "sha1-EvydbLZj2lc509xftuhofalcsXc=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.4.0.tgz",
+      "integrity": "sha1-yfJWjhnI/YFztJl+o0IOC7MGx9U=",
      "dev": true,
      "requires": {
        "debug": "^3.2.5",
@@ -12608,9 +12696,9 @@
      }
    },
    "terser": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.3.0.tgz",
-      "integrity": "sha1-AlkHBXb/NNicXNK42RBVzc4CEtU=",
+      "version": "4.3.1",
+      "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.3.1.tgz",
+      "integrity": "sha1-CYILyzOYKZxLSNmoau/GUSfQ7WU=",
      "dev": true,
      "requires": {
        "commander": "^2.20.0",
@@ -12627,9 +12715,9 @@
      }
    },
    "terser-webpack-plugin": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.0.1.tgz",
-      "integrity": "sha1-XmmhhxM0chdO8vtRr8dqDwp7HRM=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.1.0.tgz",
+      "integrity": "sha1-uc7nmaLaK854hUDDc44IG22yjYo=",
      "dev": true,
      "requires": {
        "cacache": "^12.0.3",
@@ -12638,7 +12726,7 @@
        "schema-utils": "^2.2.0",
        "serialize-javascript": "^2.1.0",
        "source-map": "^0.6.1",
-        "terser": "^4.2.1",
+        "terser": "^4.3.1",
        "webpack-sources": "^1.4.3"
      },
      "dependencies": {
@@ -12980,9 +13068,9 @@
      }
    },
    "type-fest": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.5.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype-fest%2Fdownload%2Ftype-fest-0.5.2.tgz",
-      "integrity": "sha1-1u9CoDVsbNRfSUhcO2KB/BSOSKI="
+      "version": "0.7.1",
+      "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.7.1.tgz?cache=0&sync_timestamp=1568616739328&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype-fest%2Fdownload%2Ftype-fest-0.7.1.tgz",
+      "integrity": "sha1-jdpl/q8D7Xjwo/lnjxhpFH98XEg="
    },
    "type-is": {
      "version": "1.6.18",
@@ -13176,9 +13264,9 @@
      }
    },
    "upath": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/upath/download/upath-1.1.2.tgz",
-      "integrity": "sha1-PbZYYA7a7sy+bbXmhNZ+6MKs0Gg=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz?cache=0&sync_timestamp=1567457281208&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fupath%2Fdownload%2Fupath-1.2.0.tgz",
+      "integrity": "sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=",
      "dev": true
    },
    "update-notifier": {
@@ -13585,9 +13673,9 @@
      }
    },
    "webpack": {
-      "version": "4.39.3",
-      "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.39.3.tgz?cache=0&sync_timestamp=1567777097936&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-4.39.3.tgz",
-      "integrity": "sha1-oCF50QMhVrcTtuwtp+DfnQN971A=",
+      "version": "4.40.2",
+      "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.40.2.tgz?cache=0&sync_timestamp=1568385142284&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-4.40.2.tgz",
+      "integrity": "sha1-0hQz0lD5AL8PrLq+j1DVhbLcMKc=",
      "dev": true,
      "requires": {
        "@webassemblyjs/ast": "1.8.5",
@@ -13702,9 +13790,9 @@
      }
    },
    "webpack-cli": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npm.taobao.org/webpack-cli/download/webpack-cli-3.3.8.tgz?cache=0&sync_timestamp=1567702895037&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-cli%2Fdownload%2Fwebpack-cli-3.3.8.tgz",
-      "integrity": "sha1-yurrzCb2hdsXNuXezT8BqsMBI+w=",
+      "version": "3.3.9",
+      "resolved": "https://registry.npm.taobao.org/webpack-cli/download/webpack-cli-3.3.9.tgz",
+      "integrity": "sha1-ecJ+cflLf+Mk1ZSrZKjjlrnaqRo=",
      "dev": true,
      "requires": {
        "chalk": "2.4.2",
@@ -13720,42 +13808,17 @@
        "yargs": "13.2.4"
      },
      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
-          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz",
-          "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz?cache=0&sync_timestamp=1567511270254&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-6.0.5.tgz",
+          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
          "dev": true,
          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz",
-          "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=",
-          "dev": true
-        },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz",
-          "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
-          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
          }
        },
        "v8-compile-cache": {
@@ -13763,59 +13826,31 @@
          "resolved": "https://registry.npm.taobao.org/v8-compile-cache/download/v8-compile-cache-2.0.3.tgz",
          "integrity": "sha1-APdJTSritojP4omd9u0sVL75Hb4=",
          "dev": true
-        },
-        "yargs": {
-          "version": "13.2.4",
-          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-13.2.4.tgz",
-          "integrity": "sha1-C1YreUAW65ZRuYvTes82SqXW3IM=",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "os-locale": "^3.1.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-13.1.1.tgz",
-          "integrity": "sha1-0mBYUyqgbTZf4JH2ofwGsvfl7KA=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
        }
      }
    },
    "webpack-dev-middleware": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-3.7.0.tgz",
-      "integrity": "sha1-73UdJfTppcijXaYAxf2jWCtcbP8=",
+      "version": "3.7.1",
+      "resolved": "https://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-3.7.1.tgz",
+      "integrity": "sha1-EWeuoCr6A0SJhpuDaP6f7RrqfQk=",
      "dev": true,
      "requires": {
        "memory-fs": "^0.4.1",
-        "mime": "^2.4.2",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
        "range-parser": "^1.2.1",
        "webpack-log": "^2.0.0"
      }
    },
    "webpack-dev-server": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-3.8.0.tgz",
-      "integrity": "sha1-BsxPwvRAQoUI0Ol3DaH+8Q5e8o0=",
+      "version": "3.8.1",
+      "resolved": "https://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-3.8.1.tgz?cache=0&sync_timestamp=1568642918966&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-dev-server%2Fdownload%2Fwebpack-dev-server-3.8.1.tgz",
+      "integrity": "sha1-SFtkxKrcI/YB5yEUtAwbH+ox2fE=",
      "dev": true,
      "requires": {
        "ansi-html": "0.0.7",
        "bonjour": "^3.5.0",
-        "chokidar": "^2.1.6",
+        "chokidar": "^2.1.8",
        "compression": "^1.7.4",
        "connect-history-api-fallback": "^1.6.0",
        "debug": "^4.1.1",
@@ -13826,28 +13861,56 @@
        "import-local": "^2.0.0",
        "internal-ip": "^4.3.0",
        "ip": "^1.1.5",
-        "is-absolute-url": "^3.0.0",
+        "is-absolute-url": "^3.0.2",
        "killable": "^1.0.1",
-        "loglevel": "^1.6.3",
+        "loglevel": "^1.6.4",
        "opn": "^5.5.0",
        "p-retry": "^3.0.1",
-        "portfinder": "^1.0.21",
+        "portfinder": "^1.0.24",
        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.4",
+        "selfsigned": "^1.10.6",
        "semver": "^6.3.0",
        "serve-index": "^1.9.1",
        "sockjs": "0.3.19",
-        "sockjs-client": "1.3.0",
+        "sockjs-client": "1.4.0",
        "spdy": "^4.0.1",
        "strip-ansi": "^3.0.1",
        "supports-color": "^6.1.0",
        "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.7.0",
+        "webpack-dev-middleware": "^3.7.1",
        "webpack-log": "^2.0.0",
        "ws": "^6.2.1",
        "yargs": "12.0.5"
      },
      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-4.1.0.tgz",
+          "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
        "debug": {
          "version": "4.1.1",
          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.1.1.tgz",
@@ -13872,6 +13935,12 @@
            "rimraf": "^2.6.3"
          }
        },
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz",
+          "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=",
+          "dev": true
+        },
        "globby": {
          "version": "6.1.0",
          "resolved": "https://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz?cache=0&sync_timestamp=1562335642755&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobby%2Fdownload%2Fglobby-6.1.0.tgz",
@@ -13894,9 +13963,9 @@
          }
        },
        "is-absolute-url": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/is-absolute-url/download/is-absolute-url-3.0.0.tgz",
-          "integrity": "sha1-6yHWnfLtjvcqPm8kPiFlYwNqCRM=",
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/is-absolute-url/download/is-absolute-url-3.0.2.tgz?cache=0&sync_timestamp=1568347933983&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.2.tgz",
+          "integrity": "sha1-VU8pM+c4XMRulDUZd8oggRcKIG4=",
          "dev": true
        },
        "ms": {
@@ -13911,6 +13980,12 @@
          "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
          "dev": true
        },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-1.0.1.tgz",
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+          "dev": true
+        },
        "rimraf": {
          "version": "2.7.1",
          "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-2.7.1.tgz",
@@ -13925,6 +14000,89 @@
          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1565627380363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz",
          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz",
+          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
+              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "dev": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-12.0.5.tgz?cache=0&sync_timestamp=1567812307271&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-12.0.5.tgz",
+          "integrity": "sha1-BfWZe2CWR7ZPZrgeO0sQo2jnrRM=",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-11.1.1.tgz",
+          "integrity": "sha1-h5oIZZc7yp9rq1y987HGfsfTvPQ=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
        }
      }
    },
@@ -14209,114 +14367,56 @@
      "dev": true
    },
    "yargs": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-12.0.5.tgz",
-      "integrity": "sha1-BfWZe2CWR7ZPZrgeO0sQo2jnrRM=",
+      "version": "13.2.4",
+      "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-13.2.4.tgz?cache=0&sync_timestamp=1567812307271&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-13.2.4.tgz",
+      "integrity": "sha1-C1YreUAW65ZRuYvTes82SqXW3IM=",
      "dev": true,
      "requires": {
-        "cliui": "^4.0.0",
-        "decamelize": "^1.2.0",
+        "cliui": "^5.0.0",
        "find-up": "^3.0.0",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "os-locale": "^3.1.0",
        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
+        "require-main-filename": "^2.0.0",
        "set-blocking": "^2.0.0",
-        "string-width": "^2.0.0",
+        "string-width": "^3.0.0",
        "which-module": "^2.0.0",
-        "y18n": "^3.2.1 || ^4.0.0",
-        "yargs-parser": "^11.1.1"
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.0"
      },
      "dependencies": {
        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
          "dev": true
        },
        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-4.1.0.tgz",
-          "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz",
+          "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
          "dev": true,
          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz",
-          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
          }
        },
        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "version": "5.2.0",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
          "dev": true,
          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-              "dev": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            }
+            "ansi-regex": "^4.1.0"
          }
        }
      }
    },
    "yargs-parser": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-11.1.1.tgz",
-      "integrity": "sha1-h5oIZZc7yp9rq1y987HGfsfTvPQ=",
+      "version": "13.1.1",
+      "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-13.1.1.tgz",
+      "integrity": "sha1-0mBYUyqgbTZf4JH2ofwGsvfl7KA=",
      "dev": true,
      "requires": {
        "camelcase": "^5.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "lx-music-desktop",
-  "version": "0.5.3",
+  "version": "0.6.0",
  "description": "一个免费的音乐下载助手",
  "main": "./dist/electron/main.js",
  "productName": "lx-music-desktop",
@@ -149,14 +149,14 @@
    "copy-webpack-plugin": "^5.0.4",
    "core-js": "^3.2.1",
    "cos-nodejs-sdk-v5": "^2.5.12",
-    "cross-env": "^5.2.1",
+    "cross-env": "^6.0.0",
    "css-loader": "^3.2.0",
    "del": "^5.1.0",
-    "electron": "^6.0.7",
+    "electron": "^6.0.10",
    "electron-builder": "^21.2.0",
    "electron-debug": "^3.0.1",
    "electron-devtools-installer": "^2.2.4",
-    "eslint": "^6.3.0",
+    "eslint": "^6.4.0",
    "eslint-config-standard": "^14.1.0",
    "eslint-formatter-friendly": "^7.0.0",
    "eslint-loader": "^3.0.0",
@@ -170,7 +170,7 @@
    "html-webpack-plugin": "^3.2.0",
    "less": "^3.10.3",
    "less-loader": "^5.0.0",
-    "markdown-it": "^9.1.0",
+    "markdown-it": "^10.0.0",
    "mini-css-extract-plugin": "^0.8.0",
    "multispinner": "^0.2.1",
    "optimize-css-assets-webpack-plugin": "^5.0.3",
@@ -182,27 +182,27 @@
    "rimraf": "^3.0.0",
    "stylus": "^0.54.7",
    "stylus-loader": "^3.0.2",
-    "terser-webpack-plugin": "^2.0.1",
+    "terser-webpack-plugin": "^2.1.0",
    "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.3",
-    "webpack-cli": "^3.3.8",
-    "webpack-dev-server": "^3.8.0",
+    "webpack": "^4.40.2",
+    "webpack-cli": "^3.3.9",
+    "webpack-dev-server": "^3.8.1",
    "webpack-hot-middleware": "^2.25.0",
    "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-log": "^3.0.8",
+    "electron-store": "^5.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.11",
+    "node-downloader-helper": "^1.0.10",
    "node-id3": "^0.1.11",
    "request": "^2.88.0",
    "vue": "^2.6.10",
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,7 +1,13 @@
+### 新增
+
+- 新增音乐**聚合搜索**，目前支持酷我、酷狗、百度源搜索
+- 新增代理功能
+
 ### 优化

- 更新所有依赖包到最新
+- 优化从《梦里嫦娥》皮肤切换到其他皮肤时侧栏动画的切换效果

 ### 修复

- 修复试听酷狗源的音乐仍然获取320k音质导致获取失败的Bug
+- 修复试听列表没有歌曲时会显示列表加载中的Bug
+- 修复切换歌单列表详情时的UI Bug
--- a/publish/version.json
+++ b/publish/version.json
@@ -1,7 +1,19 @@
 {
-  "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",
+  "version": "0.6.0",
+  "desc": "<h3>新增</h3>\n<ul>\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>修复试听列表没有歌曲时会显示列表加载中的Bug</li>\n<li>修复切换歌单列表详情时的UI Bug</li>\n</ul>\n",
  "history": [
+    {
+      "version": "0.5.5",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>月是故乡明，祝大家中秋快乐🥮~~新增个性皮肤**《月里嫦娥》**，时间仓促，皮肤还不是很完善，可以试试喜不喜欢~😉</li>\n<li>新增 MAC 版本退出快捷键支持</li>\n<li>新增点击播放器中的歌曲标题可以复制标题的功能（遇到好听的歌曲方便分享）</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复 MAC 系统下软件关闭时再次从 dock 打开时报错的Bug</li>\n<li>修复下载的歌曲文件名中包含命名规则不允许的符号时下载失败的问题（若歌曲名包含这些符号会自动将其移除）</li>\n<li>修复 MAC 版本不能复制粘贴的问题</li>\n</ul>\n"
+    },
+    {
+      "version": "0.5.4",
+      "desc": "<h3>移除</h3>\n<ul>\n<li>下载的FLAC文件在修改歌曲信息后，软件无法播放，但使用本地播放器可以播放</li>\n<li>为了稳妥起见，暂时移除FLAC格式的meta信息修改</li>\n<li>MP3格式无此问题</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"
+    },
    {
      "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"
--- a/src/main/events/progressBar.js
+++ b/src/main/events/progressBar.js
@@ -1,11 +1,10 @@
 const { mainOn } = require('../../common/icp')

-module.exports = win => {
-  mainOn('progress', (event, params) => {
-    // console.log(params)
-    win.setProgressBar(params.status, {
-      mode: params.mode || 'normal',
-    })
-  })
-}
+
+mainOn('progress', (event, params) => {
+  // console.log(params)
+  global.mainWindow && global.mainWindow.setProgressBar(params.status, {
+    mode: params.mode || 'normal',
+  })
+})

--- a/src/main/events/trafficLight.js
+++ b/src/main/events/trafficLight.js
@@ -1,23 +1,22 @@
 // const { app } = require('electron')
 const { mainOn } = require('../../common/icp')

-module.exports = win => {
-  mainOn('min', event => {
-    if (win) {
-      win.minimize()
-    }
-  })
-  // mainOn('max', event => {
-  //   if (win) {
-  //     win.maximize()
-  //   }
-  // })
-  mainOn('close', event => {
-    if (win) {
-      // window.destroy()
-      // console.log('close')
-      // app.quit()
-      win.close()
-    }
-  })
-}
+
+mainOn('min', event => {
+  if (global.mainWindow) {
+    global.mainWindow.minimize()
+  }
+})
+// mainOn('max', event => {
+//   if (global.mainWindow) {
+//     global.mainWindow.maximize()
+//   }
+// })
+mainOn('close', event => {
+  if (global.mainWindow) {
+    // global.mainWindowdow.destroy()
+    // console.log('close')
+    // app.quit()
+    global.mainWindow.close()
+  }
+})
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -16,8 +16,8 @@ app.on('second-instance', (event, argv, cwd) => {
 })

 require('./events')
-const progressBar = require('./events/progressBar')
-const trafficLight = require('./events/trafficLight')
+require('./events/progressBar')
+require('./events/trafficLight')
 const autoUpdate = require('./utils/autoUpdate')
 const { isLinux, isMac } = require('../common/utils')

@@ -30,6 +30,7 @@ const isDev = process.env.NODE_ENV !== 'production'

 let mainWindow
 let winURL
+let isFirstCheckedUpdate = true

 if (isDev) {
  global.__static = path.join(__dirname, '../static')
@@ -43,7 +44,7 @@ function createWindow() {
  /**
   * Initial window options
   */
-  mainWindow = new BrowserWindow({
+  mainWindow = global.mainWindow = new BrowserWindow({
    height: 590,
    useContentSize: true,
    width: 920,
@@ -62,27 +63,54 @@ function createWindow() {

  mainWindow.loadURL(winURL)

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

  // mainWindow.webContents.openDevTools()

-  trafficLight(mainWindow)
-  progressBar(mainWindow)
-  if (!isDev) autoUpdate(mainWindow)
+  if (!isDev) {
+    autoUpdate(isFirstCheckedUpdate)
+    isFirstCheckedUpdate = false
+  }
 }

 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() }],
+      submenu: [
+        { label: '关于洛雪音乐', role: 'about' },
+        { type: 'separator' },
+        { label: '隐藏', role: 'hide' },
+        { label: '显示其他', role: 'hideothers' },
+        { label: '显示全部', role: 'unhide' },
+        { type: 'separator' },
+        { label: '退出', accelerator: 'Command+Q', click: () => app.quit() },
+      ],
    },
    {
      label: '窗口',
      role: 'window',
-      submenu: [{ label: '最小化', role: 'minimize' }, { label: '关闭', role: 'close' }],
+      submenu: [
+        { label: '最小化', role: 'minimize' },
+        { label: '关闭', role: 'close' },
+      ],
+    },
+    {
+      label: '编辑',
+      submenu: [
+        { label: '撤销', accelerator: 'CmdOrCtrl+Z', role: 'undo' },
+        { label: '恢复', accelerator: 'Shift+CmdOrCtrl+Z', role: 'redo' },
+        { type: 'separator' },
+        { label: '剪切', accelerator: 'CmdOrCtrl+X', role: 'cut' },
+        { label: '复制', accelerator: 'CmdOrCtrl+C', role: 'copy' },
+        { label: '粘贴', accelerator: 'CmdOrCtrl+V', role: 'paste' },
+        { label: '选择全部', accelerator: 'CmdOrCtrl+A', role: 'selectAll' },
+      ],
    },
  ]

--- a/src/main/utils/autoUpdate.js
+++ b/src/main/utils/autoUpdate.js
@@ -21,7 +21,7 @@ log.info('App starting...')

 function sendStatusToWindow(text) {
  log.info(text)
-  // win.webContents.send('message', text)
+  // global.mainWindow.webContents.send('message', text)
 }


@@ -56,35 +56,50 @@ function sendStatusToWindow(text) {

 // })

+let waitEvent = []
+const handleSendEvent = action => {
+  if (global.mainWindow) {
+    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还没启动完成
+      global.mainWindow.webContents.send(action.type, action.info)
+    }, 2000)
+  } else {
+    waitEvent.push(action)
+  }
+}

-module.exports = win => {
+module.exports = isFirstCheckedUpdate => {
+  if (!isFirstCheckedUpdate) {
+    if (waitEvent.length) {
+      waitEvent.forEach((event, index) => {
+        setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还没启动完成
+          global.mainWindow.webContents.send(event.type, event.info)
+        }, 2000 * (index + 1))
+      })
+      waitEvent = []
+    }
+    return
+  }
  autoUpdater.on('checking-for-update', () => {
    sendStatusToWindow('Checking for update...')
  })
  autoUpdater.on('update-available', info => {
    sendStatusToWindow('Update available.')
-    win.webContents.send('update-available', info)
+    handleSendEvent({ type: 'update-available', info })
  })
  autoUpdater.on('update-not-available', info => {
    sendStatusToWindow('Update not available.')
-    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
-      win.webContents.send('update-not-available')
-    }, 5000)
+    handleSendEvent({ type: 'update-not-available' })
  })
  autoUpdater.on('error', () => {
    sendStatusToWindow('Error in auto-updater.')
-    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
-      win.webContents.send('update-error')
-    }, 6000)
+    handleSendEvent({ type: 'update-error' })
  })
  autoUpdater.on('download-progress', progressObj => {
    sendStatusToWindow('Download progress...')
  })
  autoUpdater.on('update-downloaded', info => {
    sendStatusToWindow('Update downloaded.')
-    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
-      win.webContents.send('update-downloaded')
-    }, 2000)
+    handleSendEvent({ type: 'update-downloaded' })
  })
  mainOn('quit-update', () => {
    setTimeout(() => {
--- a/src/main/utils/mp3Meta.js
+++ b/src/main/utils/mp3Meta.js
@@ -6,7 +6,7 @@ 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')}`)
+  let picPath = filePath.replace(/\.mp3$/, '') + path.extname(meta.APIC).replace(extReg, '$1')
  request(meta.APIC).pipe(fs.createWriteStream(picPath)).on('finish', () => {
    meta.APIC = picPath
    NodeID3.write(meta, filePath)
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -35,7 +35,10 @@ export default {
      isProd: process.env.NODE_ENV === 'production',
      isLinux,
      globalObj: {
-        apiSource: 'messoer',
+        apiSource: 'test',
+        proxy: {
+
+        },
      },
      updateTimeout: null,
    }
@@ -107,6 +110,7 @@ export default {
      })
      rendererOn('update-downloaded', () => {
        this.clearUpdateTimeout()
+        this.setVersionModalVisible({ isError: false })
        this.showUpdateModal()
      })
      rendererOn('update-not-available', () => {
@@ -128,6 +132,7 @@ export default {

      this.initData()
      this.globalObj.apiSource = this.setting.apiSource
+      this.globalObj.proxy = Object.assign({}, this.setting.network.proxy)
      window.globalObj = this.globalObj
    },
    enableIgnoreMouseEvents() {
@@ -224,6 +229,10 @@ body {
  display: flex;
  height: 100%;
  overflow: hidden;
+  background: @color-theme-bgimg center center no-repeat;
+  background-size: auto 100%;
+  transition: background-color @transition-theme;
+  background-color: @color-theme;
 }

 #left {
@@ -234,6 +243,8 @@ body {
  flex: auto;
  display: flex;
  flex-flow: column nowrap;
+  transition: background-color @transition-theme;
+  background-color: @color-theme_2;
 }
 #toolbar, #player {
  flex: none;
@@ -242,5 +253,15 @@ body {
  flex: auto;
  height: 0;
 }
+
+each(@themes, {
+  #container.@{value} {
+    background-color: ~'@{color-@{value}-theme}';
+    background-image: ~'@{color-@{value}-theme-bgimg}';
+    #right {
+      background-color: ~'@{color-@{value}-theme_2}';
+    }
+  }
+})
 </style>

--- a/src/renderer/assets/images/jqbg.jpg
+++ b/src/renderer/assets/images/jqbg.jpg
--- a/src/renderer/assets/styles/index.less
+++ b/src/renderer/assets/styles/index.less
@@ -36,11 +36,11 @@ table {
  }
  tbody {
    tr {
-      border-top: 1px solid #e0e0e0;
+      border-top: 1px solid @color-theme_2-line;
      // border-top: 1px solid rgba(0, 0, 0, 0.12);
      transition: background-color 0.2s ease;
      &:hover {
-        background-color: #eee;
+        background-color: @color-theme_2-hover;
      }
      &:first-child {
        border-top: none;
@@ -172,5 +172,15 @@ each(@themes, {
        background-color: ~'@{color-@{value}-scrollbar-thumb-hover}';
      }
    }
+    table {
+      tbody {
+        tr {
+          border-top-color: ~'@{color-@{value}-theme_2-line}';
+          &:hover {
+            background-color: ~'@{color-@{value}-theme_2-hover}';
+          }
+        }
+      }
+    }
  }
 })
--- a/src/renderer/assets/styles/variables.less
+++ b/src/renderer/assets/styles/variables.less
@@ -1,21 +1,25 @@
@import './colors.less';

-@themes: green, yellow, blue, red, purple, orange, grey;
+@themes: green, yellow, blue, red, purple, orange, grey, midAutumn;


 // Colors
 // @color-theme: #03a678;
@color-theme: #4daf7c;
+@color-theme-bgimg: none;
@color-theme-hover: fadeout(lighten(@color-theme, 10%), 30%);
@color-theme-active: fadeout(darken(@color-theme, 20%), 60%);
@color-theme-font: #fff;
@color-theme-font-label: lighten(@color-theme, 35%);

-@color-theme_2: #fff;
+@color-theme_2: rgba(255, 255, 255, .9);
+@color-theme_2-background_2: #fff;
@color-theme_2-hover: fadeout(lighten(@color-theme, 10%), 70%);
@color-theme_2-active: fadeout(darken(@color-theme, 5%), 70%);
@color-theme_2-font: darken(@color-theme_2, 70%);
-@color-theme_2-font-label: lighten(@color-theme, 40%);
+@color-theme_2-font-label: fadeout(@color-theme_2-font, 50%);
+@color-theme_2-line: lighten(@color-theme, 35%);
+@color-theme-sidebar: @color-theme;
@color-btn: fadeout(darken(@color-theme, 5%), 15%);
@color-btn-background: fadeout(lighten(@color-theme, 35%), 70%);

@@ -41,6 +45,7 @@
@color-player-status-text: lighten(@color-theme_2-font, 10%);

@color-tab-btn-background: fadeout(lighten(@color-theme, 10%), 80%);
+@color-tab-btn-background-hover: @color-theme_2-hover;
@color-tab-border-top: fadeout(lighten(@color-theme, 5%), 50%);
@color-tab-border-bottom: lighten(@color-theme, 5%);

@@ -50,15 +55,19 @@


@color-green-theme: #4daf7c;
+@color-green-theme-bgimg: none;
@color-green-theme-hover: fadeout(lighten(@color-green-theme, 10%), 30%);
@color-green-theme-active: fadeout(darken(@color-green-theme, 20%), 60%);
@color-green-theme-font: #fff;
@color-green-theme-font-label: lighten(@color-green-theme, 35%);
@color-green-theme_2: #fff;
+@color-green-theme_2-background_2: #fff;
@color-green-theme_2-hover: fadeout(lighten(@color-green-theme, 10%), 70%);
@color-green-theme_2-active: fadeout(darken(@color-green-theme, 5%), 70%);
@color-green-theme_2-font: darken(@color-green-theme_2, 70%);
-@color-green-theme_2-font-label: lighten(@color-green-theme, 40%);
+@color-green-theme_2-font-label: fadeout(@color-green-theme_2-font, 50%);
+@color-green-theme_2-line: lighten(@color-green-theme, 35%);
+@color-green-theme-sidebar: @color-green-theme;
@color-green-btn: fadeout(darken(@color-green-theme, 5%), 15%);
@color-green-btn-background: fadeout(lighten(@color-green-theme, 35%), 70%);
@color-green-pagination-background: fadeout(lighten(@color-green-theme, 45%), 30%);
@@ -77,20 +86,25 @@
@color-green-player-progress-bar2: lighten(@color-green-theme, 12%);
@color-green-player-status-text: lighten(@color-green-theme_2-font, 10%);
@color-green-tab-btn-background: fadeout(lighten(@color-green-theme, 10%), 80%);
+@color-green-tab-btn-background-hover: @color-green-theme_2-hover;
@color-green-tab-border-top: fadeout(lighten(@color-green-theme, 5%), 50%);
@color-green-tab-border-bottom: lighten(@color-green-theme, 5%);


@color-yellow-theme: #f2d35b;
+@color-yellow-theme-bgimg: none;
@color-yellow-theme-hover: fadeout(lighten(@color-yellow-theme, 10%), 30%);
@color-yellow-theme-active: fadeout(darken(@color-yellow-theme, 20%), 60%);
@color-yellow-theme-font: #fff;
@color-yellow-theme-font-label: lighten(@color-yellow-theme, 35%);
@color-yellow-theme_2: #fff;
+@color-yellow-theme_2-background_2: #fff;
@color-yellow-theme_2-hover: fadeout(lighten(@color-yellow-theme, 10%), 70%);
@color-yellow-theme_2-active: fadeout(darken(@color-yellow-theme, 5%), 70%);
@color-yellow-theme_2-font: darken(@color-yellow-theme_2, 70%);
-@color-yellow-theme_2-font-label: lighten(@color-yellow-theme, 40%);
+@color-yellow-theme_2-font-label: fadeout(@color-yellow-theme_2-font, 50%);
+@color-yellow-theme_2-line: lighten(@color-yellow-theme, 35%);
+@color-yellow-theme-sidebar: @color-yellow-theme;
@color-yellow-btn: fadeout(darken(@color-yellow-theme, 5%), 15%);
@color-yellow-btn-background: fadeout(lighten(@color-yellow-theme, 25%), 70%);
@color-yellow-pagination-background: fadeout(lighten(@color-yellow-theme, 30%), 30%);
@@ -109,19 +123,24 @@
@color-yellow-player-progress-bar2: lighten(@color-yellow-theme, 12%);
@color-yellow-player-status-text: lighten(@color-yellow-theme_2-font, 10%);
@color-yellow-tab-btn-background: fadeout(lighten(@color-yellow-theme, 10%), 80%);
+@color-yellow-tab-btn-background-hover: @color-yellow-theme_2-hover;
@color-yellow-tab-border-top: fadeout(lighten(@color-yellow-theme, 5%), 50%);
@color-yellow-tab-border-bottom: lighten(@color-yellow-theme, 5%);

@color-orange-theme: #f5ab35;
+@color-orange-theme-bgimg: none;
@color-orange-theme-hover: fadeout(lighten(@color-orange-theme, 10%), 30%);
@color-orange-theme-active: fadeout(darken(@color-orange-theme, 20%), 60%);
@color-orange-theme-font: #fff;
@color-orange-theme-font-label: lighten(@color-orange-theme, 35%);
@color-orange-theme_2: #fff;
+@color-orange-theme_2-background_2: #fff;
@color-orange-theme_2-hover: fadeout(lighten(@color-orange-theme, 10%), 70%);
@color-orange-theme_2-active: fadeout(darken(@color-orange-theme, 5%), 70%);
@color-orange-theme_2-font: darken(@color-orange-theme_2, 70%);
-@color-orange-theme_2-font-label: lighten(@color-orange-theme, 40%);
+@color-orange-theme_2-font-label: fadeout(@color-orange-theme_2-font, 50%);
+@color-orange-theme_2-line: lighten(@color-orange-theme, 35%);
+@color-orange-theme-sidebar: @color-orange-theme;
@color-orange-btn: fadeout(darken(@color-orange-theme, 5%), 15%);
@color-orange-btn-background: fadeout(lighten(@color-orange-theme, 35%), 70%);
@color-orange-pagination-background: fadeout(lighten(@color-orange-theme, 35%), 30%);
@@ -140,19 +159,24 @@
@color-orange-player-progress-bar2: lighten(@color-orange-theme, 12%);
@color-orange-player-status-text: lighten(@color-orange-theme_2-font, 10%);
@color-orange-tab-btn-background: fadeout(lighten(@color-orange-theme, 10%), 80%);
+@color-orange-tab-btn-background-hover: @color-orange-theme_2-hover;
@color-orange-tab-border-top: fadeout(lighten(@color-orange-theme, 5%), 50%);
@color-orange-tab-border-bottom: lighten(@color-orange-theme, 5%);

@color-blue-theme: #3498db;
+@color-blue-theme-bgimg: none;
@color-blue-theme-hover: fadeout(lighten(@color-blue-theme, 10%), 30%);
@color-blue-theme-active: fadeout(darken(@color-blue-theme, 20%), 60%);
@color-blue-theme-font: #fff;
@color-blue-theme-font-label: lighten(@color-blue-theme, 35%);
@color-blue-theme_2: #fff;
+@color-blue-theme_2-background_2: #fff;
@color-blue-theme_2-hover: fadeout(lighten(@color-blue-theme, 10%), 70%);
@color-blue-theme_2-active: fadeout(darken(@color-blue-theme, 5%), 70%);
@color-blue-theme_2-font: darken(@color-blue-theme_2, 70%);
-@color-blue-theme_2-font-label: lighten(@color-blue-theme, 40%);
+@color-blue-theme_2-font-label: fadeout(@color-blue-theme_2-font, 50%);
+@color-blue-theme_2-line: lighten(@color-blue-theme, 35%);
+@color-blue-theme-sidebar: @color-blue-theme;
@color-blue-btn: fadeout(darken(@color-blue-theme, 5%), 15%);
@color-blue-btn-background: fadeout(lighten(@color-blue-theme, 35%), 70%);
@color-blue-pagination-background: fadeout(lighten(@color-blue-theme, 40%), 30%);
@@ -171,10 +195,12 @@
@color-blue-player-progress-bar2: lighten(@color-blue-theme, 12%);
@color-blue-player-status-text: lighten(@color-blue-theme_2-font, 10%);
@color-blue-tab-btn-background: fadeout(lighten(@color-blue-theme, 10%), 80%);
+@color-blue-tab-btn-background-hover: @color-blue-theme_2-hover;
@color-blue-tab-border-top: fadeout(lighten(@color-blue-theme, 5%), 50%);
@color-blue-tab-border-bottom: lighten(@color-blue-theme, 5%);

@color-red-theme: #d64541;
+@color-red-theme-bgimg: none;
@color-red-theme-hover: fadeout(lighten(@color-red-theme, 10%), 30%);
@color-red-theme-active: fadeout(darken(@color-red-theme, 20%), 60%);
@color-red-theme-font: #fff;
@@ -182,8 +208,11 @@
@color-red-theme_2: #fff;
@color-red-theme_2-hover: fadeout(lighten(@color-red-theme, 10%), 70%);
@color-red-theme_2-active: fadeout(darken(@color-red-theme, 5%), 70%);
+@color-red-theme_2-background_2: #fff;
@color-red-theme_2-font: darken(@color-red-theme_2, 70%);
-@color-red-theme_2-font-label: lighten(@color-red-theme, 40%);
+@color-red-theme_2-font-label: fadeout(@color-red-theme_2-font, 50%);
+@color-red-theme_2-line: lighten(@color-red-theme, 35%);
+@color-red-theme-sidebar: @color-red-theme;
@color-red-btn: fadeout(darken(@color-red-theme, 5%), 15%);
@color-red-btn-background: fadeout(lighten(@color-red-theme, 35%), 70%);
@color-red-pagination-background: fadeout(lighten(@color-red-theme, 40%), 30%);
@@ -204,19 +233,24 @@
@color-red-tab-border-top: fadeout(lighten(@color-red-theme, 25%), 70%);
@color-red-tab-border-bottom: lighten(@color-red-theme, 35%);
@color-red-tab-btn-background: fadeout(lighten(@color-red-theme, 10%), 80%);
+@color-red-tab-btn-background-hover: @color-red-theme_2-hover;
@color-red-tab-border-top: fadeout(lighten(@color-red-theme, 5%), 50%);
@color-red-tab-border-bottom: lighten(@color-red-theme, 5%);

@color-purple-theme: #9b59b6;
+@color-purple-theme-bgimg: none;
@color-purple-theme-hover: fadeout(lighten(@color-purple-theme, 10%), 30%);
@color-purple-theme-active: fadeout(darken(@color-purple-theme, 20%), 60%);
@color-purple-theme-font: #fff;
@color-purple-theme-font-label: lighten(@color-purple-theme, 35%);
@color-purple-theme_2: #fff;
+@color-purple-theme_2-background_2: #fff;
@color-purple-theme_2-hover: fadeout(lighten(@color-purple-theme, 10%), 70%);
@color-purple-theme_2-active: fadeout(darken(@color-purple-theme, 5%), 70%);
@color-purple-theme_2-font: darken(@color-purple-theme_2, 70%);
-@color-purple-theme_2-font-label: lighten(@color-purple-theme, 40%);
+@color-purple-theme_2-font-label: fadeout(@color-purple-theme_2-font, 50%);
+@color-purple-theme_2-line: lighten(@color-purple-theme, 35%);
+@color-purple-theme-sidebar: @color-purple-theme;
@color-purple-btn: fadeout(darken(@color-purple-theme, 5%), 15%);
@color-purple-btn-background: fadeout(lighten(@color-purple-theme, 35%), 70%);
@color-purple-pagination-background: fadeout(lighten(@color-purple-theme, 40%), 30%);
@@ -235,19 +269,24 @@
@color-purple-player-progress-bar2: lighten(@color-purple-theme, 12%);
@color-purple-player-status-text: lighten(@color-purple-theme_2-font, 10%);
@color-purple-tab-btn-background: fadeout(lighten(@color-purple-theme, 10%), 80%);
+@color-purple-tab-btn-background-hover: @color-purple-theme_2-hover;
@color-purple-tab-border-top: fadeout(lighten(@color-purple-theme, 5%), 50%);
@color-purple-tab-border-bottom: lighten(@color-purple-theme, 5%);

@color-grey-theme: #6c7a89;
+@color-grey-theme-bgimg: none;
@color-grey-theme-hover: fadeout(lighten(@color-grey-theme, 10%), 30%);
@color-grey-theme-active: fadeout(darken(@color-grey-theme, 20%), 60%);
@color-grey-theme-font: #fff;
@color-grey-theme-font-label: lighten(@color-grey-theme, 35%);
@color-grey-theme_2: #fff;
+@color-grey-theme_2-background_2: #fff;
@color-grey-theme_2-hover: fadeout(lighten(@color-grey-theme, 10%), 70%);
@color-grey-theme_2-active: fadeout(darken(@color-grey-theme, 5%), 70%);
@color-grey-theme_2-font: darken(@color-grey-theme_2, 70%);
-@color-grey-theme_2-font-label: lighten(@color-grey-theme, 40%);
+@color-grey-theme_2-font-label: fadeout(@color-grey-theme_2-font, 50%);
+@color-grey-theme_2-line: lighten(@color-grey-theme, 35%);
+@color-grey-theme-sidebar: @color-grey-theme;
@color-grey-btn: fadeout(darken(@color-grey-theme, 5%), 15%);
@color-grey-btn-background: fadeout(lighten(@color-grey-theme, 35%), 70%);
@color-grey-pagination-background: fadeout(lighten(@color-grey-theme, 45%), 30%);
@@ -266,9 +305,46 @@
@color-grey-player-progress-bar2: lighten(@color-grey-theme, 12%);
@color-grey-player-status-text: lighten(@color-grey-theme_2-font, 10%);
@color-grey-tab-btn-background: fadeout(lighten(@color-grey-theme, 10%), 80%);
+@color-grey-tab-btn-background-hover: @color-grey-theme_2-hover;
@color-grey-tab-border-top: fadeout(lighten(@color-grey-theme, 5%), 50%);
@color-grey-tab-border-bottom: lighten(@color-grey-theme, 5%);

+@color-midAutumn-theme: rgba(74, 55, 82, 1);
+@color-midAutumn-theme-bgimg: url(../images/jqbg.jpg);
+@color-midAutumn-theme-hover: fadeout(lighten(@color-midAutumn-theme, 10%), 30%);
+@color-midAutumn-theme-active: fadeout(lighten(@color-midAutumn-theme, 15%), 60%);
+@color-midAutumn-theme-font: rgba(246, 233, 255, 0.9);
+@color-midAutumn-theme-font-label: fadeout(lighten(@color-midAutumn-theme, 20%), 20%);
+@color-midAutumn-theme_2: rgba(255, 255, 255, .93);
+@color-midAutumn-theme_2-background_2: #eeedef;
+@color-midAutumn-theme_2-hover: fadeout(lighten(@color-midAutumn-theme, 10%), 65%);
+@color-midAutumn-theme_2-active: fadeout(darken(@color-midAutumn-theme, 5%), 70%);
+@color-midAutumn-theme_2-font: darken(@color-midAutumn-theme_2, 70%);
+@color-midAutumn-theme_2-font-label: lighten(@color-midAutumn-theme, 40%);
+@color-midAutumn-theme_2-line: lighten(@color-midAutumn-theme, 54%);
+@color-midAutumn-theme-sidebar: rgba(255, 255, 255, 0);
+@color-midAutumn-btn: fadeout(darken(@color-midAutumn-theme, 5%), 15%);
+@color-midAutumn-btn-background: fadeout(lighten(@color-midAutumn-theme, 35%), 70%);
+@color-midAutumn-pagination-background: fadeout(lighten(@color-midAutumn-theme, 45%), 50%);
+@color-midAutumn-pagination-hover: fadeout(lighten(@color-midAutumn-theme, 10%), 70%);
+@color-midAutumn-pagination-active: fadeout(darken(@color-midAutumn-theme, 10%), 70%);
+@color-midAutumn-pagination-select: fadeout(lighten(@color-midAutumn-theme, 10%), 55%);
+@color-midAutumn-search-form-background: fadeout(lighten(@color-midAutumn-theme, 50%), 10%);
+@color-midAutumn-search-list-hover: fadeout(darken(@color-midAutumn-theme, 10%), 70%);
+@color-midAutumn-scrollbar-track: fadeout(@color-midAutumn-theme, 80%);
+@color-midAutumn-scrollbar-thumb: fadeout(@color-midAutumn-theme, 60%);
+@color-midAutumn-scrollbar-thumb-hover: fadeout(@color-midAutumn-theme, 40%);
+@color-midAutumn-player-pic-c1: fadeout(@color-midAutumn-theme_2, 50%);
+@color-midAutumn-player-pic-c2: darken(@color-midAutumn-theme_2, 30%);
+@color-midAutumn-player-progress: darken(@color-midAutumn-theme_2, 6%);
+@color-midAutumn-player-progress-bar1: darken(@color-midAutumn-theme_2, 12%);
+@color-midAutumn-player-progress-bar2: lighten(@color-midAutumn-theme, 12%);
+@color-midAutumn-player-status-text: lighten(@color-midAutumn-theme_2-font, 10%);
+@color-midAutumn-tab-btn-background: fadeout(lighten(@color-midAutumn-theme, 10%), 80%);
+@color-midAutumn-tab-btn-background-hover: @color-midAutumn-theme_2-hover;
+@color-midAutumn-tab-border-top: fadeout(lighten(@color-midAutumn-theme, 5%), 50%);
+@color-midAutumn-tab-border-bottom: lighten(@color-midAutumn-theme, 5%);
+

 // Width
@width-app-left: 180px;
--- a/src/renderer/components/core/Aside.vue
+++ b/src/renderer/components/core/Aside.vue
@@ -57,7 +57,7 @@ export default {
  // box-shadow: 0 0 5px rgba(0, 0, 0, .3);
  transition: @transition-theme;
  transition-property: background-color;
-  background-color: @color-theme;
+  background-color: @color-theme-sidebar;
  // background-color: @color-aside-background;
  // border-right: 2px solid @color-theme;
  -webkit-app-region: drag;
@@ -122,7 +122,7 @@ export default {
 each(@themes, {
  :global(#container.@{value}) {
    .aside {
-      background-color: ~'@{color-@{value}-theme}';
+      background-color: ~'@{color-@{value}-theme-sidebar}';
    }
    .logo {
      color: ~'@{color-@{value}-theme-font}';
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -7,7 +7,7 @@ div(:class="$style.player")
  div(:class="$style.right")
    div(:class="$style.column1")
      div(:class="$style.container")
-        div(:class="$style.title") {{title}}
+        div(:class="$style.title" @click="handleCopy(title)" :title="title + '（点击复制）'") {{title}}
        div(:class="$style.volumeContent")
          div(:class="$style.volume" @click.stop='handleChangeVolume' :title="`当前音量：${volumeStr}%`")
            div(:class="$style.volumeBar" :style="{ width: volumeStr + '%' }")
@@ -48,7 +48,7 @@ div(:class="$style.player")
 <script>
 import Lyric from 'lrc-file-parser'
 import { rendererSend } from '../../../common/icp'
-import { formatPlayTime2, getRandom, checkPath, setTitle } from '../../utils'
+import { formatPlayTime2, getRandom, checkPath, setTitle, clipboardWriteText } from '../../utils'
 import { mapGetters, mapActions, mapMutations } from 'vuex'
 import { requestMsg } from '../../utils/message'

@@ -195,7 +195,7 @@ export default {
        if (!this.musicInfo.songmid) return
        console.log('出错')
        this.stopPlay()
-        if (this.audio.error.code !== 1 && this.retryNum < 3) { // 若音频URL无效则尝试刷新3次URL
+        if (this.listId != 'download' && this.audio.error.code !== 1 && this.retryNum < 3) { // 若音频URL无效则尝试刷新3次URL
          // console.log(this.retryNum)
          this.audioErrorTime = this.audio.currentTime // 记录出错的播放时间
          this.retryNum++
@@ -263,6 +263,7 @@ export default {
      this.audioErrorTime = 0

      if (this.listId == 'download') {
+        console.log(targetSong.filePath)
        if (!checkPath(targetSong.filePath) || !targetSong.isComplate || /\.ape$/.test(targetSong.filePath)) {
          return this.list.length == 1 ? null : this.handleNext()
        }
@@ -455,6 +456,9 @@ export default {
    handleSaveVolume(volume) {
      this.setVolume(volume)
    },
+    handleCopy(text) {
+      clipboardWriteText(text)
+    },
  },
 }
 </script>
@@ -467,8 +471,7 @@ export default {
  height: @height-player;
  // background-color: rgb(245, 245, 245);
  transition: @transition-theme;
-  transition-property: background-color, border-color;
-  background-color: @color-theme_2;
+  transition-property: border-color;
  border-top: 2px solid @color-theme;
  box-sizing: border-box;
  display: flex;
@@ -492,7 +495,7 @@ export default {
    max-height: 100%;
    transition: @transition-theme;
    transition-property: border-color;
-    border: 2px solid @color-theme_2;
+    border: 2px solid @color-theme_2-background_2;
  }
 }
 .right {
@@ -665,13 +668,12 @@ export default {
 each(@themes, {
  :global(#container.@{value}) {
    .player {
-      background-color: ~'@{color-@{value}-theme_2}';
      border-top-color: ~'@{color-@{value}-theme}';
    }
    .left {
      color: ~'@{color-@{value}-theme}';
      img {
-        border-color: ~'@{color-@{value}-theme_2}';
+        border-color: ~'@{color-@{value}-theme_2-background_2}';
      }
    }
    .play-btn {
--- a/src/renderer/components/core/Toolbar.vue
+++ b/src/renderer/components/core/Toolbar.vue
@@ -48,7 +48,6 @@ export default {
  display: flex;
  height: @height-toolbar;
  justify-content: flex-end;
-  background-color: @color-theme_2;
  align-items: center;
  padding-left: 15px;
  -webkit-app-region: drag;
@@ -58,13 +57,6 @@ export default {
 .input {
  -webkit-app-region: no-drag;
 }
-each(@themes, {
-  :global(#container.@{value}) {
-    .toolbar {
-      background-color: ~'@{color-@{value}-theme_2}';
-    }
-  }
-})

 // img {
 //   flex: none;
--- a/src/renderer/components/core/View.vue
+++ b/src/renderer/components/core/View.vue
@@ -13,7 +13,6 @@ div(:class="$style.view")

 .view {
  position: relative;
-  background-color: @color-theme_2;
  > * {
    position: absolute;
    width: 100%;
@@ -22,12 +21,4 @@ div(:class="$style.view")
  // overflow: hidden;
 }

-each(@themes, {
-  :global(#container.@{value}) {
-    .view {
-      background-color: ~'@{color-@{value}-theme_2}';
-    }
-  }
-})
-
 </style>
--- a/src/renderer/components/material/Checkbox.vue
+++ b/src/renderer/components/material/Checkbox.vue
@@ -156,7 +156,7 @@ export default {
      bottom: 0;
      left: 0;
      right: 0;
-      border: 1px solid #ccc;
+      border: 1px solid @color-theme_2-font-label;
      transition: border-color 0.2s ease;
      border-radius: 15%;
    }
@@ -196,7 +196,7 @@ each(@themes, {
        color: ~'@{color-@{value}-theme}';
        // border: 1px solid #ccc;
        &:after {
-          border-color: #ccc;
+          border-color: ~'@{color-@{value}-theme_2-font-label}';
        }
      }
    }
--- a/src/renderer/components/material/Input.vue
+++ b/src/renderer/components/material/Input.vue
@@ -0,0 +1,90 @@
+<template lang="pug">
+  input(:class="$style.input" :type="type" :placeholder="placeholder" v-model.trim="text" :disabled="disabled"
+    @focus="$emit('focus', $event)" @blur="$emit('blur', $event)" @input="$emit('input', text)" @change="$emit('change', text)"
+    @keyup.enter="submit")
+</template>
+
+<script>
+export default {
+  props: {
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    value: {
+      type: String,
+      default: '',
+    },
+    type: {
+      type: String,
+      default: 'text',
+    },
+  },
+  data() {
+    return {
+      text: '',
+    }
+  },
+  watch: {
+    value(n) {
+      this.text = n
+    },
+  },
+  methods: {
+    handleInput() {
+
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+
+.input {
+  display: inline-block;
+  border: none;
+  border-radius: 3px;
+  padding: 7px 8px;
+  color: @color-btn;
+  outline: none;
+  transition: background-color 0.2s ease;
+  background-color: @color-btn-background;
+  &[disabled] {
+    opacity: .4;
+  }
+
+  &:hover, &:focus {
+    background-color: @color-theme_2-hover;
+  }
+  &:active {
+    background-color: @color-theme_2-active;
+  }
+}
+
+.min {
+  padding: 3px 8px;
+  font-size: 12px;
+}
+
+each(@themes, {
+  :global(#container.@{value}) {
+    .input {
+      color: ~'@{color-@{value}-btn}';
+      background-color: ~'@{color-@{value}-btn-background}';
+      &:hover, &:focus {
+        background-color: ~'@{color-@{value}-theme_2-hover}';
+      }
+      &:active {
+        background-color: ~'@{color-@{value}-theme_2-active}';
+      }
+    }
+  }
+})
+
+</style>
--- a/src/renderer/components/material/SearchInput.vue
+++ b/src/renderer/components/material/SearchInput.vue
@@ -34,11 +34,14 @@ export default {
    }
  },
  computed: {
-    ...mapGetters(['source', 'route', 'setting']),
-    ...mapGetters('search', ['info']),
+    ...mapGetters(['route', 'setting']),
+    ...mapGetters('search', ['searchText']),
    isAutoClearInput() {
      return this.setting.odc.isAutoClearSearchInput
    },
+    source() {
+      return this.setting.search.tempSearchSource
+    },
  },
  watch: {
    list(n) {
@@ -46,7 +49,7 @@ export default {
        this.listStyle.height = this.$refs.dom_list.scrollHeight + 'px'
      })
    },
-    'info.text'(n) {
+    'searchText'(n) {
      if (n !== this.text) this.text = n
    },
    route(n) {
@@ -76,16 +79,16 @@ export default {
        query: {
          text: this.text,
        },
-      })
+      }).catch(_ => _)
    },
    handleInput() {
      if (this.text === '') {
        this.list.splice(0, this.list.length)
-        music[this.source.id].tempSearch.cancelTempSearch()
+        music[this.source].tempSearch.cancelTempSearch()
        return
      }
      if (!this.isShow) this.showList()
-      music[this.source.id].tempSearch.search(this.text).then(list => {
+      music[this.source].tempSearch.search(this.text).then(list => {
        this.list = list
      }).catch(() => {})
    },
--- a/src/renderer/components/material/Select.vue
+++ b/src/renderer/components/material/Select.vue
@@ -90,7 +90,7 @@ export default {
  border-left: 2px solid @color-tab-border-bottom;
  box-sizing: border-box;
  text-align: center;
-  border-top-left-radius: 3px;
+  border-top-left-radius: 4px;
  color: @color-btn;
  cursor: pointer;

@@ -108,7 +108,7 @@ export default {
  left: 0;
  border-bottom: 2px solid @color-tab-border-bottom;
  border-left: 2px solid @color-tab-border-bottom;
-  border-bottom-left-radius: 3px;
+  border-bottom-left-radius: 4px;
  background-color: @color-theme_2;
  overflow: hidden;
  opacity: 0;
--- a/src/renderer/components/material/SongList.vue
+++ b/src/renderer/components/material/SongList.vue
@@ -175,7 +175,6 @@ export default {
  height: 100%;
  display: flex;
  flex-flow: column nowrap;
-  background-color: @color-theme_2;
 }

 .list {
@@ -220,16 +219,17 @@ export default {

  p {
    font-size: 24px;
-    color: #ccc;
+    color: @color-theme_2-font-label;
  }
 }

 each(@themes, {
  :global(#container.@{value}) {
-    .thead {
-      background-color: ~'@color-@{value}-theme_2';
+    .noitem {
+      p {
+        color: ~'@{color-@{value}-theme_2-font-label}';
+      }
    }
  }
 })
-
 </style>
--- a/src/renderer/components/material/Tab.vue
+++ b/src/renderer/components/material/Tab.vue
@@ -95,15 +95,15 @@ export default {
        margin-left: 0;
        button {
          border-top-left-radius: 3px;
-          // border-bottom-left-radius: 3px;
+          // border-bottom-left-radius: 4px;
        }
      }
      &:last-child {
        border-right: 2px solid @color-tab-border-top;
-        border-top-right-radius: 3px;
+        border-top-right-radius: 4px;
        button {
          border-top-right-radius: 3px;
-          // border-bottom-right-radius: 3px;
+          // border-bottom-right-radius: 4px;
        }
      }
      button {
@@ -122,7 +122,7 @@ export default {
        // border-left-color: @color-theme_2-hover;
        // border-right-color: @color-theme_2-hover;
        button {
-          background-color: @color-theme_2-hover;
+          background-color: @color-tab-btn-background-hover;
        }
      }
      &:active {
@@ -133,7 +133,7 @@ export default {
        }
      }
      &.active {
-        border-bottom-color: @color-theme_2;
+        border-bottom-color: @color-theme_2-background_2;
        border-top-color: @color-tab-border-bottom;
        border-left-color: @color-tab-border-bottom;
        border-right-color: @color-tab-border-bottom;
@@ -144,7 +144,7 @@ export default {
          width: 0;
        }
        button {
-          background-color: @color-theme_2;
+          background-color: @color-theme_2-background_2;
        }
      }
    }
@@ -193,7 +193,7 @@ each(@themes, {
            // border-left-color: ~'@{color-@{value}-theme_2-hover}';
            // border-right-color: ~'@{color-@{value}-theme_2-hover}';
            button {
-              background-color: ~'@{color-@{value}-theme_2-hover}';
+              background-color: ~'@{color-@{value}-tab-btn-background-hover}';
            }
          }
          &:active {
@@ -209,7 +209,7 @@ each(@themes, {
            border-left-color: ~'@{color-@{value}-tab-border-bottom}';
            border-right-color: ~'@{color-@{value}-tab-border-bottom}';
            button {
-              background-color: ~'@{color-@{value}-theme_2}';
+              background-color: ~'@{color-@{value}-theme_2-background_2}';
            }
          }
        }
--- a/src/renderer/components/material/VersionModal.vue
+++ b/src/renderer/components/material/VersionModal.vue
@@ -18,13 +18,12 @@ material-modal(:show="version.showModal" @close="handleClose")
    div(:class="$style.footer" v-if="version.isError")
      div(:class="$style.desc" v-if="!isUnknow")
        p 发现有新版本啦，但是自动更新功能出问题了
-        p
-          | 如果你所用的软件是
-          strong 安装版
-          | ，可以到QQ群：830125506 反馈哦
        p
          | 你现在可以选择继续使用当前版本或
          strong 去发布页下载新版本
+          | ，推荐到
+          strong 网盘
+          | 下载
      div(:class="$style.btns")
        material-btn(:class="$style.btn" @click.onec="handleIgnoreClick") 忽略该版本
        material-btn(:class="$style.btn" @click.onec="handleOpenPageClick") 去下载新版本
@@ -76,7 +75,7 @@ export default {
      this.setSetting(Object.assign({}, this.setting, { ignoreVersion: this.version.newVersion.version }))
    },
    handleOpenPageClick() {
-      openUrl('https://github.com/lyswhut/lx-music-desktop')
+      openUrl('https://github.com/lyswhut/lx-music-desktop#readme')
    },
    handleRestartClick(event) {
      this.handleClose()
--- a/src/renderer/store/modules/download.js
+++ b/src/renderer/store/modules/download.js
@@ -22,6 +22,8 @@ const state = {
 const dls = {}
 const tryNum = {}

+const filterFileName = /[\\/:*?#"<>|]/g
+
 // getters
 const getters = {
  list: state => state.list || [],
@@ -83,7 +85,7 @@ const getUrl = (downloadInfo, isRefresh) => {
 * @param {*} isEmbedPic
 */
 const saveMeta = (downloadInfo, filePath, isEmbedPic) => {
-  if (downloadInfo.type === 'ape') return
+  if (downloadInfo.type === 'ape' || downloadInfo.type === 'flac') return
  const promise = isEmbedPic
    ? downloadInfo.musicInfo.img
      ? Promise.resolve(downloadInfo.musicInfo.img)
@@ -125,7 +127,7 @@ const actions = {
      url: null,
      fileName: `${rootState.setting.download.fileName
        .replace('歌名', musicInfo.name)
-        .replace('歌手', musicInfo.singer)}.${ext}`,
+        .replace('歌手', musicInfo.singer)}.${ext}`.replace(filterFileName, ''),
      progress: {
        downloaded: 0,
        total: 0,
--- a/src/renderer/store/modules/search.js
+++ b/src/renderer/store/modules/search.js
@@ -1,41 +1,103 @@
 import music from '../../utils/music'
+const sources = []
+const sourceList = {}
+const sourceMaxPage = {}
+for (const source of music.sources) {
+  const musicSearch = music[source.id].musicSearch
+  if (!musicSearch) continue
+  sources.push(source)
+  sourceList[source.id] = {
+    page: 1,
+    allPage: 0,
+    limit: 30,
+    total: 0,
+    list: [],
+  }
+  sourceMaxPage[source.id] = 0
+}
+
+sources.push({
+  id: 'all',
+  name: '聚合搜索',
+})

 // state
 const state = {
+  sourceList,
  list: [],
  text: '',
  page: 1,
  limit: 30,
  allPage: 1,
  total: 0,
+  sourceMaxPage,
 }

 // getters
 const getters = {
-  list: state => state.list || [],
-  limit: state => state.limit,
-  info: state => ({ page: state.page, text: state.text }),
-  listInfo: state => ({ allPage: state.allPage, total: state.total }),
+  sources: () => sources,
+  sourceList: state => state.sourceList || [],
+  searchText: state => state.text,
+  allList: state => ({ list: state.list, allPage: state.allPage, page: state.page, total: state.total, limit: state.limit, sourceMaxPage: state.sourceMaxPage }),
 }

 // actions
 const actions = {
  search({ commit, rootState }, { text, page, limit }) {
-    return music[rootState.setting.sourceId].musicSearch.search(text, page, limit)
-      .then(data => commit('setList', { list: data.list, allPage: data.allPage, total: data.total, text, page }))
+    if (rootState.setting.search.searchSource == 'all') {
+      let task = []
+      for (const source of sources) {
+        if (source.id == 'all') continue
+        task.push(music[source.id].musicSearch.search(text, page))
+      }
+      Promise.all(task).then(results => commit('setLists', { results, text, page }))
+    } else {
+      return music[rootState.setting.search.searchSource].musicSearch.search(text, page, limit)
+        .then(data => commit('setList', { text, page, ...data }))
+    }
  },
 }

 // mitations
 const mutations = {
  setList(state, datas) {
-    state.list = datas.list
-    state.total = datas.total
-    state.allPage = datas.allPage
-    state.page = datas.page
+    let source = state.sourceList[datas.source]
+    source.list = datas.list
+    source.total = datas.total
+    source.allPage = datas.allPage
+    source.page = datas.page
+    source.limit = datas.limit
    state.text = datas.text
  },
+  setLists(state, { results, text, page }) {
+    let pages = []
+    let total = 0
+    let limit = 0
+    let list = []
+    for (const source of results) {
+      state.sourceMaxPage[source.source] = source.allPage
+      if (source.allPage < page) continue
+      list.push(...source.list)
+      pages.push(source.allPage)
+      total += source.total
+      limit += source.limit
+    }
+    list.sort((a, b) => b.name.charCodeAt(0) - a.name.charCodeAt(0))
+    state.allPage = Math.max(...pages)
+    state.total = total
+    state.limit = limit
+    state.page = page
+    state.text = text
+    state.list = list
+  },
  clearList(state) {
+    for (const source of Object.keys(state.sourceList)) {
+      state.sourceList[source].list.length = 0
+      state.sourceList[source].page = 0
+      state.sourceList[source].allPage = 0
+      state.sourceList[source].total = 0
+      state.sourceMaxPage[source] = 0
+    }
    state.list.length = 0
    state.page = 0
    state.allPage = 0
--- a/src/renderer/store/mutations.js
+++ b/src/renderer/store/mutations.js
@@ -2,8 +2,9 @@ export default {
  setTheme(state, val) {
    state.setting.themeId = val
  },
-  setSource(state, val) {
-    state.setting.sourceId = val
+  setSearchSource(state, { searchSource, tempSearchSource }) {
+    if (searchSource != null) state.setting.search.searchSource = searchSource
+    if (tempSearchSource != null) state.setting.search.tempSearchSource = tempSearchSource
  },
  setSetting(state, val) {
    state.setting = val
--- a/src/renderer/store/state.js
+++ b/src/renderer/store/state.js
@@ -44,6 +44,11 @@ export default {
      name: '灰常美丽',
      class: 'grey',
    },
+    {
+      id: 7,
+      name: '月里嫦娥',
+      class: 'midAutumn',
+    },
  ],
  version: {
    version,
--- a/src/renderer/utils/index.js
+++ b/src/renderer/utils/index.js
@@ -43,6 +43,7 @@ export const b64DecodeUnicode = str => {
 export const decodeName = str => str.replace(/&apos;/g, '\'')

 export const scrollTo = (element, to, duration = 300, fn = function() {}) => {
+  if (!element) return
  const start = element.scrollTop || element.scrollY
  const change = to - start
  const increment = 10
@@ -163,7 +164,7 @@ export const isChildren = (parent, children) => {
 * @param {*} setting
 */
 export const updateSetting = setting => {
-  const defaultVersion = '1.0.7'
+  const defaultVersion = '1.0.9'
  const defaultSetting = {
    version: defaultVersion,
    player: {
@@ -197,6 +198,19 @@ export const updateSetting = setting => {
    odc: {
      isAutoClearSearchInput: false,
    },
+    search: {
+      searchSource: 'kw',
+      tempSearchSource: 'kw',
+    },
+    network: {
+      proxy: {
+        enable: false,
+        host: '',
+        port: '',
+        username: '',
+        password: '',
+      },
+    },
    themeId: 0,
    sourceId: 'kw',
    apiSource: 'test',
@@ -205,7 +219,6 @@ export const updateSetting = setting => {
  }
  const overwriteSetting = {
    version: defaultVersion,
-    sourceId: 'kw',
  }


--- a/src/renderer/utils/music/bd/api-test.js
+++ b/src/renderer/utils/music/bd/api-test.js
@@ -4,7 +4,7 @@ import { headers, timeout } from '../options'

 const api_test = {
  getMusicUrl(songInfo, type) {
-    const requestObj = httpFatch(`http://test.tempmusic.tk/url/bd/${songInfo.songmid}/${type}`, {
+    const requestObj = httpFatch(`http://ts.tempmusic.tk/url/bd/${songInfo.songmid}/${type}`, {
      method: 'get',
      timeout,
      headers,
@@ -14,28 +14,6 @@ const api_test = {
    })
    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
@@ -2,19 +2,32 @@ import leaderboard from './leaderboard'
 import api_source from '../api-source'
 import musicInfo from './musicInfo'
 import songList from './songList'
+import { httpFatch } from '../../request'
+import musicSearch from './musicSearch'

 const bd = {
  leaderboard,
  songList,
+  musicSearch,
  getMusicUrl(songInfo, type) {
    return api_source('bd').getMusicUrl(songInfo, type)
  },
-  getLyric(songInfo) {
-    return api_source('bd').getLyric(songInfo)
-  },
  getPic(songInfo) {
-    return api_source('bd').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 = requestObj.promise.then(info => httpFatch(info.lrclink).promise.then(resp => resp.body))
+    return requestObj
+  },
+  // getLyric(songInfo) {
+  //   return api_source('bd').getLyric(songInfo)
+  // },
+  // getPic(songInfo) {
+  //   return api_source('bd').getPic(songInfo)
+  // },
  getMusicInfo(songInfo) {
    return musicInfo.getMusicInfo(songInfo.songmid)
  },
--- a/src/renderer/utils/music/bd/leaderboard.js
+++ b/src/renderer/utils/music/bd/leaderboard.js
@@ -126,6 +126,7 @@ export default {
        list,
        limit: this.limit,
        page: parseInt(info[3]),
+        source: 'bd',
      }
    })
  },
--- a/src/renderer/utils/music/bd/musicInfo.js
+++ b/src/renderer/utils/music/bd/musicInfo.js
@@ -1,10 +1,19 @@
 import { httpFatch } from '../../request'

 export default {
+  cache: {},
  getMusicInfo(songmid) {
+    if (this.cache[songmid]) {
+      return { promise: Promise.resolve(this.cache[songmid]) }
+    }
    const requestObj = httpFatch(`https://musicapi.qianqian.com/v1/restserver/ting?method=baidu.ting.song.getSongLink&format=json&from=bmpc&version=1.0.0&version_d=11.1.6.0&songid=${songmid}&type=1&res=1&s_protocol=1&aac=2&project=tpass`)
    requestObj.promise = requestObj.promise.then(({ body }) => {
-      return body.error_code == 22000 ? body.reqult.songinfo : Promise.reject(new Error('获取音乐信息失败'))
+      // console.log(body)
+      if (body.error_code == 22000) {
+        this.cache[songmid] = body.result.songinfo
+        return body.result.songinfo
+      }
+      return Promise.reject(new Error('获取音乐信息失败'))
    })
    return requestObj
  },
--- a/src/renderer/utils/music/bd/musicSearch.js
+++ b/src/renderer/utils/music/bd/musicSearch.js
@@ -0,0 +1,88 @@
+// import '../../polyfill/array.find'
+// import jshtmlencode from 'js-htmlencode'
+import { httpFatch } from '../../request'
+import { formatPlayTime } from '../../index'
+// import { debug } from '../../utils/env'
+// import { formatSinger } from './util'
+
+let searchRequest
+export default {
+  limit: 30,
+  total: 0,
+  page: 0,
+  allPage: 1,
+  musicSearch(str, page) {
+    if (searchRequest && searchRequest.cancelHttp) searchRequest.cancelHttp()
+    searchRequest = httpFatch(`http://tingapi.ting.baidu.com/v1/restserver/ting?from=android&version=5.6.5.6&method=baidu.ting.search.merge&format=json&query=${encodeURIComponent(str)}&page_no=${page}&page_size=${this.limit}&type=0&data_source=0&use_cluster=1`)
+    return searchRequest.promise.then(({ body }) => body)
+  },
+  handleResult(rawData) {
+    let ids = new Set()
+    const list = []
+    rawData.forEach(item => {
+      if (ids.has(item.song_id)) return
+      ids.add(item.song_id)
+      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()
+
+      list.push({
+        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: null,
+        lrc: null,
+        types,
+        _types,
+        typeUrl: {},
+      })
+    })
+    return list
+  },
+  search(str, page = 1, { limit } = {}) {
+    if (limit != null) this.limit = limit
+
+    return this.musicSearch(str, page).then(result => {
+      if (!result || result.error_code !== 22000) return this.search(str, page, { limit })
+      let list = this.handleResult(result.result.song_info.song_list)
+
+      if (list == null) return this.search(str, page, { limit })
+
+      this.total = result.result.song_info.total
+      this.page = page
+      this.allPage = Math.ceil(this.total / this.limit)
+
+      return Promise.resolve({
+        list,
+        allPage: this.allPage,
+        limit: this.limit,
+        total: this.total,
+        source: 'bd',
+      })
+    })
+  },
+}
--- a/src/renderer/utils/music/bd/songList.js
+++ b/src/renderer/utils/music/bd/songList.js
@@ -116,6 +116,7 @@ export default {
      return {
        hotTag: this.filterInfoHotTag(body.result.hot),
        tags: this.filterTagInfo(body.result.tags),
+        source: 'bd',
      }
    })
  },
@@ -123,6 +124,7 @@ export default {
    return rawList.map(item => ({
      name: item,
      id: item,
+      source: 'bd',
    }))
  },
  filterTagInfo(rawList) {
@@ -133,6 +135,7 @@ export default {
        parent_name: type.first,
        id: item,
        name: item,
+        source: 'bd',
      })),
    }))
  },
@@ -150,6 +153,7 @@ export default {
        total: body.nums,
        page,
        limit: this.limit_list,
+        source: 'bd',
      }
    })
  },
@@ -174,6 +178,7 @@ export default {
      img: item.list_pic_large || item.list_pic,
      grade: item.grade,
      desc: item.desc || item.tag,
+      source: 'bd',
    }))
  },

@@ -191,6 +196,7 @@ export default {
        page,
        limit: this.limit_song,
        total: body.result.song_num,
+        source: 'bd',
      }
    })
  },
--- a/src/renderer/utils/music/kg/api-test.js
+++ b/src/renderer/utils/music/kg/api-test.js
@@ -4,7 +4,7 @@ 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}`, {
+    const requestObj = httpFatch(`http://ts.tempmusic.tk/url/kg/${songInfo._types[type].hash}/${type}`, {
      method: 'get',
      timeout,
      headers,
@@ -15,7 +15,7 @@ const api_test = {
    return requestObj
  },
  getPic(songInfo) {
-    const requestObj = httpFatch(`http://test.tempmusic.tk/pic/kg/${songInfo.hash}`, {
+    const requestObj = httpFatch(`http://ts.tempmusic.tk/pic/kg/${songInfo.hash}`, {
      method: 'get',
      timeout,
      headers,
@@ -26,7 +26,7 @@ const api_test = {
    return requestObj
  },
  getLyric(songInfo) {
-    const requestObj = httpFatch(`http://test.tempmusic.tk/lrc/kg/${songInfo.hash}`, {
+    const requestObj = httpFatch(`http://ts.tempmusic.tk/lrc/kg/${songInfo.hash}`, {
      method: 'get',
      timeout,
      headers,
--- a/src/renderer/utils/music/kg/index.js
+++ b/src/renderer/utils/music/kg/index.js
@@ -1,10 +1,12 @@
 import leaderboard from './leaderboard'
 import api_source from '../api-source'
 import songList from './songList'
+import musicSearch from './musicSearch'

 const kg = {
  leaderboard,
  songList,
+  musicSearch,
  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
@@ -159,6 +159,7 @@ export default {
        list: listData,
        limit,
        page,
+        source: 'kg',
      }
    })
  },
--- a/src/renderer/utils/music/kg/musicSearch.js
+++ b/src/renderer/utils/music/kg/musicSearch.js
@@ -0,0 +1,92 @@
+// import '../../polyfill/array.find'
+// import jshtmlencode from 'js-htmlencode'
+import { httpFatch } from '../../request'
+import { formatPlayTime, sizeFormate } from '../../index'
+// import { debug } from '../../utils/env'
+// import { formatSinger } from './util'
+
+let searchRequest
+export default {
+  limit: 30,
+  total: 0,
+  page: 0,
+  allPage: 1,
+  musicSearch(str, page) {
+    if (searchRequest && searchRequest.cancelHttp) searchRequest.cancelHttp()
+    searchRequest = httpFatch(`http://ioscdn.kugou.com/api/v3/search/song?keyword=${encodeURIComponent(str)}&page=${page}&pagesize=${this.limit}&showtype=10&plat=2&version=7910&tag=1&correct=1&privilege=1&sver=5`)
+    return searchRequest.promise.then(({ body }) => body)
+  },
+  handleResult(rawData) {
+    // console.log(rawData)
+    let ids = new Set()
+    const list = []
+    rawData.forEach(item => {
+      if (ids.has(item.audio_id)) return
+      ids.add(item.audio_id)
+      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['320filesize'] !== 0) {
+        let size = sizeFormate(item['320filesize'])
+        types.push({ type: '320k', size, hash: item['320hash'] })
+        _types['320k'] = {
+          size,
+          hash: item['320hash'],
+        }
+      }
+      if (item.sqfilesize !== 0) {
+        let size = sizeFormate(item.sqfilesize)
+        types.push({ type: 'flac', size, hash: item.sqhash })
+        _types.flac = {
+          size,
+          hash: item.sqhash,
+        }
+      }
+      list.push({
+        singer: item.singername,
+        name: item.songname,
+        albumName: item.album_name,
+        albumId: item.album_id,
+        songmid: item.audio_id,
+        source: 'kg',
+        interval: formatPlayTime(item.duration),
+        img: null,
+        lrc: null,
+        hash: item.hash,
+        types,
+        _types,
+        typeUrl: {},
+      })
+    })
+    return list
+  },
+  search(str, page = 1, { limit } = {}) {
+    if (limit != null) this.limit = limit
+    // http://newlyric.kuwo.cn/newlyric.lrc?62355680
+    return this.musicSearch(str, page).then(result => {
+      if (!result || result.errcode !== 0) return this.search(str, page, { limit })
+      let list = this.handleResult(result.data.info)
+
+      if (list == null) return this.search(str, page, { limit })
+
+      this.total = result.data.total
+      this.page = page
+      this.allPage = Math.ceil(this.total / this.limit)
+
+      return Promise.resolve({
+        list,
+        allPage: this.allPage,
+        limit: this.limit,
+        total: this.total,
+        source: 'kg',
+      })
+    })
+  },
+}
--- a/src/renderer/utils/music/kg/songList.js
+++ b/src/renderer/utils/music/kg/songList.js
@@ -80,6 +80,7 @@ export default {
          parent_name: tag.pname,
          id: tag.id,
          name: tag.name,
+          source: 'kg',
        })),
      })
    }
@@ -133,6 +134,7 @@ export default {
      img: item.img || item.imgurl,
      grade: item.grade,
      desc: item.intro,
+      source: 'kg',
    }))
  },

@@ -147,6 +149,7 @@ export default {
        page: 1,
        limit: 10000,
        total: listData.length,
+        source: 'kg',
      }
    })
  },
@@ -215,6 +218,7 @@ export default {
        limit: body.data.params.pagesize,
        page: body.data.params.p,
        total: body.data.params.total,
+        source: 'kg',
      }
    })
  },
@@ -250,6 +254,7 @@ export default {
      return {
        hotTag: this.filterInfoHotTag(body.data.hotTag),
        tags: this.filterTagInfo(body.data.tagids),
+        source: 'kg',
      }
    })
  },
--- a/src/renderer/utils/music/kw/api-temp.js
+++ b/src/renderer/utils/music/kw/api-temp.js
@@ -3,7 +3,7 @@ import { headers, timeout } from '../options'

 const api_temp = {
  getMusicUrl(songInfo, type) {
-    const requestObj = httpFatch(`http://temp.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
+    const requestObj = httpFatch(`http://tm.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
      method: 'get',
      headers,
      timeout,
--- a/src/renderer/utils/music/kw/api-test.js
+++ b/src/renderer/utils/music/kw/api-test.js
@@ -15,7 +15,7 @@ const api_test = {
  //   return requestObj
  // },
  getMusicUrl(songInfo, type) {
-    const requestObj = httpFatch(`http://test.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
+    const requestObj = httpFatch(`http://ts.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
      method: 'get',
      timeout,
      headers,
--- a/src/renderer/utils/music/kw/leaderboard.js
+++ b/src/renderer/utils/music/kw/leaderboard.js
@@ -187,6 +187,7 @@ export default {
        list,
        limit: this.limit,
        page,
+        source: 'kw',
      }
    })
  },
--- a/src/renderer/utils/music/kw/musicSearch.js
+++ b/src/renderer/utils/music/kw/musicSearch.js
@@ -121,7 +121,7 @@ export default {
    }
    return result
  },
-  search(str, page = 1, { limit }) {
+  search(str, page = 1, { limit } = {}) {
    if (limit != null) this.limit = limit
    // http://newlyric.kuwo.cn/newlyric.lrc?62355680
    return this.musicSearch(str, page).then(result => {
@@ -138,6 +138,8 @@ export default {
        list,
        allPage: this.allPage,
        total: this.total,
+        limit: this.limit,
+        source: 'kw',
      })
    })
  },
--- a/src/renderer/utils/music/kw/songList.js
+++ b/src/renderer/utils/music/kw/songList.js
@@ -59,6 +59,7 @@ export default {
    return rawList.map(item => ({
      id: `${item.id}-${item.digest}`,
      name: item.name,
+      source: 'kw',
    }))
  },
  filterTagInfo(rawList) {
@@ -69,6 +70,7 @@ export default {
        parent_name: type.name,
        id: `${item.id}-${item.digest}`,
        name: item.name,
+        source: 'kw',
      })),
    }))
  },
@@ -94,6 +96,7 @@ export default {
          total: body.data.total,
          page: body.data.pn,
          limit: body.data.rn,
+          source: 'kw',
        }
      } else if (!body.length) {
        return this.getListUrl({ sortId, id, type, page })
@@ -103,6 +106,7 @@ export default {
        total: 1000,
        page,
        limit: 1000,
+        source: 'kw',
      }
    })
  },
@@ -127,6 +131,7 @@ export default {
      img: item.img,
      grade: item.favorcnt / 10,
      desc: item.desc,
+      source: 'kw',
    }))
  },
  filterList2(rawData) {
@@ -160,6 +165,7 @@ export default {
        page,
        limit: body.rn,
        total: body.total,
+        source: 'kw',
      }
    })
  },
--- a/src/renderer/utils/music/tx/leaderboard.js
+++ b/src/renderer/utils/music/tx/leaderboard.js
@@ -196,6 +196,7 @@ export default {
          list: this.filterData(data.toplist.data.songInfoList),
          limit: this.limit,
          page: 1,
+          source: 'tx',
        }
      })
    })
--- a/src/renderer/utils/music/wy/api-test.js
+++ b/src/renderer/utils/music/wy/api-test.js
@@ -4,7 +4,7 @@ import { headers, timeout } from '../options'

 const api_test = {
  getMusicUrl(songInfo, type) {
-    const requestObj = httpFatch(`http://test.tempmusic.tk/url/wy/${songInfo.songmid}/${type}`, {
+    const requestObj = httpFatch(`http://ts.tempmusic.tk/url/wy/${songInfo.songmid}/${type}`, {
      method: 'get',
      timeout,
      headers,
@@ -15,7 +15,7 @@ const api_test = {
    return requestObj
  },
  getPic(songInfo) {
-    const requestObj = httpFatch(`http://test.tempmusic.tk/pic/wy/${songInfo.songmid}`, {
+    const requestObj = httpFatch(`http://ts.tempmusic.tk/pic/wy/${songInfo.songmid}`, {
      method: 'get',
      timeout,
      headers,
@@ -26,7 +26,7 @@ const api_test = {
    return requestObj
  },
  getLyric(songInfo) {
-    const requestObj = httpFatch(`http://test.tempmusic.tk/lrc/wy/${songInfo.songmid}`, {
+    const requestObj = httpFatch(`http://ts.tempmusic.tk/lrc/wy/${songInfo.songmid}`, {
      method: 'get',
      timeout,
      headers,
--- a/src/renderer/utils/music/wy/leaderboard.js
+++ b/src/renderer/utils/music/wy/leaderboard.js
@@ -155,6 +155,7 @@ export default {
        list,
        limit: this.limit,
        page,
+        source: 'tx',
      }
    })
  },
--- a/src/renderer/utils/request.js
+++ b/src/renderer/utils/request.js
@@ -8,6 +8,8 @@ import { bHh } from './music/options'
 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',
 }
+// var proxyUrl = "http://" + user + ":" + password + "@" + host + ":" + port;
+// var proxiedRequest = request.defaults({'proxy': proxyUrl});

 /**
 * promise 形式的请求方法
@@ -215,6 +217,10 @@ export const http_jsonp = (url, options, callback) => {
  })
 }

+const getProxyInfo = () => window.globalObj.proxy.enable
+  ? `http://${window.globalObj.proxy.username}:${window.globalObj.proxy.password}@${window.globalObj.proxy.host}:${window.globalObj.proxy.port};`
+  : undefined
+
 const fatchData = (url, method, options, callback) => {
  // console.log(url, options)
  console.log('---start---', url)
@@ -233,6 +239,7 @@ const fatchData = (url, method, options, callback) => {
    form: options.form,
    formData: options.formData,
    timeout: options.timeout || 10000,
+    proxy: getProxyInfo(),
    json: options.format === undefined || options.format === 'json',
  }, (err, resp, body) => {
    if (err) return callback(err, null)
--- a/src/renderer/views/List.vue
+++ b/src/renderer/views/List.vue
@@ -37,7 +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 加载中...
+      p(v-text="list.length ? '加载中...' : '列表竟然是空的...'")
    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")
@@ -257,7 +257,7 @@ export default {

  p {
    font-size: 24px;
-    color: #ccc;
+    color: @color-theme_2-font-label;
  }
 }

@@ -270,6 +270,12 @@ each(@themes, {
        }
      }
    }
+    .no-item {
+      p {
+        color: ~'@{color-@{value}-theme_2-font-label}';
+      }
+    }
  }
 })
+
 </style>
--- a/src/renderer/views/Search.vue
+++ b/src/renderer/views/Search.vue
@@ -1,7 +1,9 @@
 <template lang="pug">
  div(:class="$style.search")
    //- transition
-    div(v-if="list.length" :class="$style.list")
+    div(:class="$style.header")
+      material-tab(:class="$style.tab" :list="sources" align="left" item-key="id" item-name="name" v-model="searchSourceId")
+    div(v-if="listInfo.list.length" :class="$style.list")
      div(:class="$style.thead")
        table
          thead
@@ -17,7 +19,7 @@
      div.scroll(:class="$style.tbody" ref="dom_scrollContent")
        table
          tbody
-            tr(v-for='(item, index) in list' :key='item.songmid' @click="handleDoubleClick(index)")
+            tr(v-for='(item, index) in listInfo.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%;")
@@ -27,15 +29,18 @@
              td.break(style="width: 20%;") {{item.singer}}
              td.break(style="width: 25%;") {{item.albumName}}
              td(style="width: 15%;")
-                material-list-buttons(:index="index" :remove-btn="false" @btn-click="handleListBtnClick")
+                material-list-buttons(:index="index" :remove-btn="false" :class="$style.listBtn"
+                  :play-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx' && item.source != 'wy')"
+                  :download-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx' && item.source != 'wy')"
+                  @btn-click="handleListBtnClick")
              td(style="width: 10%;") {{item.interval}}
        div(:class="$style.pagination")
-          material-pagination(:count="listInfo.total" :limit="limit" :page="page" @btn-click="handleTogglePage")
+          material-pagination(:count="listInfo.total" :limit="listInfo.limit" :page="page" @btn-click="handleTogglePage")
    div(v-else :class="$style.noitem")
      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" :remove-btn="false" @btn-click="handleFlowBtnClick")
+    material-flow-btn(:show="isShowEditBtn && (searchSourceId == 'kw' || searchSourceId == 'all' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
 </template>

 <script>
@@ -57,25 +62,22 @@ export default {
      isIndeterminate: false,
      isShowEditBtn: false,
      isShowDownloadMultiple: false,
+      searchSourceId: null,
    }
  },
  beforeRouteUpdate(to, from, next) {
    if (to.query.text === undefined) return
-    if (to.query.text === '') {
-      this.clearList()
-    } else {
-      this.text = to.query.text
-      this.page = 1
-      this.handleSearch(this.text, this.page)
-    }
+    this.text = to.query.text
+    this.page = 1
+    this.handleSearch(this.text, this.page)
    next()
  },
  mounted() {
    // console.log('mounted')
+    this.searchSourceId = this.setting.search.searchSource
    if (this.$route.query.text === undefined) {
-      let info = this.$store.getters['search/info']
-      this.text = info.text
-      this.page = info.page
+      this.text = this.$store.getters['search/searchText']
+      this.page = this.listInfo.page
    } else if (this.$route.query.text === '') {
      this.clearList()
    } else {
@@ -89,30 +91,49 @@ export default {
      const len = n.length
      if (len) {
        this.isSelectAll = true
-        this.isIndeterminate = len !== this.list.length
+        this.isIndeterminate = len !== this.listInfo.list.length
        this.isShowEditBtn = true
      } else {
        this.isSelectAll = false
        this.isShowEditBtn = false
      }
    },
-    list() {
+    'listInfo.list'() {
      this.resetSelect()
    },
+    searchSourceId(n) {
+      if (n === this.setting.search.searchSource) return
+      this.$nextTick(() => {
+        this.page = 1
+        this.handleSearch(this.text, this.page)
+      })
+      this.setSearchSource({
+        searchSource: n,
+      })
+    },
  },
  computed: {
-    ...mapGetters(['userInfo']),
-    ...mapGetters('search', ['list', 'limit', 'listInfo']),
+    ...mapGetters(['userInfo', 'setting']),
+    ...mapGetters('search', ['sourceList', 'allList', 'sources']),
    ...mapGetters('list', ['defaultList']),
+    listInfo() {
+      return this.setting.search.searchSource == 'all' ? this.allList : this.sourceList[this.setting.search.searchSource]
+    },
+    isAPITemp() {
+      return this.setting.apiSource == 'temp'
+    },
  },
  methods: {
+    ...mapMutations(['setSearchSource']),
    ...mapActions('search', ['search']),
    ...mapActions('download', ['createDownload', 'createDownloadMultiple']),
    ...mapMutations('search', ['clearList', 'setPage']),
    ...mapMutations('list', ['defaultListAdd', 'defaultListAddMultiple']),
    ...mapMutations('player', ['setList']),
    handleSearch(text, page) {
-      this.search({ text, page, limit: this.limit }).then(data => {
+      if (text === '') return this.clearList()
+
+      this.search({ text, page, limit: this.listInfo.limit }).then(data => {
        this.page = page
        this.$nextTick(() => {
          scrollTo(this.$refs.dom_scrollContent, 0)
@@ -135,7 +156,7 @@ export default {
    handleListBtnClick(info) {
      switch (info.action) {
        case 'download':
-          this.musicInfo = this.list[info.index]
+          this.musicInfo = this.listInfo.list[info.index]
          this.$nextTick(() => {
            this.isShowDownload = true
          })
@@ -151,9 +172,10 @@ export default {
      let targetSong
      if (index == null) {
        targetSong = this.selectdData[0]
-        this.defaultListAddMultiple(this.selectdData)
+        this.defaultListAddMultiple(this.filterList(this.selectdData))
      } else {
-        targetSong = this.list[index]
+        if ((this.isAPITemp && this.listInfo.list[index].source != 'kw') || this.listInfo.list[index].source == 'tx' || this.listInfo.list[index].source == 'wy') return
+        targetSong = this.listInfo.list[index]
        this.defaultListAdd(targetSong)
      }
      let targetIndex = this.defaultList.list.findIndex(
@@ -175,12 +197,12 @@ export default {
      this.isShowDownload = false
    },
    handleAddDownloadMultiple(type) {
-      this.createDownloadMultiple({ list: [...this.selectdData], type })
+      this.createDownloadMultiple({ list: this.filterList(this.selectdData), type })
      this.resetSelect()
      this.isShowDownloadMultiple = false
    },
    handleSelectAllData(isSelect) {
-      this.selectdData = isSelect ? [...this.list] : []
+      this.selectdData = isSelect ? [...this.listInfo.list] : []
    },
    resetSelect() {
      this.isSelectAll = false
@@ -196,11 +218,14 @@ export default {
          this.resetSelect()
          break
        case 'add':
-          this.defaultListAddMultiple(this.selectdData)
+          this.defaultListAddMultiple(this.filterList(this.selectdData))
          this.resetSelect()
          break
      }
    },
+    filterList(list) {
+      return this.setting.apiSource == 'temp' ? list.filter(s => s.source == 'kw') : list.filter(s => s.source != 'tx' && s.source != 'wy')
+    },
  },
 }
 </script>
@@ -211,6 +236,11 @@ export default {
 .search {
  overflow: hidden;
  height: 100%;
+  display: flex;
+  flex-flow: column nowrap;
+}
+.header {
+  flex: none;
 }
 .list {
  position: relative;
@@ -218,6 +248,8 @@ export default {
  font-size: 14px;
  display: flex;
  flex-flow: column nowrap;
+  flex: auto;
+  overflow: hidden;
 }
 .thead {
  flex: none;
@@ -238,6 +270,9 @@ export default {
    }
  }
 }
+.listBtn {
+  min-height: 24px;
+}
 .pagination {
  text-align: center;
  padding: 15px 0;
@@ -245,8 +280,9 @@ export default {
  // transform: translateX(-50%);
 }
 .noitem {
+  flex: auto;
+  overflow: hidden;
  position: relative;
-  height: 100%;
  display: flex;
  flex-flow: column nowrap;
  justify-content: center;
@@ -254,7 +290,17 @@ export default {

  p {
    font-size: 24px;
-    color: #ccc;
+    color: @color-theme_2-font-label;
  }
 }
+
+each(@themes, {
+  :global(#container.@{value}) {
+    .noitem {
+      p {
+        color: ~'@{color-@{value}-theme_2-font-label}';
+      }
+    }
+  }
+})
 </style>
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -62,6 +62,18 @@ div.scroll(:class="$style.setting")
      h3 专辑栏
      div
        material-checkbox(id="setting_list_showalbum" v-model="current_setting.list.isShowAlbumName" label="是否显示专辑栏")
+    dt 网络设置
+    dd
+      h3 代理设置（歌曲下载暂不支持代理）
+      div
+        p
+          material-checkbox(id="setting_network_proxy_enable" v-model="current_setting.network.proxy.enable" @change="handleProxyChange('enable')" label="是否启用")
+        p
+          material-input(:class="$style.gapLeft" v-model="current_setting.network.proxy.host" @change="handleProxyChange('host')" placeholder="主机")
+          material-input(:class="$style.gapLeft" v-model="current_setting.network.proxy.port" @change="handleProxyChange('port')" placeholder="端口")
+        p
+          material-input(:class="$style.gapLeft" v-model="current_setting.network.proxy.username" @change="handleProxyChange('username')" placeholder="用户名")
+          material-input(:class="$style.gapLeft" v-model="current_setting.network.proxy.password" @change="handleProxyChange('password')" type="password" placeholder="密码")
    dt 强迫症设置
    dd
      h3 离开搜索界面时清空搜索框
@@ -169,6 +181,15 @@ export default {
          isDownloadLrc: false,
          isEmbedPic: true,
        },
+        network: {
+          proxy: {
+            enable: false,
+            host: '',
+            port: '',
+            username: '',
+            password: '',
+          },
+        },
        odc: {
          isAutoClearSearchInput: false,
        },
@@ -416,6 +437,9 @@ export default {
    clipboardWriteText(text) {
      clipboardWriteText(text)
    },
+    handleProxyChange(key) {
+      window.globalObj.proxy[key] = this.current_setting.network.proxy[key]
+    },
    openRewardModal() {

    },
@@ -479,7 +503,9 @@ export default {

 .theme {
  display: flex;
+  flex-flow: row wrap;
  // padding: 0 15px;
+  margin-bottom: -20px;

  li {
    display: flex;
@@ -489,6 +515,7 @@ export default {
    // color: @color-theme;
    margin-right: 30px;
    transition: color .3s ease;
+    margin-bottom: 20px;

    &:last-child {
      margin-right: 0;
@@ -509,6 +536,9 @@ export default {
        width: 100%;
        height: 100%;
        border-radius: 4px;
+        background-position: center;
+        background-size: auto 100%;
+        background-repeat: no-repeat;
      }
    }

@@ -517,6 +547,7 @@ export default {
        span {
          &:after {
            background-color: ~'@{color-@{value}-theme}';
+            background-image: ~'@{color-@{value}-theme-bgimg}';
          }
        }
      }
--- a/src/renderer/views/SongList.vue
+++ b/src/renderer/views/SongList.vue
@@ -1,24 +1,24 @@
 <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")
+    transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
+      div(:class="$style.songListDetailContent" 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(:class="$style.songListContent" v-show="!isVisibleListDetail")
+        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.scroll(:class="$style.songList" ref="dom_scrollContent")
          ul
            li(:class="$style.item" v-for="(item, index) in listData.list" @click="handleItemClick(index)")
              div(:class="$style.left")
@@ -269,14 +269,18 @@ export default {
  width: 80px;
 }

-.main {
-  flex: auto;
+.songListContent, .song-list-detail-content {
+  // flex: auto;
  overflow: hidden;
+}
+
+.songListContent {
+  display: flex;
+  flex-flow: column nowrap;
  // position: relative;
 }

 .song-list-header {
-  background-color: @color-theme_2;
  display: flex;
  flex-flow: row nowrap;
  height: 60px;
@@ -326,7 +330,7 @@ export default {
  padding-right: 15px;
 }

-.song-list-detail {
+.song-list-detail-content {
  position: absolute;
  width: 100%;
  height: 100%;
@@ -340,7 +344,6 @@ export default {
  height: 100%;
  overflow-y: auto;
  padding: 0 15px;
-  background-color: #fff;
  ul {
    display: flex;
    flex-flow: row wrap;
Author	SHA1	Message	Date
lyswhut	58e61e0bda	发布0.6.0版本	2019-09-21 21:09:15 +08:00
lyswhut	42aa62cff0	调整失败更新提示	2019-09-21 21:07:36 +08:00
lyswhut	bcf7b3fccb	修改更新失败提示	2019-09-21 21:04:45 +08:00
lyswhut	ff09378c6d	去重id	2019-09-21 20:53:03 +08:00
lyswhut	99b0595e50	新增搜索页面接口限制	2019-09-21 20:34:40 +08:00
lyswhut	5321469c1d	完成聚合搜索功能	2019-09-21 20:05:56 +08:00
lyswhut	ef9eb83a75	完善聚合搜索逻辑	2019-09-21 13:41:19 +08:00
lyswhut	c12bbc7f0f	重构搜索页面逻辑	2019-09-20 22:09:18 +08:00
lyswhut	a16c4c3657	更新依赖到最新	2019-09-19 22:30:15 +08:00
lyswhut	c8240448c6	内置百度源歌曲图片、歌词获取	2019-09-17 21:36:46 +08:00
lyswhut	d19569131c	将网络代理密码框设置为password类型	2019-09-16 21:50:41 +08:00
lyswhut	37eec4c971	更换接口地址	2019-09-16 14:08:29 +08:00
lyswhut	65fe679ee2	修复切换歌单列表详情时的UI Bug	2019-09-16 13:31:06 +08:00
lyswhut	a16b825c3b	修复代理bug	2019-09-16 00:24:30 +08:00
lyswhut	b9aedc9165	新增代理功能	2019-09-16 00:00:07 +08:00
lyswhut	8bdbbc562c	修复试听列表没有歌曲时会显示列表加载中的Bug	2019-09-14 11:00:42 +08:00
lyswhut	696f6c096c	优化从《梦里嫦娥》皮肤切换到其他皮肤时侧栏动画的切换效果	2019-09-13 14:51:28 +08:00
lyswhut	d0ef6aef1c	发布0.5.5版本	2019-09-13 14:07:39 +08:00
lyswhut	7204b51439	新增：《月里嫦娥》皮肤	2019-09-13 14:04:52 +08:00
lyswhut	6075a9d22f	更新常见问题	2019-09-12 16:24:28 +08:00
lyswhut	b15cfa1892	新增复制播放标题的功能	2019-09-12 01:35:19 +08:00
lyswhut	955375f423	添加mac退出快捷键	2019-09-11 21:43:30 +08:00
lyswhut	2aa13a499a	修复mac不能复制粘贴的问题	2019-09-11 20:50:34 +08:00
lyswhut	fb0e61f3b0	修复等待事件未清空的bug	2019-09-10 21:49:09 +08:00
lyswhut	16149fdd38	修复：文件名包含特殊符号时导致下载失败的Bug	2019-09-10 13:00:55 +08:00
lyswhut	a432080141	修复 MAC 系统下软件关闭时再次从 dock 打开时报错的Bug	2019-09-10 09:03:57 +08:00
lyswhut	73072daa46	尝试修复Mac系统点击关闭时再打开的BUG	2019-09-10 02:03:09 +08:00
lyswhut	2f57345bd2	更新更新错误时的弹窗下载地址	2019-09-09 09:49:27 +08:00
lyswhut	06075d561d	降级node-downloader-helper包	2019-09-09 08:32:15 +08:00
lyswhut	db8ad7cde5	发布0.5.4版本	2019-09-09 08:29:04 +08:00
lyswhut	cacf39da69	暂时移除FLAC格式的meta信息修改	2019-09-09 08:26:18 +08:00
lyswhut	4dc7937321	修复更新弹窗可能导致的bug	2019-09-09 01:32:14 +08:00