From 86be8412e6177ba72fdb72549eace0b4ee2e9044 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Fri, 10 Mar 2023 12:25:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A4=84=E7=90=86=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/NavBar/index.vue | 20 +++++++++++++++-----
 src/layouts/index.vue                   | 15 +++++++++------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue
index ace7b02..da66aca 100644
--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -37,9 +37,10 @@
         <avatar></avatar>
       </div>
       <el-popover
+        v-if="messageCount != 0"
         placement="top-start"
         width="300"
-        :trigger="messageCount == 0 ? 'none' : 'hover'"
+        trigger="hover"
         popper-class="message-pop"
       >
         <div class="messageBox">
@@ -71,6 +72,12 @@
           </el-badge>
         </template>
       </el-popover>
+      <el-badge v-else :value="0" :class-name="'badge'">
+        <div class="user">
+          <img src="~@/assets/img/DataCenter/message.png" alt />
+          消息
+        </div>
+      </el-badge>
       <div class="user" @click="$router.push('/home')">
         <img src="~@/assets/img/DataCenter/backhome.png" alt />
         <span>返回首页</span>
@@ -147,10 +154,13 @@ export default {
     }),
   },
   watch: {
-    curSelectedIndex(v) {
-      this.messageList = []
-      this.pageNum = 1
-      this.getMessage()
+    curSelectedIndex: {
+      handler(v) {
+        this.messageList = []
+        this.pageNum = 1
+        this.getMessage()
+      },
+      immediate: true,
     },
     getMessageFlag(v) {
       if (v) {
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index fea4a65..1e37b60 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -322,15 +322,18 @@ export default {
     },
   },
   watch: {
-    curSelectedIndex(v) {
-      this.getRefuteMessage()
+    curSelectedIndex: {
+      handler(v) {
+        this.getRefuteMessage()
+      },
+      immediate: false,
     },
   },
   created() {
     this.selectedIndex = sessionStorage.getItem("selectedIndex") || ""
     this.curSelectedIndex = String(this.selectedIndex) ? this.selectedIndex : ""
     if (this.curSelectedIndex) {
-      this.getRefuteMessage()
+      // this.getRefuteMessage()
     }
   },
   mounted() {
@@ -344,9 +347,9 @@ export default {
         : ""
     }
     // console.log(this.curSelectedIndex)
-    if (this.curSelectedIndex) {
-      this.getRefuteMessage()
-    }
+    // if (this.curSelectedIndex) {
+    //   this.getRefuteMessage()
+    // }
     this.$nextTick(() => {
       window.addEventListener(
         "storage",
-- 
2.22.0