From e3402dc8017ae6d06c487492cf86b7a3ce5b0150 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 8 Dec 2021 19:24:59 +0800
Subject: [PATCH] bug

---
 src/apps/AppAskForm/components/List.vue         |  1 +
 src/apps/AppMeetingNotice/components/detail.vue |  8 +++++++-
 src/apps/AppNotification/AppNotification.vue    |  3 +++
 src/apps/AppNotification/components/detail.vue  |  8 +++++++-
 src/apps/AppNotification/components/read.vue    | 12 +++++++++---
 src/main.js                                     | 14 ++++++++++++++
 6 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppAskForm/components/List.vue b/src/apps/AppAskForm/components/List.vue
index 421db9b0..d8180ce2 100644
--- a/src/apps/AppAskForm/components/List.vue
+++ b/src/apps/AppAskForm/components/List.vue
@@ -111,6 +111,7 @@ export default {
     }
   },
   created() {
+    this.$loading()
     this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact']).then(() => {
       this.$dict.load(['questionnaireStatus', 'questionnaireType', 'questionnaireFieldType']).then(() => {
         this.getList()
diff --git a/src/apps/AppMeetingNotice/components/detail.vue b/src/apps/AppMeetingNotice/components/detail.vue
index 0ef5ec81..304eb46c 100644
--- a/src/apps/AppMeetingNotice/components/detail.vue
+++ b/src/apps/AppMeetingNotice/components/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="detail">
+  <div class="detail" v-if="pageShow">
     <template v-if="!list">
       <div class="card">
         <header>{{ detail.title }}</header>
@@ -115,6 +115,7 @@
         detail: {},
         list: false,
         current: 0,
+        pageShow: false,
         show: false,
       }
     },
@@ -225,13 +226,18 @@
         }).then(res => {
           if (res && res.data) {
             this.detail = res.data
+            this.pageShow = true
+            this.$hideLoading()
           }
         })
       }
     },
     created() {
+      this.$loading()
       this.injectJWeixin(['sendChatMessage']).then(() => {
         this.getDetail()
+      }).catch(() => {
+        this.getDetail()
       })
     },
     mounted() {
diff --git a/src/apps/AppNotification/AppNotification.vue b/src/apps/AppNotification/AppNotification.vue
index 33279173..62e8d620 100644
--- a/src/apps/AppNotification/AppNotification.vue
+++ b/src/apps/AppNotification/AppNotification.vue
@@ -135,6 +135,7 @@ export default {
   },
 
   created() {
+    this.$loading()
     document.title = "通知公告";
     this.$dict.load("announcementStatus");
   },
@@ -256,6 +257,8 @@ export default {
           }
           this.dataList = this.current > 1 ? [...this.dataList, ...res.data.records] : res.data.records
         }
+
+        this.$hideLoading()
       })
     },
   }
diff --git a/src/apps/AppNotification/components/detail.vue b/src/apps/AppNotification/components/detail.vue
index 5ff9dfba..b3fc2b42 100644
--- a/src/apps/AppNotification/components/detail.vue
+++ b/src/apps/AppNotification/components/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="detail">
+  <div class="detail" v-if="pageShow">
     <template v-if="detailObj">
       <div class="card">
         <header>{{detailObj.title}}</header>
@@ -74,11 +74,15 @@
     data() {
       return {
         detailObj: {},
+        pageShow: false
       }
     },
     created() {
+      this.$loading()
       this.injectJWeixin(['sendChatMessage']).then(() => {
         this.getDetail()
+      }).catch(() => {
+        this.$hideLoading()
       })
     },
 
@@ -106,6 +110,8 @@
         }).then(res=>{
           if(res && res.data){
             this.detailObj = res.data;
+            this.pageShow = true
+            this.$hideLoading()
           }
         })
       },
diff --git a/src/apps/AppNotification/components/read.vue b/src/apps/AppNotification/components/read.vue
index b0d7b4ac..4dc6bfd4 100644
--- a/src/apps/AppNotification/components/read.vue
+++ b/src/apps/AppNotification/components/read.vue
@@ -16,10 +16,11 @@
 <script>
   import AiBack from "../../../components/AiBack";
   import AiTopFixed from "../../../components/AiTopFixed";
-
+  import AiOpenData from "../../../components/AiOpenData";
+  import {mapActions} from "vuex";
   export default {
     name: "read",
-    components: {AiBack, AiTopFixed},
+    components: {AiBack, AiTopFixed, AiOpenData},
     props:{
       params:[String,Number]
     },
@@ -31,9 +32,13 @@
     },
     created() {
       document.title = "接收对象";
-      this.getList();
+      this.$loading()
+      this.injectJWeixin().then(() => {
+        this.getList();
+      })
     },
     methods: {
+      ...mapActions(['previewFile', 'injectJWeixin']),
       getList() {
         this.$http.post("/app/appannouncementreader/list-unread",null,{
           params:{
@@ -42,6 +47,7 @@
         }).then(res => {
           if (res && res.data) {
             this.list = res.data;
+            this.$hideLoading()
           }
         })
       },
diff --git a/src/main.js b/src/main.js
index b9af3ee8..28503603 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,20 @@ import utils from './common/util';
 import ui from 'uview-ui'
 import apps from './apps/index'
 
+const loading = title => {
+  uni.showLoading({
+    title: title ? title : '加载中',
+    mask: true
+  })
+}
+
+const hideLoading = () => {
+  uni.hideLoading()
+}
+
+Vue.prototype.$loading = loading
+Vue.prototype.$hideLoading = hideLoading
+
 Vue.use(ui)
 Vue.use(apps)
 Vue.config.productionTip = false;