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模态框组件
3. 新增压窗屏组件,可以在APP上以弹窗的形式遮盖导航栏和底部tabbar
`, + 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', }); } }