From 7ee5a3ea49a2a25777bd79f713522618806abb45 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 9 Sep 2023 09:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                 | 2 ++
 pages/oaHome/oaHome.vue | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

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