From 1aee3f33206229ed4dd3b4e3dba0d618c0c08289 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Tue, 25 Aug 2020 12:06:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                         | 3 ++-
 pageE/setting/updateVersion.vue | 9 ++++++++-
 pageE/setting/version.vue       | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/App.vue b/App.vue
index 3bb066b..c3fe25f 100644
--- a/App.vue
+++ b/App.vue
@@ -50,7 +50,8 @@
 					// console.log(res);
 					if(res.data.app_version != this.$app_version) {
 						this.$u.route('/pageE/setting/updateVersion', {
-							status: res.data.is_focus_upgrade
+							status: res.data.is_focus_upgrade,
+							type: 'auto'
 						});
 					}
 				})
diff --git a/pageE/setting/updateVersion.vue b/pageE/setting/updateVersion.vue
index 86884a7..46aad66 100644
--- a/pageE/setting/updateVersion.vue
+++ b/pageE/setting/updateVersion.vue
@@ -18,10 +18,13 @@
 					2. 新增Modal模态框组件<br>
 					3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
 				`,
+				isAutoUpdate: false,
 			}
 		},
 		onLoad(option) {
 			this.is_focus_upgrade = option.status == 1 ? false : true;
+			// type manual 从检查更新页面过来 auto 从app过来
+			this.isAutoUpdate = option.type == 'manual' ? false : true;
 		},
 		onReady() {
 			this.show = true;
@@ -45,7 +48,11 @@
 				// #endif
 			},
 			closeModal() {
-				uni.navigateBack();
+				if(isAutoUpdate) {
+					this.$u.route('/pageA/login/login');
+				} else {
+					uni.navigateBack();
+				}
 			}
 		}
 	}
diff --git a/pageE/setting/version.vue b/pageE/setting/version.vue
index c1c05f2..bd0183e 100644
--- a/pageE/setting/version.vue
+++ b/pageE/setting/version.vue
@@ -49,7 +49,8 @@ export default {
 		},
 		updateVersion() {
 			this.$u.route('/pageE/setting/updateVersion', {
-				status: this.status
+				status: this.status,
+				type: 'manual',
 			});
 		}
 	}
-- 
2.47.2