v3.5.1 版本更新

apps/admin-web/src/layouts/AdminLayout.tsx

@@ -23,7 +23,7 @@ import {
 import { hasAnySystemSettingsPermission } from '@dukang/shared-types';
 import { clearAuth, request, type HqProfile } from '../lib/api';
 import { bindAdminEllipsisTitle } from '../lib/ellipsis-title';
-import { PACKAGE_AUDIT_CHANGED_EVENT } from '../lib/admin-events';
+import { AUDIT_NOTICE_CHANGED_EVENT, PACKAGE_AUDIT_CHANGED_EVENT } from '../lib/admin-events';
 
 const { Header, Sider, Content } = Layout;
 
@@ -61,7 +61,7 @@ const MENU_ITEMS: MenuProps['items'] = [
     label: '门店',
     children: [
       { key: '/stores', label: '门店列表' },
-      { key: '/store-package-audits', label: '套餐审核' },
+      { key: '/store-package-audits', label: '审核通知' },
       { key: '/store-ratings', label: '门店评价' },
       { key: '/store-categories', label: '门店分类' },
       { key: '/store-accounts', label: '门店账户' },
@@ -244,14 +244,14 @@ function filterMenuItems(items: MenuProps['items'], permissionKeys: string[]): M
     .filter(Boolean) as MenuProps['items'];
 }
 
-function attachPackageAuditBadge(items: MenuProps['items'], pendingCount: number): MenuProps['items'] {
+function attachAuditBadge(items: MenuProps['items'], pendingCount: number): MenuProps['items'] {
   if (!items) return items;
   return items.map((item) => {
     if (!item || typeof item !== 'object' || !('key' in item)) return item;
     if ('children' in item && Array.isArray(item.children)) {
       return {
         ...item,
-        children: attachPackageAuditBadge(item.children as MenuProps['items'], pendingCount),
+        children: attachAuditBadge(item.children as MenuProps['items'], pendingCount),
       } as MenuItem;
     }
     if (String(item.key) === '/store-package-audits') {
@@ -259,7 +259,7 @@ function attachPackageAuditBadge(items: MenuProps['items'], pendingCount: number
         ...item,
         label: (
           <span style={{ display: 'inline-flex', alignItems: 'center', gap: 6 }}>
-            套餐审核
+            审核通知
             {pendingCount > 0 && <Badge count={pendingCount} size="small" />}
           </span>
         ),
@@ -276,11 +276,14 @@ export default function AdminLayout() {
   const location = useLocation();
   const contentRef = useRef<HTMLDivElement>(null);
   const [profile, setProfile] = useState<HqProfile | null>(null);
-  const [packagePendingCount, setPackagePendingCount] = useState(0);
+  const [auditPendingCount, setAuditPendingCount] = useState(0);
 
-  function refreshPackagePendingCount() {
-    request<{ pendingCount: number }>('/admin/store-package-audits/summary')
-      .then((data) => setPackagePendingCount(data.pendingCount ?? 0))
+  function refreshAuditPendingCount() {
+    Promise.all([
+      request<{ pendingCount: number }>('/admin/store-package-audits/summary').catch(() => ({ pendingCount: 0 })),
+      request<{ pendingCount: number; packagePendingCount?: number }>('/admin/store-info-change-requests/summary').catch(() => ({ pendingCount: 0 })),
+    ])
+      .then(([pkg, info]) => setAuditPendingCount((pkg.pendingCount ?? 0) + (info.pendingCount ?? 0)))
       .catch(() => {});
   }
 
@@ -289,13 +292,17 @@ export default function AdminLayout() {
   }, []);
 
   useEffect(() => {
-    refreshPackagePendingCount();
+    refreshAuditPendingCount();
   }, [location.pathname]);
 
   useEffect(() => {
-    const onChanged = () => refreshPackagePendingCount();
+    const onChanged = () => refreshAuditPendingCount();
     window.addEventListener(PACKAGE_AUDIT_CHANGED_EVENT, onChanged);
-    return () => window.removeEventListener(PACKAGE_AUDIT_CHANGED_EVENT, onChanged);
+    window.addEventListener(AUDIT_NOTICE_CHANGED_EVENT, onChanged);
+    return () => {
+      window.removeEventListener(PACKAGE_AUDIT_CHANGED_EVENT, onChanged);
+      window.removeEventListener(AUDIT_NOTICE_CHANGED_EVENT, onChanged);
+    };
   }, []);
 
   useEffect(() => {
@@ -320,8 +327,8 @@ export default function AdminLayout() {
       !profile || profile.adminRole === 'SUPER_ADMIN'
         ? MENU_ITEMS
         : filterMenuItems(MENU_ITEMS, profile.permissionKeys ?? []);
-    return attachPackageAuditBadge(base, packagePendingCount);
-  }, [profile, packagePendingCount]);
+    return attachAuditBadge(base, auditPendingCount);
+  }, [profile, auditPendingCount]);
 
   return (
     <Layout style={{ height: '100vh', overflow: 'hidden' }}>