Browse Source

fix:1.解决了点击查看后,图标右上角数字不变化的问题 2.发现了代码中将message和announcement混淆的情况

DingXiaoYu 4 years ago
parent
commit
c3d7604dbb
2 changed files with 5 additions and 3 deletions
  1. 3 1
      src/components/GlobalHeader.vue
  2. 2 2
      src/store/modules/message.js

+ 3 - 1
src/components/GlobalHeader.vue

@@ -121,7 +121,9 @@ export default {
       return this.$store.getters.unReadAnnouncements;
     },
     unreadNum() {
-      return this.unReadAnnouncements.length + this.unReadMessages.length > 99 ? "99+" : this.unReadAnnouncements.length + this.unReadMessages.length + "";
+      const x = this.unReadAnnouncements === undefined ? 0 : this.unReadAnnouncements.length;
+      const y = this.unReadMessages === undefined ? 0 : this.unReadMessages.length;
+      return x + y > 99 ? "99+" : x + y + "";
     },
   },
 

+ 2 - 2
src/store/modules/message.js

@@ -17,8 +17,8 @@ const messages = {
 
   actions: {
     async fetchMessages({commit, state}, that) {
-      commit("set_messages", (await that.$apis.getUnreadAnnouncements()).data.data);
-      commit("set_announcements", (await that.$apis.getUnreadMessages()).data.data);
+      commit("set_messages", (await that.$apis.getUnreadMessages()).data.data);
+      commit("set_announcements", (await that.$apis.getUnreadAnnouncements()).data.data);
     }
   },