From 3fd22988c11bc1957ddc52a63d1632831e72156f Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 6 Nov 2019 23:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=8E=B7=E5=8F=96=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E4=BF=A1=E6=81=AF=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/App.vue                              | 1 +
 src/renderer/components/material/VersionModal.vue | 2 +-
 src/renderer/store/mutations.js                   | 3 ++-
 src/renderer/store/state.js                       | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 1229b1f2..8b42bf34 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -109,6 +109,7 @@ export default {
       ipcRenderer.on('update-available', (e, info) => {
         // this.showUpdateModal(true)
         // console.log(info)
+        this.setVersionModalVisible({ isDownloading: true })
         this.getVersionInfo().catch(() => ({
           version: info.version,
           desc: info.releaseNotes,
diff --git a/src/renderer/components/material/VersionModal.vue b/src/renderer/components/material/VersionModal.vue
index 4235e062..1a02b88b 100644
--- a/src/renderer/components/material/VersionModal.vue
+++ b/src/renderer/components/material/VersionModal.vue
@@ -54,7 +54,7 @@ material-modal(:show="version.showModal" @close="handleClose" v-if="version.newV
           | 国内Windows/MAC用户推荐到
           strong 网盘
           | 下载。
-  main(:class="$style.main" v-else-if="version.isTimeOut")
+  main(:class="$style.main" v-else-if="version.isDownloading && version.isTimeOut && !version.isUnknow")
     h2 ❗️ 新版本下载超时 ❗️
     div(:class="$style.desc")
       p 你当前所在网络访问GitHub较慢，导致新版本下载超时（已经下了半个钟了😳），建议手动更新版本！
diff --git a/src/renderer/store/mutations.js b/src/renderer/store/mutations.js
index d6b883e4..78c353ee 100644
--- a/src/renderer/store/mutations.js
+++ b/src/renderer/store/mutations.js
@@ -27,10 +27,11 @@ export default {
   setDownloadProgress(state, info) {
     state.version.downloadProgress = info
   },
-  setVersionModalVisible(state, { isShow, isError, isDownloaded, isTimeOut, isUnknow }) {
+  setVersionModalVisible(state, { isShow, isError, isDownloaded, isTimeOut, isDownloading, isUnknow }) {
     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
   },
diff --git a/src/renderer/store/state.js b/src/renderer/store/state.js
index 76298f11..ed563e28 100644
--- a/src/renderer/store/state.js
+++ b/src/renderer/store/state.js
@@ -65,6 +65,7 @@ export default {
     isTimeOut: false,
     isUnknow: false,
     isDownloaded: false,
+    isDownloading: false,
     downloadProgress: null,
   },
   userInfo: null,