diff --git a/package.json b/package.json index 6f6743df..f0e4273d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "0.15.0", + "version": "0.16.0", "description": "一个免费的音乐下载助手", "main": "./dist/electron/main.js", "productName": "lx-music-desktop", diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 4c1cfe33..9b470787 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -229,7 +229,14 @@ export default { this.setNewVersion(result) return result }).then(result => { - if (result.version === this.version.version || result.version === this.setting.ignoreVersion) return + let newVer = result.version.replace(/\./g, '') + let currentVer = this.version.version.replace(/\./g, '') + let len = Math.max(newVer.length, currentVer.length) + newVer.padStart(len, '0') + currentVer.padStart(len, '0') + if (parseInt(newVer) <= parseInt(currentVer)) return this.setVersionModalVisible({ isLatestVer: true }) + + if (result.version === this.setting.ignoreVersion) return // console.log(this.version) this.$nextTick(() => { this.setVersionModalVisible({ isShow: true }) diff --git a/src/renderer/store/mutations.js b/src/renderer/store/mutations.js index f5dae734..bc51f3c0 100644 --- a/src/renderer/store/mutations.js +++ b/src/renderer/store/mutations.js @@ -30,13 +30,14 @@ export default { setDownloadProgress(state, info) { state.version.downloadProgress = info }, - setVersionModalVisible(state, { isShow, isError, isDownloaded, isTimeOut, isDownloading, isUnknow }) { + setVersionModalVisible(state, { isShow, isError, isDownloaded, isTimeOut, isDownloading, isUnknow, isLatestVer }) { if (isShow !== undefined) state.version.showModal = isShow if (isError !== undefined) state.version.isError = isError if (isTimeOut !== undefined) state.version.isTimeOut = isTimeOut if (isDownloading !== undefined) state.version.isDownloading = isDownloading if (isDownloaded !== undefined) state.version.isDownloaded = isDownloaded if (isUnknow !== undefined) state.version.isUnknow = isUnknow + if (isLatestVer !== undefined) state.version.isLatestVer = isLatestVer }, setVolume(state, val) { state.setting.player.volume = val diff --git a/src/renderer/store/state.js b/src/renderer/store/state.js index 724f221a..82f6d79d 100644 --- a/src/renderer/store/state.js +++ b/src/renderer/store/state.js @@ -92,6 +92,7 @@ export default { isUnknow: false, isDownloaded: false, isDownloading: false, + isLatestVer: false, downloadProgress: null, }, userInfo: null, diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue index 7d68fd44..6ecbf563 100644 --- a/src/renderer/views/Setting.vue +++ b/src/renderer/views/Setting.vue @@ -130,7 +130,7 @@ div.scroll(:class="$style.setting") br | 下载进度:{{downloadProgress}} p(v-if="version.newVersion") - span(v-if="isLatestVer") 软件已是最新,尽情地体验吧~🥂 + span(v-if="version.isLatestVer") 软件已是最新,尽情地体验吧~🥂 material-btn(v-else :class="[$style.btn, $style.gapLeft]" min @click="showUpdateModal") 打开更新窗口 🚀 p.small(v-else) 检查更新中... dt 关于洛雪音乐 @@ -209,9 +209,6 @@ export default { computed: { ...mapGetters(['setting', 'settingVersion', 'themes', 'version', 'windowSizeList']), ...mapGetters('list', ['defaultList', 'loveList']), - isLatestVer() { - return this.version.newVersion && this.version.version === this.version.newVersion.version - }, isShowRebootBtn() { return this.current_setting.windowSizeId != window.currentWindowSizeId },