diff --git a/.travis.yml b/.travis.yml index 56b1e9b..2b07113 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ osx_image: xcode8.3 dist: trusty -sudo: false +sudo: true language: node_js node_js: "8" diff --git a/README.md b/README.md index 01e9306..d1e11d8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# music player +# music player [![Build Status](https://travis-ci.org/sunzongzheng/player.svg?branch=master)](https://travis-ci.org/sunzongzheng/player) - 歌曲[Api](https://github.com/sunzongzheng/musicAPI)涵盖网易云、QQ音乐、虾米 - 界面仿QQ音乐 - Mac > Windows > Linux都会逐步适配,移动端在计划中 diff --git a/package.json b/package.json index ca8f83c..b79f6f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "player", - "version": "0.0.0", + "version": "1.0.10", "author": "sunzongzheng ", "description": "An electron-vue project", "license": "CC0-1.0", @@ -27,7 +27,7 @@ "build": { "productName": "player", "appId": "org.sunzongzheng.player", - "artifactName": "${name}.${os}.${ext}", + "artifactName": "${name}-${version}-${os}.${ext}", "directories": { "output": "releases" }, diff --git a/src/main/ipcEvent/viewCtrol.js b/src/main/ipcEvent/viewCtrol.js index c413b33..be37d99 100644 --- a/src/main/ipcEvent/viewCtrol.js +++ b/src/main/ipcEvent/viewCtrol.js @@ -2,7 +2,11 @@ export default { on (win, op) { switch (op) { case 'close': - win.hide() + if (process.platform === 'darwin') { + win.hide() + } else { + win.minimize() + } break case 'minimize': win.minimize() diff --git a/src/renderer/view/home/components/lyrics/index.vue b/src/renderer/view/home/components/lyrics/index.vue index db6e4bc..585d5d7 100644 --- a/src/renderer/view/home/components/lyrics/index.vue +++ b/src/renderer/view/home/components/lyrics/index.vue @@ -75,7 +75,9 @@ watch: { 'play.info' () { console.log('change') - this.$refs.main.scrollTop = 0 + if (this.$refs.main) { + this.$refs.main.scrollTop = 0 + } } }, methods: {