v3.5.3版本更新1

apps/admin-web/src/pages/StoresPage.tsx

@@ -2,6 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
   Alert,
+  Badge,
   Button,
   Checkbox,
   Descriptions,
@@ -46,6 +47,9 @@ import TencentLocPickerModal from '../components/TencentLocPickerModal';
 import AdminStorePackagesSection, {
   type AdminStorePackagesHandle,
 } from '../components/AdminStorePackagesSection';
+import StorePackageAuditPanel, {
+  auditStorePackageRequest,
+} from '../components/StorePackageAuditPanel';
 
 const CREATE_STEPS = [
   { title: '基本信息' },
@@ -270,7 +274,11 @@ export default function StoresPage() {
   const [filterPartners, setFilterPartners] = useState<PartnerOption[]>([]);
   const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detailTab, setDetailTab] = useState('basic');
   const packagesRef = useRef<AdminStorePackagesHandle>(null);
+  const [packageRejectOpen, setPackageRejectOpen] = useState(false);
+  const [packageRejectReason, setPackageRejectReason] = useState('');
+  const [packageAuditing, setPackageAuditing] = useState(false);
   const [rejectOpen, setRejectOpen] = useState(false);
   const [rejectReason, setRejectReason] = useState('');
   const [auditing, setAuditing] = useState(false);
@@ -348,13 +356,18 @@ export default function StoresPage() {
       .map((n) => ({ value: n.id, label: n.name }));
   }, [categoryTree, editCategoryParentId]);
 
-  async function openStoreDetail(row: StoreRow) {
+  async function openStoreDetail(row: StoreRow, opts?: { tab?: string }) {
     const [d, cats] = await Promise.all([
       request<Record<string, unknown>>(`/admin/stores/${row.id}`),
       request<CategoryNode[]>('/admin/store-categories').catch(() => [] as CategoryNode[]),
     ]);
     setCategoryTree(Array.isArray(cats) ? cats : []);
-    setDetail(d);
+    setDetail({
+      ...d,
+      pendingPackageAuditId: row.pendingPackageAuditId ?? d.pendingPackageAuditId,
+      pendingInfoChangeId: row.pendingInfoChangeId ?? d.pendingInfoChangeId,
+    });
+    setDetailTab(opts?.tab || 'basic');
     const category = d.category && typeof d.category === 'object'
       ? (d.category as { id?: string; parentId?: string | null })
       : null;
@@ -776,22 +789,13 @@ export default function StoresPage() {
           <Button type="link" size="small" onClick={() => void openStoreDetail(row)}>详情</Button>
           <Button type="link" size="small" onClick={() => navigate(`/store-ratings?storeId=${row.id}`)}>评价</Button>
           {row.pendingPackageAuditId ? (
-            <>
-              <Button
-                type="link"
-                size="small"
-                onClick={() => navigate(`/store-package-audits?requestId=${row.pendingPackageAuditId}`)}
-              >
-                审核套餐
-              </Button>
-              <Button
-                type="link"
-                size="small"
-                onClick={() => navigate(`/store-package-audits?requestId=${row.pendingPackageAuditId}`)}
-              >
-                对比
-              </Button>
-            </>
+            <Button
+              type="link"
+              size="small"
+              onClick={() => void openStoreDetail(row, { tab: 'packages' })}
+            >
+              审核套餐
+            </Button>
           ) : null}
           {row.pendingInfoChangeId ? (
             <>
@@ -903,7 +907,7 @@ export default function StoresPage() {
           },
         }}
       />
-      <Drawer title="门店详情" width={760} open={drawerOpen} onClose={() => setDrawerOpen(false)}
+      <Drawer title="门店详情" width={880} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={detail && (
           <Space wrap>
             {String(detail.auditStatus || '') === 'PENDING' || String(detail.auditStatus || '') === 'REJECTED' ? (
@@ -940,6 +944,41 @@ export default function StoresPage() {
                 </Button>
               </>
             ) : null}
+            {detail.pendingPackageAuditId ? (
+              <>
+                <Button
+                  type="primary"
+                  ghost
+                  loading={packageAuditing}
+                  onClick={async () => {
+                    setPackageAuditing(true);
+                    try {
+                      await auditStorePackageRequest(String(detail.pendingPackageAuditId), 'APPROVE');
+                      message.success('套餐已通过');
+                      setDetail({ ...detail, pendingPackageAuditId: null });
+                      void reload();
+                    } catch (e) {
+                      message.error(e instanceof Error ? e.message : '套餐审核失败');
+                    } finally {
+                      setPackageAuditing(false);
+                    }
+                  }}
+                >
+                  通过套餐
+                </Button>
+                <Button
+                  danger
+                  ghost
+                  loading={packageAuditing}
+                  onClick={() => {
+                    setPackageRejectReason('');
+                    setPackageRejectOpen(true);
+                  }}
+                >
+                  驳回套餐
+                </Button>
+              </>
+            ) : null}
             <Select value={String(detail.status)} style={{ width: 120 }}
               options={Object.entries(STORE_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
               onChange={async (status) => {
@@ -954,6 +993,8 @@ export default function StoresPage() {
         {detail && (
           <Form form={editForm} layout="vertical">
             <Tabs
+              activeKey={detailTab}
+              onChange={setDetailTab}
               destroyInactiveTabPane={false}
               items={[
                 {
@@ -1202,15 +1243,76 @@ export default function StoresPage() {
                 },
                 {
                   key: 'packages',
-                  label: '套餐',
+                  label: detail.pendingPackageAuditId ? (
+                    <Badge dot offset={[4, 0]}>
+                      套餐
+                    </Badge>
+                  ) : (
+                    '套餐'
+                  ),
                   forceRender: true,
-                  children: <AdminStorePackagesSection ref={packagesRef} storeId={String(detail.id)} />,
+                  children: (
+                    <>
+                      {detail.pendingPackageAuditId ? (
+                        <div style={{ marginBottom: 24 }}>
+                          <Typography.Title level={5} style={{ marginTop: 0 }}>
+                            待审核套餐变更
+                          </Typography.Title>
+                          <StorePackageAuditPanel
+                            requestId={String(detail.pendingPackageAuditId)}
+                            showActions
+                            onAudited={() => {
+                              setDetail({ ...detail, pendingPackageAuditId: null });
+                              void reload();
+                            }}
+                          />
+                        </div>
+                      ) : null}
+                      <AdminStorePackagesSection ref={packagesRef} storeId={String(detail.id)} />
+                    </>
+                  ),
                 },
               ]}
             />
           </Form>
         )}
       </Drawer>
+      <Modal
+        title="驳回套餐变更"
+        open={packageRejectOpen}
+        confirmLoading={packageAuditing}
+        onCancel={() => setPackageRejectOpen(false)}
+        onOk={async () => {
+          if (!detail?.pendingPackageAuditId) return;
+          if (!packageRejectReason.trim()) {
+            message.warning('请填写驳回原因');
+            return;
+          }
+          setPackageAuditing(true);
+          try {
+            await auditStorePackageRequest(
+              String(detail.pendingPackageAuditId),
+              'REJECT',
+              packageRejectReason.trim(),
+            );
+            message.success('套餐已驳回');
+            setPackageRejectOpen(false);
+            setDetail({ ...detail, pendingPackageAuditId: null });
+            void reload();
+          } catch (e) {
+            message.error(e instanceof Error ? e.message : '套餐驳回失败');
+          } finally {
+            setPackageAuditing(false);
+          }
+        }}
+      >
+        <Input.TextArea
+          rows={3}
+          value={packageRejectReason}
+          placeholder="驳回原因"
+          onChange={(e) => setPackageRejectReason(e.target.value)}
+        />
+      </Modal>
       <Modal
         title="新建门店"
         open={createOpen}