Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppNotification/AppNotification.vue

@@ -135,7 +135,6 @@ export default {
   },
 
   created() {
-    this.$loading()
     document.title = "通知公告";
     this.$dict.load("announcementStatus");
   },
@@ -153,8 +152,11 @@ export default {
         this.showList = false;
       }
       this.current = 1;
+      this.$loading()
       this.injectJWeixin(['sendChatMessage']).then(() => {
         this.getList();
+      }).catch(() => {
+        this.$hideLoading()
       })
     },
     emitReachBottom() {
@@ -258,6 +260,8 @@ export default {
           this.dataList = this.current > 1 ? [...this.dataList, ...res.data.records] : res.data.records
         }
 
+        this.$hideLoading()
+      }).catch(() => {
         this.$hideLoading()
       })
     },