theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/297
This commit is contained in:
hansu 2020-08-25 12:21:55 +08:00
commit 81955085b5
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
App.vue
View File

@ -29,6 +29,9 @@
}, },
onShow(){ onShow(){
this.getVersion(); this.getVersion();
},
onLoad() {
}, },
onHide(){ onHide(){
@ -50,8 +53,7 @@
// console.log(res); // console.log(res);
if(res.data.app_version != this.$app_version) { if(res.data.app_version != this.$app_version) {
this.$u.route('/pageE/setting/updateVersion', { this.$u.route('/pageE/setting/updateVersion', {
status: res.data.is_focus_upgrade, status: res.data.is_focus_upgrade
type: 'auto'
}); });
} }
}) })

6
pageE/setting/updateVersion.vue
View File

@ -23,8 +23,6 @@
}, },
onLoad(option) { onLoad(option) {
this.is_focus_upgrade = option.status == 1 ? false : true; this.is_focus_upgrade = option.status == 1 ? false : true;
// type manual 从检查更新页面过来 auto 从app过来
this.isAutoUpdate = option.type == 'manual' ? false : true;
}, },
onReady() { onReady() {
this.show = true; this.show = true;
@ -48,7 +46,9 @@
// #endif // #endif
}, },
closeModal() { closeModal() {
if(isAutoUpdate) { const pages = getCurrentPages();
// console.log(pages);
if(pages.length == 2) {
this.$u.route('/pageA/login/login'); this.$u.route('/pageA/login/login');
} else { } else {
uni.navigateBack(); uni.navigateBack();

1
pageE/setting/version.vue
View File

@ -50,7 +50,6 @@ export default {
updateVersion() { updateVersion() {
this.$u.route('/pageE/setting/updateVersion', { this.$u.route('/pageE/setting/updateVersion', {
status: this.status, status: this.status,
type: 'manual',
}); });
} }
} }