From 7baa37ccd17192743e876045d569eb88b38eb840 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 25 Jan 2022 23:06:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20macOS=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E4=B8=8D=E5=8A=A0=E8=BD=BD=E8=A7=92=E6=A0=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage.vue         | 32 +++++++++-----------
 resources/assets/sass/pages/page-manage.scss |  7 +++++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index d0e2123c..96640a98 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -214,6 +214,7 @@
             @on-click="show768Menu=!show768Menu">
             <div class="manage-mini-menu">
                 <Icon :type="show768Menu ? 'md-close' : 'md-menu'" />
+                <Badge :count="unreadTotal"/>
             </div>
         </DragBallComponent>
     </div>
@@ -357,6 +358,10 @@ export default {
             return this.dashboardTask.today.length + this.dashboardTask.overdue.length
         },
 
+        unreadTotal() {
+            return this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber;
+        },
+
         currentLanguage() {
             return this.languageList[this.languageType] || 'Language'
         },
@@ -421,24 +426,6 @@ export default {
             }
         },
 
-        msgAllUnread() {
-            if (this.$Electron) {
-                this.$Electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber);
-            }
-        },
-
-        dashboardTotal() {
-            if (this.$Electron) {
-                this.$Electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber);
-            }
-        },
-
-        reportUnreadNumber() {
-            if (this.$Electron) {
-                this.$Electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber);
-            }
-        },
-
         projectKeyValue(val) {
             if (val == '') {
                 return;
@@ -468,6 +455,15 @@ export default {
             }, 5000)
         },
 
+        unreadTotal: {
+            handler(num) {
+                if (this.$Electron) {
+                    this.$Electron.ipcRenderer.send('setDockBadge', num);
+                }
+            },
+            immediate: true
+        },
+
         wsMsg: {
             handler(info) {
                 const {type, action} = info;
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index 3da3ef2f..46abc6e4 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -298,6 +298,13 @@
     }
     .manage-mini-menu {
         display: none;
+        position: relative;
+        .ivu-badge {
+            position: absolute;
+            top: -6px;
+            left: 30px;
+            transform: scale(0.9);
+        }
     }
 }