Merge remote-tracking branch 'origin/main' into main

packages/app/src/pages/messages/index.vue

@@ -156,9 +156,16 @@ const getReadCount = async () => {
     //      })
     //    }
     //  })
-    tabs.value = tabs.value.map((a, i) => {
-      return { ...a, badgeProps: { isDot: true, right: '-8px', hidden: data[i]?.quantity == 0 } }
-    })
+    tabs.value = tabs.value.map((a) => {
+      const match = data.find(d => d.messageType === a.value);
+      return {
+        ...a,
+        badgeProps: {
+          ...a.badgeProps,
+          hidden: !match || match.quantity === 0,
+        },
+      };
+    });
   })
 }
 const handleQ = async (msg, res) => {