From ffa18c92d28d1c3e1008a107fd5db07f962cbf7d Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Tue, 25 Aug 2020 12:21:26 +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                         | 6 ++++--
 pageE/setting/updateVersion.vue | 6 +++---
 pageE/setting/version.vue       | 1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/App.vue b/App.vue
index c3fe25f..7eb3095 100644
--- a/App.vue
+++ b/App.vue
@@ -29,6 +29,9 @@
 		},
 		onShow(){
 			this.getVersion();
+		},
+		onLoad() {
+			
 		},
 		onHide(){
 
@@ -50,8 +53,7 @@
 					// console.log(res);
 					if(res.data.app_version != this.$app_version) {
 						this.$u.route('/pageE/setting/updateVersion', {
-							status: res.data.is_focus_upgrade,
-							type: 'auto'
+							status: res.data.is_focus_upgrade
 						});
 					}
 				})
diff --git a/pageE/setting/updateVersion.vue b/pageE/setting/updateVersion.vue
index e174228..155e3c5 100644
--- a/pageE/setting/updateVersion.vue
+++ b/pageE/setting/updateVersion.vue
@@ -23,8 +23,6 @@
 		},
 		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;
@@ -48,7 +46,9 @@
 				// #endif
 			},
 			closeModal() {
-				if(isAutoUpdate) {
+				const pages = getCurrentPages();
+				// console.log(pages);
+				if(pages.length == 2) {
 					this.$u.route('/pageA/login/login');
 				} else {
 					uni.navigateBack();
diff --git a/pageE/setting/version.vue b/pageE/setting/version.vue
index bd0183e..dd281cc 100644
--- a/pageE/setting/version.vue
+++ b/pageE/setting/version.vue
@@ -50,7 +50,6 @@ export default {
 		updateVersion() {
 			this.$u.route('/pageE/setting/updateVersion', {
 				status: this.status,
-				type: 'manual',
 			});
 		}
 	}