diff --git a/App.vue b/App.vue index ba75e15..9f05fc1 100644 --- a/App.vue +++ b/App.vue @@ -42,11 +42,13 @@ // uni.$emit('home_initUserInfo', data); return ; }catch(e){ + this.$isResolve() console.log(e); } } console.log('App Launch') this.$store.dispatch('initConfig'); + this.$isResolve() try { if (!this.$store.state.app.token) uni.reLaunch({ url: '/pages/oaLogin/oaLogin' diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index c915971..114c476 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -582,9 +582,10 @@ export default { this.myOaInfo = res; }, }, - onPullDownRefresh () { - this.getOrderList(); - this.$store.dispatch('initConfig'); + async onPullDownRefresh () { + await this.getOrderList(); + await this.$store.dispatch('initConfig'); + await this.getApproveList(); // this.getIndexList() uni.stopPullDownRefresh(); },