From 29e8bf89570a00482d593dbdfca0886000356c35 Mon Sep 17 00:00:00 2001
From: wanglei <1336977847@qq.com>
Date: Mon, 13 Dec 2021 13:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppNotification/AppNotification.vue  | 41 ++++++++-----------
 .../AppNotification/{components => }/add.vue  |  0
 src/apps/AppNotification/components/index.js  |  3 --
 .../{components => }/detail.vue               |  0
 .../AppNotification/{components => }/read.vue |  0
 5 files changed, 18 insertions(+), 26 deletions(-)
 rename src/apps/AppNotification/{components => }/add.vue (100%)
 delete mode 100644 src/apps/AppNotification/components/index.js
 rename src/apps/AppNotification/{components => }/detail.vue (100%)
 rename src/apps/AppNotification/{components => }/read.vue (100%)

diff --git a/src/apps/AppNotification/AppNotification.vue b/src/apps/AppNotification/AppNotification.vue
index 7c24ff20..04a97ba5 100644
--- a/src/apps/AppNotification/AppNotification.vue
+++ b/src/apps/AppNotification/AppNotification.vue
@@ -68,7 +68,9 @@
 </template>
 
 <script>
-import {add, detail, read} from "./components";
+import add from "./add";
+import detail from "./detail";
+import read from "./read";
 import {mapActions} from "vuex";
 
 export default {
@@ -135,30 +137,23 @@ export default {
     this.$dict.load("announcementStatus");
   },
 
+  onShow() {
+    this.current = 1;
+    this.$loading()
+    this.injectJWeixin(['sendChatMessage']).then(() => {
+      this.getList();
+    }).catch(() => {
+      this.$hideLoading()
+    })
+  },
+
+  onReachBottom() {
+    this.current++;
+    this.getList();
+  },
+
   methods: {
     ...mapActions(['injectJWeixin']),
-    emitShow() {
-      const {id} = this.$route.query
-      if (id) {
-        this.comp = "detail";
-        this.params = {
-          id,
-          flag: true
-        };
-        this.showList = false;
-      }
-      this.current = 1;
-      this.$loading()
-      this.injectJWeixin(['sendChatMessage']).then(() => {
-        this.getList();
-      }).catch(() => {
-        this.$hideLoading()
-      })
-    },
-    emitReachBottom() {
-      this.current = this.current + 1;
-      this.getList()
-    },
     changeState() {
       this.$http.post(this.content == '删除' ? '/app/appannouncement/delete' : "/app/appannouncement/update-status", null, {
         params: {
diff --git a/src/apps/AppNotification/components/add.vue b/src/apps/AppNotification/add.vue
similarity index 100%
rename from src/apps/AppNotification/components/add.vue
rename to src/apps/AppNotification/add.vue
diff --git a/src/apps/AppNotification/components/index.js b/src/apps/AppNotification/components/index.js
deleted file mode 100644
index 752962d4..00000000
--- a/src/apps/AppNotification/components/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export {default as add} from "./add"
-export {default as detail} from "./detail"
-export {default as read} from "./read"
diff --git a/src/apps/AppNotification/components/detail.vue b/src/apps/AppNotification/detail.vue
similarity index 100%
rename from src/apps/AppNotification/components/detail.vue
rename to src/apps/AppNotification/detail.vue
diff --git a/src/apps/AppNotification/components/read.vue b/src/apps/AppNotification/read.vue
similarity index 100%
rename from src/apps/AppNotification/components/read.vue
rename to src/apps/AppNotification/read.vue