From 41eb28992ec7ce8e65fec4e1d6c553d5684c87f9 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 23 Dec 2021 21:50:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mac=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=A7=92?=
 =?UTF-8?q?=E6=A0=87=E6=8F=90=E7=A4=BA=E5=8A=A0=E4=B8=8A=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E5=86=85=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage.vue | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index b98ab14f..a1854d3a 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -40,11 +40,7 @@
                 <li @click="toggleRoute('dashboard')" :class="classNameRoute('dashboard')">
                     <i class="taskfont">&#xe6fb;</i>
                     <div class="menu-title">{{$L('仪表盘')}}</div>
-                    <Badge
-                        v-if="dashboardData.today.length > 0 || dashboardData.overdue.length > 0"
-                        class="menu-badge"
-                        :type="dashboardData.overdue.length > 0 ? 'error' : 'primary'"
-                        :count="dashboardData.today.length + dashboardData.overdue.length"></Badge>
+                    <Badge class="menu-badge" :type="dashboardData.overdue.length > 0 ? 'error' : 'primary'" :count="dashboardTotal"></Badge>
                 </li>
                 <li @click="toggleRoute('calendar')" :class="classNameRoute('calendar')">
                     <i class="taskfont">&#xe6f5;</i>
@@ -266,6 +262,10 @@ export default {
             return num;
         },
 
+        dashboardTotal() {
+            return this.dashboardData.today.length + this.dashboardData.overdue.length
+        },
+
         currentLanguage() {
             return this.languageList[this.languageType] || 'Language'
         },
@@ -316,12 +316,20 @@ export default {
         },
 
         taskId(id) {
-            id > 0 && this.$Modal.resetIndex();
+            if (id > 0) {
+                this.$Modal.resetIndex();
+            }
         },
 
-        msgAllUnread(val) {
+        msgAllUnread() {
             if (this.isElectron) {
-                this.$electron.ipcRenderer.send('setDockBadge', val);
+                this.$electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal);
+            }
+        },
+
+        dashboardTotal() {
+            if (this.isElectron) {
+                this.$electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal);
             }
         },