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

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

App.vue

@@ -28,7 +28,7 @@
             // #endif
 		},
 		onShow(){
-			this.getVersion();
+			// this.getVersion();
 		},
 		onLoad() {
 			

pageE/setting/updateVersion.vue

@@ -49,7 +49,7 @@
 				const pages = getCurrentPages();
 				// console.log(pages);
 				if(pages.length == 2) {
-					this.$u.route('/pageA/login/login');
+					this.$u.route('/pageA/welcome/welcome');
 				} else {
 					uni.navigateBack();
 				}