From 1e567258c5d676e953c3901778795f4c2911f5e0 Mon Sep 17 00:00:00 2001
From: mutoe <mutoe@foxmail.com>
Date: Thu, 20 Dec 2018 18:06:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(SPA):=20=E4=BF=AE=E5=A4=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA=E5=B0=8F=E7=BA=A2?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

issue #529

(cherry picked from commit d8838fb993ffb621ca51d7d0c1c00ad6fed612b4)
---
 resources/spa/src/components/FootGuide.vue     |  7 ++-----
 resources/spa/src/components/common/badge.vue  |  4 ++--
 resources/spa/src/page/message/MessageBase.vue | 18 ++++++++++++++++++
 resources/spa/src/page/message/MessageHome.vue |  8 +-------
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/resources/spa/src/components/FootGuide.vue b/resources/spa/src/components/FootGuide.vue
index 0a3646e5d..421aade75 100644
--- a/resources/spa/src/components/FootGuide.vue
+++ b/resources/spa/src/components/FootGuide.vue
@@ -75,12 +75,9 @@ export default {
           state.MESSAGE.NEW_UNREAD_COUNT['news-comment-pinned'] +
           state.MESSAGE.NEW_UNREAD_COUNT['post-comment-pinned'] +
           state.MESSAGE.NEW_UNREAD_COUNT['post-pinned'] +
-          state.MESSAGE.NEW_UNREAD_COUNT.system >
-        0,
+          state.MESSAGE.NEW_UNREAD_COUNT.system > 0,
       profile: state =>
-        state.MESSAGE.NEW_UNREAD_COUNT.following +
-          state.MESSAGE.NEW_UNREAD_COUNT.mutual >
-        0,
+        state.MESSAGE.NEW_UNREAD_COUNT.following > 0,
     }),
     ...mapGetters(['hasUnreadChat']),
     hasMsg () {
diff --git a/resources/spa/src/components/common/badge.vue b/resources/spa/src/components/common/badge.vue
index ed3b4e41b..b152f1fcc 100644
--- a/resources/spa/src/components/common/badge.vue
+++ b/resources/spa/src/components/common/badge.vue
@@ -5,7 +5,7 @@
     :class="classes"
   >
     <slot />
-    <sup v-show="badge" :class="dotClasses" />
+    <sup :class="dotClasses" />
   </span>
   <span
     v-else
@@ -122,7 +122,7 @@ export default {
     position: absolute;
     transform: translateX(-50%);
     transform-origin: 0 center;
-    top: -3px; /* no */
+    top: 2px; /* no */
     right: -6px; /* no */
     height: 6px; /* no */
     width: 6px; /* no */
diff --git a/resources/spa/src/page/message/MessageBase.vue b/resources/spa/src/page/message/MessageBase.vue
index 367e61c53..6332bcaee 100644
--- a/resources/spa/src/page/message/MessageBase.vue
+++ b/resources/spa/src/page/message/MessageBase.vue
@@ -3,6 +3,7 @@
     <header class="m-box m-head-top m-lim-width m-pos-f m-main m-bb1">
       <ul class="m-box m-flex-grow1 m-aln-center m-justify-center m-flex-base0 m-head-nav">
         <RouterLink
+          class="link-item"
           tag="li"
           :to="{name: 'MessageHome'}"
           replace
@@ -13,6 +14,7 @@
           </VBadge>
         </RouterLink>
         <RouterLink
+          class="link-item"
           tag="li"
           :to="{name: 'ChatList'}"
           replace
@@ -58,3 +60,19 @@ export default {
   },
 }
 </script>
+
+<style lang="less" scoped>
+.p-message-base {
+  .link-item {
+    position: relative;
+
+    a {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 2.3em;
+      height: 1.5em;
+    }
+  }
+}
+</style>
diff --git a/resources/spa/src/page/message/MessageHome.vue b/resources/spa/src/page/message/MessageHome.vue
index b79e29862..a01bb7844 100644
--- a/resources/spa/src/page/message/MessageHome.vue
+++ b/resources/spa/src/page/message/MessageHome.vue
@@ -116,13 +116,7 @@ export default {
       return this.newMsg.liked || 0
     },
     aCount () {
-      return (
-        ~~this.newMsg['feed-comment-pinned'] +
-        ~~this.newMsg['news-comment-pinned'] +
-        ~~this.newMsg['post-comment-pinned'] +
-        ~~this.newMsg['post-pinned'] +
-        ~~this.newMsg['group-join-pinned']
-      )
+      return 0
     },
   },
   methods: {