Merge pull request '版本更新跳转' (#296) from zhy into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/296

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'
 						});
 					}
 				})

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();
+				}
 			}
 		}
 	}

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',
 			});
 		}
 	}