From ccc102fcfd2764a934f43d80b42038f688ec1ab1 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sat, 25 Jul 2020 18:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC?=
 =?UTF-8?q?=E7=9A=84=E5=88=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/message/user/MessageStream.vue | 20 +++++++++++++++-----
 vue/src/views/message/user/index.vue         |  3 +++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/vue/src/views/message/user/MessageStream.vue b/vue/src/views/message/user/MessageStream.vue
index b26f1ac..92e1989 100644
--- a/vue/src/views/message/user/MessageStream.vue
+++ b/vue/src/views/message/user/MessageStream.vue
@@ -50,18 +50,22 @@
 
 <script>
     import tablePageMixin from '@/mixins/tablePageMixin'
-    import Empty from '@/components/Empty'
     import AutoHidden from "./AutoHidden"
+    import Empty from '@/components/Empty'
     import {search, read, readAll} from "@/api/message/user"
     import {isEmpty} from "@/utils"
 
     export default {
         name: "MessageStream",
+
         mixins: [tablePageMixin],
-        components: {Empty, AutoHidden},
+
+        components: {AutoHidden, Empty},
+
         props: {
             mode: String,
         },
+
         data() {
             return {
                 searchForm: {
@@ -69,6 +73,7 @@
                 },
             }
         },
+
         computed: {
             unreadCount() {
                 return this.$store.state.message.unreadCount
@@ -77,19 +82,24 @@
                 return this.mode === 'unread' && this.unreadCount > 0
             }
         },
+
         watch: {
             mode() {
                 this.search()
             }
         },
+
         methods: {
             search() {
                 if (this.config.loading) return
+                const unread = this.mode === 'unread'
+                const currentMode = this.mode
                 this.tableData = []
                 this.config.loading = true
-                search({...this.searchForm, unread: this.mode === 'unread'})
-                    .then(({list, total, data}) => {
-                        !isEmpty(data) && this.$store.commit('message/unreadCount', data)
+                search({...this.searchForm, unread})
+                    .then(({list, total}) => {
+                        if (this.mode !== currentMode) return
+                        unread && this.$store.commit('message/unreadCount', total)
                         this.searchForm.total = total
                         this.tableData = this.transformList(list)
                     })
diff --git a/vue/src/views/message/user/index.vue b/vue/src/views/message/user/index.vue
index 05ab79d..cb3d44a 100644
--- a/vue/src/views/message/user/index.vue
+++ b/vue/src/views/message/user/index.vue
@@ -14,13 +14,16 @@
 
     export default {
         name: "userMessage",
+
         components: {MessageStream},
+
         data() {
             return {
                 tabs: [{label: '未读消息', name: 'unread'}, {label: '已读消息', name: 'read'}],
                 activeTab: 'unread',
             }
         },
+
         computed: {
             tabPosition() {
                 return this.$store.state.app.device === 'pc' ? 'left' : 'top'