From 3f621a75ad3d06f0e97b0dea7155f50bd8fab33d Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Tue, 4 Aug 2026 11:21:30 +0800
Subject: [PATCH 01/25] =?UTF-8?q?fix:=20=E5=AF=B9=E6=8E=A5=E8=B5=9B?=
 =?UTF-8?q?=E4=BA=8B=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EventDetailModal.module.less   |  26 ++++
 .../list/components/EventDetailModal.tsx      | 128 ++++++++++--------
 .../list/components/EventRegulationModal.tsx  |   2 +-
 src/pages/events/list/index.tsx               |  12 +-
 .../events/list/model/useEventListColumns.ts  |   2 +-
 5 files changed, 105 insertions(+), 65 deletions(-)

diff --git a/src/pages/events/list/components/EventDetailModal.module.less b/src/pages/events/list/components/EventDetailModal.module.less
index 7d4652f..c27b15f 100644
--- a/src/pages/events/list/components/EventDetailModal.module.less
+++ b/src/pages/events/list/components/EventDetailModal.module.less
@@ -65,4 +65,30 @@
     font-size: 13px;
     color: rgba(0, 0, 0, 0.65);
   }
+
+  .idImageGrid {
+    display: flex;
+    gap: 8px;
+    flex-wrap: wrap;
+  }
+
+  .idImageCell {
+    width: 128px;
+    height: 82px;
+    border-radius: 4px;
+    overflow: hidden;
+    border: 1px solid #f0f0f0;
+    flex-shrink: 0;
+
+    :global(.ant-image) {
+      width: 100%;
+      height: 100%;
+
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
+    }
+  }
 }
diff --git a/src/pages/events/list/components/EventDetailModal.tsx b/src/pages/events/list/components/EventDetailModal.tsx
index 12c4f43..224f9cb 100644
--- a/src/pages/events/list/components/EventDetailModal.tsx
+++ b/src/pages/events/list/components/EventDetailModal.tsx
@@ -1,6 +1,5 @@
 import { defineComponent, reactive, ref } from 'vue';
-import { Modal, Descriptions, Image, Table, Pagination, Space, Spin } from 'ant-design-vue';
-import { EyeOutlined } from '@ant-design/icons-vue';
+import { Modal, Descriptions, Image, Table, Pagination, Spin } from 'ant-design-vue';
 import { message } from 'ant-design-vue';
 import {
   getEventDetail,
@@ -30,23 +29,19 @@ const formatGender = (v: string) => GENDER_MAP[v] ?? v;
 
 const PAGE_SIZE = 10;
 
-/** 渲染身份证图片 */
+/** 渲染身份证图片（cover 填充，与封面显示方式一致） */
 const renderIdImages = (imgList: string[], singleImg: string) => {
   const urls = imgList.length > 0 ? imgList : singleImg ? [singleImg] : [];
   if (urls.length === 0) return <span>-</span>;
   return (
     <Image.PreviewGroup>
-      <Space>
+      <div class={styles.idImageGrid}>
         {urls.map((url) => (
-          <Image
-            key={url}
-            width={48}
-            height={32}
-            src={url}
-            v-slots={{ previewMask: () => <EyeOutlined /> }}
-          />
+          <div class={styles.idImageCell}>
+            <Image src={url} />
+          </div>
         ))}
-      </Space>
+      </div>
     </Image.PreviewGroup>
   );
 };
@@ -62,11 +57,18 @@ const PLAYER_COLUMNS = [
     customRender: ({ text }: { text: string }) => formatGender(text),
   },
   { title: '手机号', dataIndex: 'phone', key: 'phone', width: 130 },
-  { title: '证件号', dataIndex: 'idCard', key: 'idCard', width: 180 },
+  {
+    title: '证件号',
+    dataIndex: 'idCard',
+    key: 'idCard',
+    width: 180,
+    customRender: ({ record }: { record?: TournamentAdminInfoSignupVO }) =>
+      record?.idCard ? record.idCard : <span>-</span>,
+  },
   {
     title: '证件图片',
     key: 'idCardImgs',
-    width: 180,
+    width: 280,
     customRender: ({ record }: { record?: TournamentAdminInfoSignupVO }) =>
       record ? renderIdImages(record.idCardImgList || [], record.idCardImg || '') : <span>-</span>,
   },
@@ -221,59 +223,69 @@ export default defineComponent({
             </div>
 
             {/* ===== 封面 ===== */}
-            <div class={styles.section}>
-              <div class={styles.sectionTitle}>封面</div>
-              <Image src={detail.value.img} />
-            </div>
+            {detail.value.img && (
+              <div class={styles.section}>
+                <div class={styles.sectionTitle}>封面</div>
+                <Image style={{ maxHeight: '380px' }} src={detail.value.img} />
+              </div>
+            )}
 
             {/* ===== 赛事公告 ===== */}
-            <div class={styles.section}>
-              <div class={styles.sectionTitle}>赛事公告</div>
-              <div class={styles.textBlock}>{detail.value.notice}</div>
-            </div>
+            {detail.value.notice && (
+              <div class={styles.section}>
+                <div class={styles.sectionTitle}>赛事公告</div>
+                <div class={styles.textBlock}>{detail.value.notice}</div>
+              </div>
+            )}
 
             {/* ===== 组别信息 ===== */}
-            <div class={styles.section}>
-              <div class={styles.sectionTitle}>组别信息</div>
-              {detail.value.categoryList.map((cat: InnerCategoryVO) => (
-                <div key={cat.id} class={styles.group}>
-                  <div class={styles.groupTitle}>
-                    {cat.name}（{CATEGORY_TYPE_MAP[cat.type] ?? cat.type}）
-                  </div>
-                  <Table
-                    columns={PLAYER_COLUMNS}
-                    dataSource={categoryPlayers.value[cat.id] || []}
-                    loading={categoryPlayerLoading.value[cat.id]}
-                    scroll={{ x: 'max-content', y: 200 }}
-                    size="small"
-                    pagination={false}
-                    bordered
-                  />
-                  <div class={styles.paginationRow}>
-                    <Pagination
-                      current={categoryPlayerPage.value[cat.id] || 1}
-                      pageSize={PAGE_SIZE}
-                      total={categoryPlayerTotal.value[cat.id] || 0}
-                      showSizeChanger={false}
+            {detail.value.categoryList && detail.value.categoryList.length > 0 && (
+              <div class={styles.section}>
+                <div class={styles.sectionTitle}>组别信息</div>
+                {detail.value.categoryList.map((cat: InnerCategoryVO) => (
+                  <div key={cat.id} class={styles.group}>
+                    <div class={styles.groupTitle}>
+                      {cat.name}（{CATEGORY_TYPE_MAP[cat.type] ?? cat.type}）
+                    </div>
+                    <Table
+                      columns={PLAYER_COLUMNS}
+                      dataSource={categoryPlayers.value[cat.id] || []}
+                      loading={categoryPlayerLoading.value[cat.id]}
+                      scroll={{ x: 'max-content', y: 200 }}
                       size="small"
-                      onChange={(page: number) => handlePlayerPageChange(cat.id, page)}
+                      pagination={false}
+                      bordered
                     />
-                  </div>
-                </div>
-              ))}
-            </div>
-
-            {/* ===== 分组信息 ===== */}
-            <div class={styles.section}>
-              <div class={styles.sectionTitle}>分组信息</div>
-              <div class={styles.divisionList}>
-                {detail.value.groupInfoList.map((d: string) => (
-                  <div key={d} class={styles.divisionItem}>
-                    {d}
+                    {categoryPlayerTotal.value[cat.id] > 0 && (
+                      <div class={styles.paginationRow}>
+                        <Pagination
+                          current={categoryPlayerPage.value[cat.id] || 1}
+                          pageSize={PAGE_SIZE}
+                          total={categoryPlayerTotal.value[cat.id] || 0}
+                          showSizeChanger={false}
+                          size="small"
+                          onChange={(page: number) => handlePlayerPageChange(cat.id, page)}
+                        />
+                      </div>
+                    )}
                   </div>
                 ))}
               </div>
-            </div>
+            )}
+
+            {/* ===== 分组信息 ===== */}
+            {detail.value.groupInfoList && detail.value.groupInfoList.length > 0 && (
+              <div class={styles.section}>
+                <div class={styles.sectionTitle}>分组信息</div>
+                <div class={styles.divisionList}>
+                  {detail.value.groupInfoList.map((d: string) => (
+                    <div key={d} class={styles.divisionItem}>
+                      {d}
+                    </div>
+                  ))}
+                </div>
+              </div>
+            )}
           </>
         ) : null}
       </Modal>
diff --git a/src/pages/events/list/components/EventRegulationModal.tsx b/src/pages/events/list/components/EventRegulationModal.tsx
index 6ff5289..ff09772 100644
--- a/src/pages/events/list/components/EventRegulationModal.tsx
+++ b/src/pages/events/list/components/EventRegulationModal.tsx
@@ -60,7 +60,7 @@ export default defineComponent({
         destroyOnClose
         wrapClassName={styles.eventRegulationModalMain}
       >
-        <Spin spinning={loading.value}>
+        <Spin spinning={loading.value} size="large">
           <div style={{ minHeight: loading.value ? '200px' : undefined }}>
             {ruleData.value ? (
               <>
diff --git a/src/pages/events/list/index.tsx b/src/pages/events/list/index.tsx
index 22d49b0..f0967c8 100644
--- a/src/pages/events/list/index.tsx
+++ b/src/pages/events/list/index.tsx
@@ -19,7 +19,7 @@ import {
   ID_CARD_IMAGE_OPTIONS,
 } from './model/useEventListModel';
 import { useEventListColumns } from './model/useEventListColumns';
-import { regionOptions } from '@/utils/areaData';
+import { getProvinceCityCascaderOptions } from '@/utils/areaData';
 import { useContainerSize } from '@/hooks';
 import EventRegulationModal from './components/EventRegulationModal';
 import EventDetailModal from './components/EventDetailModal';
@@ -64,6 +64,9 @@ export default defineComponent({
     const { columns } = useEventListColumns();
     const { containerRef, height } = useContainerSize();
 
+    /** 省市两级 Cascader 数据（无区） */
+    const provinceCityOptions = getProvinceCityCascaderOptions();
+
     /** 渲染赛事名称（超长省略 + Tooltip） */
     const renderName = (text: string) => {
       const maxLen = 15;
@@ -239,14 +242,13 @@ export default defineComponent({
                 onUpdate:value={(val: any) => (filterForm.idCardImg = val || '')}
               />
             </Form.Item>
-            <Form.Item label="省市区" name="region">
+            <Form.Item label="省市区域" name="region">
               <Cascader
                 value={filterForm.region as any}
-                options={regionOptions}
+                options={provinceCityOptions}
                 style={{ width: '220px' }}
-                placeholder="请选择省市区"
+                placeholder="请选择城市"
                 allowClear
-                changeOnSelect
                 onUpdate:value={(val: any) => (filterForm.region = val || [])}
               />
             </Form.Item>
diff --git a/src/pages/events/list/model/useEventListColumns.ts b/src/pages/events/list/model/useEventListColumns.ts
index 4c9e6fe..e0e2276 100644
--- a/src/pages/events/list/model/useEventListColumns.ts
+++ b/src/pages/events/list/model/useEventListColumns.ts
@@ -38,7 +38,7 @@ export function useEventListColumns() {
         `${record.startTimeBegin} 至 ${record.startTimeEnd}`,
     },
     {
-      title: '省市区',
+      title: '省市区域',
       dataIndex: 'venueArea',
       key: 'venueArea',
       width: 200,
-- 
2.52.0


From 256ba7bd0af13f239cce198f48d6b89252e82d48 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Tue, 4 Aug 2026 11:44:47 +0800
Subject: [PATCH 02/25] =?UTF-8?q?fix:=20=E8=AF=A6=E6=83=85table=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EventDetailModal.module.less   |  5 +++++
 .../list/components/EventDetailModal.tsx      | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/pages/events/list/components/EventDetailModal.module.less b/src/pages/events/list/components/EventDetailModal.module.less
index c27b15f..60753f1 100644
--- a/src/pages/events/list/components/EventDetailModal.module.less
+++ b/src/pages/events/list/components/EventDetailModal.module.less
@@ -49,6 +49,11 @@
     font-weight: 500;
   }
 
+  .tableWrap {
+    max-height: 200px;
+    overflow-y: auto;
+  }
+
   .paginationRow {
     display: flex;
     justify-content: flex-end;
diff --git a/src/pages/events/list/components/EventDetailModal.tsx b/src/pages/events/list/components/EventDetailModal.tsx
index 224f9cb..2b35d24 100644
--- a/src/pages/events/list/components/EventDetailModal.tsx
+++ b/src/pages/events/list/components/EventDetailModal.tsx
@@ -247,15 +247,16 @@ export default defineComponent({
                     <div class={styles.groupTitle}>
                       {cat.name}（{CATEGORY_TYPE_MAP[cat.type] ?? cat.type}）
                     </div>
-                    <Table
-                      columns={PLAYER_COLUMNS}
-                      dataSource={categoryPlayers.value[cat.id] || []}
-                      loading={categoryPlayerLoading.value[cat.id]}
-                      scroll={{ x: 'max-content', y: 200 }}
-                      size="small"
-                      pagination={false}
-                      bordered
-                    />
+                    <div class={styles.tableWrap}>
+                      <Table
+                        columns={PLAYER_COLUMNS}
+                        dataSource={categoryPlayers.value[cat.id] || []}
+                        loading={categoryPlayerLoading.value[cat.id]}
+                        size="small"
+                        pagination={false}
+                        bordered
+                      />
+                    </div>
                     {categoryPlayerTotal.value[cat.id] > 0 && (
                       <div class={styles.paginationRow}>
                         <Pagination
-- 
2.52.0


From 46a2deda87b497de3d5965b1525c1d2aedd89f39 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Tue, 4 Aug 2026 13:52:54 +0800
Subject: [PATCH 03/25] =?UTF-8?q?fix:=20=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OrderDetailModal.module.less   | 21 +++++++++++++-----
 .../orders/components/OrderDetailModal.tsx    | 22 ++++++++++---------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/pages/events/orders/components/OrderDetailModal.module.less b/src/pages/events/orders/components/OrderDetailModal.module.less
index 0746a27..05743f2 100644
--- a/src/pages/events/orders/components/OrderDetailModal.module.less
+++ b/src/pages/events/orders/components/OrderDetailModal.module.less
@@ -79,6 +79,17 @@
     margin-bottom: 12px;
   }
 
+  .tableWrap {
+    max-height: 200px;
+    overflow-y: auto;
+  }
+
+  .paginationRow {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 8px;
+  }
+
   .refundSummary {
     display: flex;
     gap: 32px;
@@ -181,8 +192,8 @@
   }
 }
 
-.orderModalWrap {
-  :global(.ant-modal-body) {
-    padding-top: 16px;
-  }
-}
+// .orderModalWrap {
+//   :global(.ant-modal-body) {
+//     padding-top: 16px;
+//   }
+// }
diff --git a/src/pages/events/orders/components/OrderDetailModal.tsx b/src/pages/events/orders/components/OrderDetailModal.tsx
index 9f8e374..d1872da 100644
--- a/src/pages/events/orders/components/OrderDetailModal.tsx
+++ b/src/pages/events/orders/components/OrderDetailModal.tsx
@@ -255,16 +255,18 @@ export default defineComponent({
 
               <div class={styles.section}>
                 <div class={styles.sectionTitle}>选手信息</div>
-                <Table
-                  columns={PLAYER_COLUMNS}
-                  dataSource={players.value}
-                  loading={playersLoading.value}
-                  size="small"
-                  bordered
-                  pagination={false}
-                  scroll={{ x: 'max-content', y: 200 }}
-                />
-                <div style={{ textAlign: 'right', marginTop: 18 }}>
+                <div class={styles.tableWrap}>
+                  <Table
+                    columns={PLAYER_COLUMNS}
+                    dataSource={players.value}
+                    loading={playersLoading.value}
+                    size="small"
+                    bordered
+                    pagination={false}
+                    scroll={{ x: 'max-content' }}
+                  />
+                </div>
+                <div class={styles.paginationRow}>
                   <Pagination
                     current={playerPage.value}
                     pageSize={playerPageSize}
-- 
2.52.0


From 0a1dcb3977f3b4f0c19a4b09e16e1b6c2fda292e Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Tue, 4 Aug 2026 17:01:55 +0800
Subject: [PATCH 04/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=20banner?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E7=9B=B8=E5=85=B3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/banner/types.ts                       |   6 +-
 src/config/mock/bannerList.ts                 |  66 +-
 .../banner/components/BannerFormModal.tsx     | 785 +++++++++++-------
 src/pages/events/banner/model/services.ts     |  10 +-
 .../events/banner/model/useBannerModel.ts     |  33 +-
 src/pages/events/orders/index.tsx             |   2 +-
 src/pages/events/users/index.tsx              |  28 +-
 src/pages/events/users/model/services.ts      |  57 +-
 src/pages/events/users/model/useUserModel.ts  |  45 +-
 src/pages/finance/wallet/model/services.ts    |   4 +-
 src/pages/finance/withdraw/model/services.ts  |   6 +-
 src/utils/areaData.ts                         |  70 ++
 12 files changed, 699 insertions(+), 413 deletions(-)

diff --git a/src/api/banner/types.ts b/src/api/banner/types.ts
index b9946de..d95d867 100644
--- a/src/api/banner/types.ts
+++ b/src/api/banner/types.ts
@@ -8,12 +8,12 @@ export interface TournamentAdminBannerListVO {
   img: string;
   title: string;
   type: string;
-  linkUrl: string;
+  params: string;
   area: string;
   showTimeBegin: string;
   showTimeEnd: string;
   status: string;
-  createTime: string;
+  createDate: string;
 }
 
 /** Banner 列表查询参数 */
@@ -28,7 +28,7 @@ export interface BannerSaveParams {
   img: string;
   title: string;
   type: string;
-  linkUrl: string;
+  params: string;
   area: string;
   showTimeBegin: string;
   showTimeEnd: string;
diff --git a/src/config/mock/bannerList.ts b/src/config/mock/bannerList.ts
index ea7a532..cca6e42 100644
--- a/src/config/mock/bannerList.ts
+++ b/src/config/mock/bannerList.ts
@@ -13,12 +13,12 @@ export interface MockBannerVO {
   img: string;
   title: string;
   type: string;
-  linkUrl: string;
+  params: string;
   area: string;
   showTimeBegin: string;
   showTimeEnd: string;
   status: string;
-  createTime: string;
+  createDate: string;
 }
 
 export const MOCK_BANNER_LIST: MockBannerVO[] = [
@@ -27,143 +27,143 @@ export const MOCK_BANNER_LIST: MockBannerVO[] = [
     img: 'https://picsum.photos/seed/banner1/80/44',
     title: '2026全国青少年羽毛球锦标赛火热报名中',
     type: '1',
-    linkUrl: '',
-    area: '广东省深圳市',
+    params: 'EV20260701001',
+    area: '深圳市',
     showTimeBegin: '2026-08-01 00:00',
     showTimeEnd: '2026-08-31 23:59',
     status: '1',
-    createTime: '2026-07-20 08:00:00',
+    createDate: '2026-07-20 08:00:00',
   },
   {
     id: '2',
     img: 'https://picsum.photos/seed/banner2/80/44',
     title: '马拉松城市联赛限时优惠',
     type: '2',
-    linkUrl: 'https://example.com/marathon',
-    area: '浙江省杭州市',
+    params: 'https://example.com/marathon',
+    area: '杭州市',
     showTimeBegin: '2026-08-15 00:00',
     showTimeEnd: '2026-09-15 23:59',
     status: '1',
-    createTime: '2026-07-19 11:30:00',
+    createDate: '2026-07-19 11:30:00',
   },
   {
     id: '3',
     img: 'https://picsum.photos/seed/banner3/80/44',
     title: '健身运动会专属福利',
     type: '1',
-    linkUrl: '',
+    params: 'EV20260701003',
     area: '北京市',
     showTimeBegin: '2026-07-01 00:00',
     showTimeEnd: '2026-07-30 23:59',
     status: '1',
-    createTime: '2026-07-18 14:20:00',
+    createDate: '2026-07-18 14:20:00',
   },
   {
     id: '4',
     img: 'https://picsum.photos/seed/banner4/80/44',
     title: '平台品牌宣传活动',
     type: '2',
-    linkUrl: 'https://example.com/promo',
+    params: 'https://example.com/promo',
     area: '上海市',
     showTimeBegin: '2026-06-01 00:00',
     showTimeEnd: '2026-06-30 23:59',
     status: '0',
-    createTime: '2026-07-17 18:05:00',
+    createDate: '2026-07-17 18:05:00',
   },
   {
     id: '5',
     img: 'https://picsum.photos/seed/banner5/80/44',
     title: '2026全国青少年羽毛球锦标赛火热报名中',
     type: '1',
-    linkUrl: '',
-    area: '广东省深圳市',
+    params: 'EV20260701005',
+    area: '深圳市',
     showTimeBegin: '2026-09-01 00:00',
     showTimeEnd: '2026-09-30 23:59',
     status: '1',
-    createTime: '2026-07-16 21:15:00',
+    createDate: '2026-07-16 21:15:00',
   },
   {
     id: '6',
     img: 'https://picsum.photos/seed/banner6/80/44',
     title: '马拉松城市联赛限时优惠',
     type: '3',
-    linkUrl: '/pages/activity/detail',
-    area: '浙江省杭州市',
+    params: '/pages/activity/detail',
+    area: '杭州市',
     showTimeBegin: '2026-10-01 00:00',
     showTimeEnd: '2026-10-31 23:59',
     status: '1',
-    createTime: '2026-07-15 00:30:00',
+    createDate: '2026-07-15 00:30:00',
   },
   {
     id: '7',
     img: 'https://picsum.photos/seed/banner7/80/44',
     title: '全民健身日特别活动',
     type: '1',
-    linkUrl: '',
+    params: 'EV20260701007',
     area: '北京市',
     showTimeBegin: '2026-08-08 00:00',
     showTimeEnd: '2026-08-08 23:59',
     status: '1',
-    createTime: '2026-07-14 03:50:00',
+    createDate: '2026-07-14 03:50:00',
   },
   {
     id: '8',
     img: 'https://picsum.photos/seed/banner8/80/44',
     title: '新春运动季大促销',
     type: '2',
-    linkUrl: 'https://example.com/spring',
+    params: 'https://example.com/spring',
     area: '上海市',
     showTimeBegin: '2026-01-15 00:00',
     showTimeEnd: '2026-02-15 23:59',
     status: '0',
-    createTime: '2026-07-13 07:05:00',
+    createDate: '2026-07-13 07:05:00',
   },
   {
     id: '9',
     img: 'https://picsum.photos/seed/banner9/80/44',
     title: '2026全国青少年羽毛球锦标赛火热报名中',
-    type: '1',
-    linkUrl: '',
-    area: '广东省深圳市',
+    type: '0',
+    params: '',
+    area: '全国',
     showTimeBegin: '2026-08-01 00:00',
     showTimeEnd: '2026-08-31 23:59',
     status: '1',
-    createTime: '2026-07-12 10:25:00',
+    createDate: '2026-07-12 10:25:00',
   },
   {
     id: '10',
     img: 'https://picsum.photos/seed/banner10/80/44',
     title: '平台品牌宣传活动',
     type: '2',
-    linkUrl: 'https://example.com/brand',
-    area: '浙江省杭州市',
+    params: 'https://example.com/brand',
+    area: '杭州市',
     showTimeBegin: '2026-11-01 00:00',
     showTimeEnd: '2026-11-30 23:59',
     status: '1',
-    createTime: '2026-07-11 13:40:00',
+    createDate: '2026-07-11 13:40:00',
   },
   {
     id: '11',
     img: 'https://picsum.photos/seed/banner11/80/44',
     title: '秋季健身挑战赛',
     type: '1',
-    linkUrl: '',
+    params: 'EV20260701011',
     area: '北京市',
     showTimeBegin: '2026-09-01 00:00',
     showTimeEnd: '2026-09-30 23:59',
     status: '1',
-    createTime: '2026-07-10 17:00:00',
+    createDate: '2026-07-10 17:00:00',
   },
   {
     id: '12',
     img: 'https://picsum.photos/seed/banner12/80/44',
     title: '双十一运动装备大促',
     type: '2',
-    linkUrl: 'https://example.com/double11',
+    params: 'https://example.com/double11',
     area: '上海市',
     showTimeBegin: '2026-11-01 00:00',
     showTimeEnd: '2026-11-11 23:59',
     status: '1',
-    createTime: '2026-07-09 20:15:00',
+    createDate: '2026-07-09 20:15:00',
   },
 ];
diff --git a/src/pages/events/banner/components/BannerFormModal.tsx b/src/pages/events/banner/components/BannerFormModal.tsx
index 720971a..dc329fd 100644
--- a/src/pages/events/banner/components/BannerFormModal.tsx
+++ b/src/pages/events/banner/components/BannerFormModal.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive } from 'vue';
+import { defineComponent, ref, reactive, computed } from 'vue';
 import { useEffect, useState } from '@/hooks';
 import {
   Modal,
@@ -12,30 +12,30 @@ import {
   message,
   Spin,
 } from 'ant-design-vue';
-import { JUMP_TYPE_OPTIONS, EVENT_OPTIONS } from '../model/useBannerModel';
-import {
-  getProvinceCityCascaderOptions,
-  parseAreaToCascaderPath,
-  formatCascaderArea,
-} from '@/utils/areaData';
+import { JUMP_TYPE_OPTIONS } from '../model/useBannerModel';
+import { getProvinceCityCascaderOptions, cityNameToCascaderPath } from '@/utils/areaData';
 import { ImageCropper } from '@yp-component/root';
 import { FileImageOutlined } from '@ant-design/icons-vue';
 import { uploadFile, OssUploadType } from '@/utils/oss';
+import { getEventList, getEventDetail, type TournamentAdminVO } from '../../list/model/services';
 import dayjs from 'dayjs';
 import styles from './BannerFormModal.module.less';
 
-/** 省市两级 Cascader 选项 */
-const cascaderAreaOptions = getProvinceCityCascaderOptions();
+/** 所属区域 Cascader 选项：全国 + 省市两级 */
+const areaCascaderOptions: any[] = [
+  { value: '全国', label: '全国' },
+  ...getProvinceCityCascaderOptions(),
+];
 
 /** 默认表单数据 */
 const getDefaultForm = () => ({
   title: '',
   imageUrl: '',
   imageStatus: 'empty' as 'empty' | 'uploading' | 'success' | 'error',
-  type: '1' as '1' | '2' | '3',
+  type: '1' as '1' | '2' | '3' | '0',
   linkUrl: '',
   relatedEventId: undefined as string | undefined,
-  area: '',
+  area: '全国',
   displayTimeRange: null as [string, string] | null,
   sort: 1,
 });
@@ -47,8 +47,6 @@ const URL_MAX = 500;
 
 /** 图片上传限制：最大 10MB */
 const IMAGE_MAX_SIZE = 10 * 1024 * 1024;
-/** 裁剪比例：1053:351 = 3:1 */
-const CROP_ASPECT_RATIO = 1053 / 351;
 
 interface BannerFormModalProps {
   visible: boolean;
@@ -72,6 +70,37 @@ function base64ToFile(dataUrl: string, fileName: string): File {
   return new File([u8arr], fileName, { type: mime });
 }
 
+// ============================================================
+// 工具函数
+// ============================================================
+
+/** 从 Cascader 路径中提取城市名（最后一级），用于区域筛选 */
+function extractCityName(path: string[]): string {
+  if (!path || path.length === 0 || path[0] === '全国') return '';
+  return path[path.length - 1];
+}
+
+/** 从 Cascader 路径中提取存储用的区域字符串 */
+function extractAreaValue(path: string[]): string {
+  if (!path || path.length === 0) return '全国';
+  if (path[0] === '全国') return '全国';
+  // 直辖市路径如 ["北京市"]，普通城市如 ["广东省", "深圳市"]
+  return path[path.length - 1];
+}
+
+/** 根据跳转类型计算 parms 字段的值 */
+function buildParams(type: string, relatedEventId: string | undefined, linkUrl: string): string {
+  if (type === '1') return relatedEventId ?? '';
+  if (type === '2') return linkUrl || '';
+  if (type === '3') return linkUrl || '';
+  // type === '0' 无链接
+  return '';
+}
+
+// ============================================================
+// 组件
+// ============================================================
+
 /**
  * Banner 新增/编辑表单弹窗
  */
@@ -88,36 +117,165 @@ export default defineComponent({
     const formRef = ref<any>();
     const fileInputRef = ref<HTMLInputElement | null>(null);
     const formData = reactive(getDefaultForm());
-    /** Cascader 区域的路径数组（与 formData.area 字符串双向同步） */
-    const areaPath = ref<string[]>([]);
-    /** 是否由用户主动切换了跳转类型（跳过初始加载的 type 联动校验） */
+
+    /** Cascader 区域的路径数组：如 ["全国"]、["广东省", "深圳市"] */
+    const areaPath = ref<string[]>(['全国']);
+
+    /** 是否由用户主动切换了跳转类型 */
     const typeChanged = ref(false);
 
-    /** 裁剪弹窗状态 */
+    // ---- 裁剪弹窗状态 ----
     const [cropperVisible, setCropperVisible] = useState(false);
-    /** 待裁剪图片的本地预览 URL */
     const [uploadImageUrl, setUploadImageUrl] = useState('');
 
-    /** 根据 record 初始化表单 */
+    // ---- 赛事搜索状态 ----
+    const eventKeyword = ref('');
+    const [eventOptions, setEventOptions] = useState<{ value: string; label: string }[]>([]);
+    const [eventSearchLoading, setEventSearchLoading] = useState(false);
+    /** 编辑时加载赛事详情的独立 loading */
+    const [editLoading, setEditLoading] = useState(false);
+    /** 手动防抖计时器 */
+    let searchTimer: ReturnType<typeof setTimeout> | null = null;
+
+    /** 赛事下拉选项：第一项固定为"不关联" */
+    const eventSelectOptions = computed(() => {
+      return [{ value: '', label: '不关联' }, ...eventOptions.value];
+    });
+
+    // ---- 赛事搜索 API 调用 ----
+    const doSearch = async (keyword: string) => {
+      if (!keyword.trim()) {
+        setEventOptions([]);
+        return;
+      }
+      setEventSearchLoading(true);
+      try {
+        const cityName = extractCityName(areaPath.value);
+        const params: Record<string, string> = {
+          page: '1',
+          limit: '999',
+          name: keyword.trim(),
+        };
+        if (cityName) {
+          params.areaName = cityName;
+        }
+        const res = await getEventList(params as any);
+        if (res.code == 200) {
+          const list: TournamentAdminVO[] = res.data?.list || [];
+          setEventOptions(
+            list.map((item) => ({
+              value: item.id,
+              label: item.name,
+            })),
+          );
+        } else {
+          setEventOptions([]);
+        }
+      } catch (e) {
+        console.error('[Banner] 搜索赛事失败:', e);
+        setEventOptions([]);
+      } finally {
+        setEventSearchLoading(false);
+      }
+    };
+
+    /** 赛事搜索输入（带 350ms 手动防抖） */
+    const onEventSearch = (value: string) => {
+      eventKeyword.value = value;
+      if (searchTimer) clearTimeout(searchTimer);
+      if (!value.trim()) {
+        setEventOptions([]);
+        return;
+      }
+      searchTimer = setTimeout(() => {
+        doSearch(value);
+      }, 350);
+    };
+
+    /** 所属区域 Cascader 变化 */
+    const onAreaChange = (val: any) => {
+      const path: string[] = val || [];
+      const newArea = extractAreaValue(path);
+      areaPath.value = path;
+      formData.area = newArea;
+
+      // 切换到非"全国"区域时清空已关联赛事
+      if (newArea !== '全国') {
+        formData.relatedEventId = undefined;
+        formRef.value?.clearValidate('relatedEventId');
+      }
+
+      // 区域变化时重新搜索（如果当前有关键词）
+      if (eventKeyword.value.trim()) {
+        if (searchTimer) clearTimeout(searchTimer);
+        searchTimer = setTimeout(() => {
+          doSearch(eventKeyword.value);
+        }, 0);
+      }
+    };
+
+    // ---- 根据 record 初始化表单 ----
     const initFormFromRecord = (record: any) => {
       const fresh = getDefaultForm();
       if (!record) {
         Object.assign(formData, fresh);
-        areaPath.value = [];
+        areaPath.value = ['全国'];
+        eventKeyword.value = '';
+        setEventOptions([]);
         return;
       }
 
-      const area = record.area || record.region || '';
-      areaPath.value = parseAreaToCascaderPath(area);
+      // 区域：兼容旧格式 "广东省-深圳市"、新格式 "深圳市"、"全国"
+      const rawArea = record.area || record.region || '';
+      let cityName: string;
+      if (rawArea.includes('-')) {
+        cityName = rawArea.split('-').pop() || '全国';
+      } else {
+        cityName = rawArea || '全国';
+      }
+      areaPath.value = cityNameToCascaderPath(cityName);
+
+      // 跳转类型
+      const type = String(record.type || record.jumpType || '1');
+
+      // 关联赛事ID（编辑时从 params/linkUrl 读取）
+      let relatedEventId: string | undefined;
+      if (type === '1') {
+        const eventId = record.params || record.linkUrl || record.jumpUrl || '';
+        if (eventId) {
+          relatedEventId = eventId;
+          // 异步获取赛事名称用于回显
+          setEditLoading(true);
+          getEventDetail(eventId)
+            .then((detailRes) => {
+              if (detailRes.code == 200) {
+                const eventName = detailRes.data?.name || eventId;
+                setEventOptions([{ value: eventId, label: eventName }]);
+              }
+            })
+            .catch(() => {
+              setEventOptions([{ value: eventId, label: eventId }]);
+            })
+            .finally(() => {
+              setEditLoading(false);
+            });
+        }
+      }
+
+      eventKeyword.value = '';
+      if (type !== '1' || !relatedEventId) {
+        setEventOptions([]);
+      }
+
       Object.assign(formData, {
         ...fresh,
         title: record.title || '',
         imageUrl: record.img || record.imageUrl || '',
         imageStatus: record.img || record.imageUrl ? ('success' as const) : ('empty' as const),
-        type: String(record.type || record.jumpType || '1'),
-        linkUrl: record.linkUrl || record.jumpUrl || '',
-        relatedEventId: record.relatedEventId || undefined,
-        area,
+        type,
+        linkUrl: record.params || record.linkUrl || record.jumpUrl || '',
+        relatedEventId,
+        area: cityName,
         displayTimeRange:
           (record.showTimeBegin || record.displayStartTime) &&
           (record.showTimeEnd || record.displayEndTime)
@@ -130,10 +288,9 @@ export default defineComponent({
       });
     };
 
-    /** 监听 visible 变化重置表单 */
+    // ---- 监听 visible 变化重置表单 ----
     useEffect(() => {
       if (props.visible) {
-        // 标记首次渲染，跳过 type 联动校验
         typeChanged.value = false;
         initFormFromRecord(props.record);
         setCropperVisible(false);
@@ -142,9 +299,16 @@ export default defineComponent({
       }
     }, [() => props.visible]);
 
-    /** 监听 type 变化时清理联动字段值和校验 */
+    // ---- 清理防抖计时器 ----
+    useEffect(() => {
+      if (!props.visible && searchTimer) {
+        clearTimeout(searchTimer);
+        searchTimer = null;
+      }
+    }, [() => props.visible]);
+
+    // ---- 监听 type 变化，清理联动字段 ----
     useEffect(() => {
-      // 首次加载跳过校验
       if (!typeChanged.value) {
         if (formData.type !== '1') formData.relatedEventId = undefined;
         if (formData.type !== '2' && formData.type !== '3') formData.linkUrl = '';
@@ -162,25 +326,28 @@ export default defineComponent({
       const activeNames: string[] = [];
       if (formData.type === '1') activeNames.push('relatedEventId');
       if (formData.type === '2' || formData.type === '3') activeNames.push('linkUrl');
-      // 清除所有联动字段的校验状态
       formRef.value?.clearValidate(['relatedEventId', 'linkUrl']);
-      // 如果有已填值，重新校验当前字段
       if (activeNames.length) {
         setTimeout(() => formRef.value?.validateFields(activeNames).catch(() => {}), 0);
       }
     }, [() => formData.type]);
 
-    /** 触发隐藏的文件选择器 */
+    /** 重新校验 Banner 图片字段，上传完成后清除或更新错误提示 */
+    const revalidateImageUrl = () => {
+      setTimeout(() => {
+        formRef.value?.validateFields(['imageUrl']).catch(() => {});
+      }, 0);
+    };
+
+    // ---- 图片上传相关 ----
     const triggerFilePicker = () => {
       if (formData.imageStatus === 'uploading') return;
       fileInputRef.value?.click();
     };
 
-    /** 处理文件选择 → 打开裁剪弹窗 */
     const handleFileChange = (e: Event) => {
       const target = e.target as HTMLInputElement;
       const file = target.files?.[0];
-      // 重置 input 以便同一文件可再次选择
       target.value = '';
 
       if (!file) return;
@@ -193,21 +360,17 @@ export default defineComponent({
         return;
       }
 
-      // 生成本地预览 URL，打开裁剪弹窗
       setUploadImageUrl(URL.createObjectURL(file));
       setCropperVisible(true);
     };
 
-    /** 裁剪确认回调：将裁剪后的图片上传到 OSS */
     const handleCropConfirm = async (dataUrl: string) => {
       setCropperVisible(false);
 
-      // 释放旧的本地预览
       if (formData.imageUrl && formData.imageUrl.startsWith('blob:')) {
         URL.revokeObjectURL(formData.imageUrl);
       }
 
-      // 先用 base64 做本地预览
       const localUrl = dataUrl;
       formData.imageUrl = localUrl;
       formData.imageStatus = 'uploading';
@@ -216,27 +379,26 @@ export default defineComponent({
         const file = base64ToFile(dataUrl, `banner_${Date.now()}.jpg`);
         const result = await uploadFile(file, OssUploadType.Banner as any);
 
-        // 释放本地预览
         URL.revokeObjectURL(localUrl);
         formData.imageUrl = result.url;
         formData.imageStatus = 'success';
         message.success('图片上传成功');
+        revalidateImageUrl();
       } catch (err: any) {
         console.error('[Banner] 上传失败:', err);
         URL.revokeObjectURL(localUrl);
         formData.imageUrl = '';
         formData.imageStatus = 'error';
         message.error(err?.message || '图片上传失败');
+        revalidateImageUrl();
       }
 
-      // 清理裁剪资源
       if (uploadImageUrl.value) {
         URL.revokeObjectURL(uploadImageUrl.value);
       }
       setUploadImageUrl('');
     };
 
-    /** 裁剪弹窗取消 */
     const onCropperCancel = () => {
       setCropperVisible(false);
       if (uploadImageUrl.value) {
@@ -245,16 +407,16 @@ export default defineComponent({
       setUploadImageUrl('');
     };
 
-    /** 删除已上传图片 */
     const handleRemoveImage = () => {
       if (formData.imageUrl && formData.imageUrl.startsWith('blob:')) {
         URL.revokeObjectURL(formData.imageUrl);
       }
       formData.imageUrl = '';
       formData.imageStatus = 'empty';
+      revalidateImageUrl();
     };
 
-    /** 提交表单 */
+    // ---- 提交表单 ----
     const handleSubmit = async () => {
       try {
         await formRef.value?.validate();
@@ -271,15 +433,8 @@ export default defineComponent({
         img: formData.imageUrl || '',
         title: formData.title || '',
         type: formData.type,
-        linkUrl:
-          formData.type === '1'
-            ? formData.relatedEventId || ''
-            : formData.type === '2'
-              ? formData.linkUrl || ''
-              : formData.type === '3'
-                ? formData.linkUrl || ''
-                : '',
-        area: formData.area || formatCascaderArea(areaPath.value),
+        params: buildParams(formData.type, formData.relatedEventId, formData.linkUrl),
+        area: formData.area,
         showTimeBegin: formData.displayTimeRange?.[0] || '',
         showTimeEnd: formData.displayTimeRange?.[1] || '',
         sort: String(formData.sort ?? 1),
@@ -299,246 +454,295 @@ export default defineComponent({
           centered
           wrapClassName={styles.bannerFormModalMain}
         >
-          <Form ref={formRef} layout="vertical" model={formData} class={styles.form} requiredMark>
-            {/* ===== Banner 标题 ===== */}
-            <Form.Item
-              label="Banner标题"
-              name="title"
-              rules={[
-                { required: true, message: '请输入' },
-                { max: TITLE_MAX, message: `标题最多 ${TITLE_MAX} 个字符` },
-              ]}
-            >
-              <Input
-                placeholder="请输入标题"
-                maxlength={TITLE_MAX}
-                allowClear
-                v-model:value={formData.title}
-              />
-            </Form.Item>
-
-            {/* ===== 上传图片（必填，带裁剪） ===== */}
-            <Form.Item
-              label="上传图片"
-              name="imageUrl"
-              rules={[
-                { required: true, message: '请上传 Banner 图片' },
-                {
-                  validator: async () => {
-                    if (!formData.imageUrl || formData.imageUrl.startsWith('blob:')) {
-                      return Promise.reject(new Error('请上传 Banner 图片'));
-                    }
-                    return Promise.resolve();
-                  },
-                },
-              ]}
-            >
-              <div class={styles.uploader}>
-                <input
-                  ref={fileInputRef}
-                  type="file"
-                  accept="image/*"
-                  style={{ display: 'none' }}
-                  onChange={handleFileChange}
-                />
-                {formData.imageStatus === 'empty' || formData.imageStatus === 'error' ? (
-                  <div
-                    class={`${styles.uploadCard} ${
-                      formData.imageStatus === 'error' ? styles.uploadCardError : ''
-                    }`}
-                    onClick={triggerFilePicker}
-                  >
-                    <span class={styles.uploadIcon}>
-                      <FileImageOutlined />
-                    </span>
-                    <span class={styles.uploadHint}>点击上传</span>
-                    <span class={styles.uploadTip}>
-                      建议尺寸 1053*351 像素
-                      <br />
-                      支持 JPG/PNG，最大 10MB
-                    </span>
-                  </div>
-                ) : (
-                  <div class={styles.previewWrapper}>
-                    <Spin spinning={formData.imageStatus === 'uploading'} tip="上传中...">
-                      <img class={styles.previewImg} src={formData.imageUrl} alt="banner preview" />
-                    </Spin>
-                    <div class={styles.uploadAgainBtn} onClick={handleRemoveImage}>
-                      重新上传
-                    </div>
-                  </div>
-                )}
-              </div>
-            </Form.Item>
-
-            {/* ===== 跳转类型 ===== */}
-            <Form.Item
-              label="跳转类型"
-              name="type"
-              rules={[{ required: true, message: '请选择跳转类型' }]}
-            >
-              <Select
-                options={JUMP_TYPE_OPTIONS as any}
-                placeholder="请选择"
-                v-model:value={formData.type}
-              />
-            </Form.Item>
-
-            {/* ===== 联动字段 ===== */}
-            {formData.type === '1' && (
-              <Form.Item
-                label="关联赛事"
-                name="relatedEventId"
-                rules={[{ required: true, message: '请选择关联赛事' }]}
-              >
-                <Select
-                  options={EVENT_OPTIONS as any}
-                  placeholder="请选择关联赛事"
-                  allowClear
-                  v-model:value={formData.relatedEventId}
-                />
-              </Form.Item>
-            )}
-
-            {formData.type === '2' && (
-              <Form.Item
-                label="跳转地址"
-                name="linkUrl"
-                rules={[
-                  { required: true, message: '请输入跳转地址' },
-                  { max: URL_MAX, message: `链接最多 ${URL_MAX} 个字符` },
-                ]}
-              >
-                <Input
-                  placeholder="https://xxx"
-                  maxlength={URL_MAX}
-                  allowClear
-                  v-model:value={formData.linkUrl}
-                />
-              </Form.Item>
-            )}
-
-            {formData.type === '3' && (
-              <Form.Item
-                label="小程序路径"
-                name="linkUrl"
-                rules={[
-                  { required: true, message: '请输入小程序页面路径' },
-                  { max: PATH_MAX, message: `路径最多 ${PATH_MAX} 个字符` },
-                ]}
-              >
-                <Input
-                  placeholder="/pages/index/index"
-                  maxlength={PATH_MAX}
-                  allowClear
-                  v-model:value={formData.linkUrl}
-                />
-              </Form.Item>
-            )}
-
-            {/* ===== 所属区域 ===== */}
-            <Form.Item
-              label="所属区域"
-              name="area"
-              rules={[{ required: true, message: '请选择所属区域' }]}
-            >
-              <Cascader
-                v-model:value={areaPath.value}
-                options={cascaderAreaOptions}
-                placeholder="请选择省/市"
-                changeOnSelect={false}
-                allowClear
-                onChange={(val: any) => {
-                  formData.area = formatCascaderArea(val || []);
-                }}
-              />
-            </Form.Item>
-
-            {/* ===== 展示时间（开始/结束） ===== */}
-            <div class={styles.timeRow}>
-              <Form.Item
-                label="开始时间"
-                name="displayStartTime"
-                class={styles.timeItem}
-                rules={[{ required: true, message: '请选择开始时间' }]}
-              >
-                <DatePicker
-                  placeholder="年-月-日"
-                  format="YYYY-MM-DD"
-                  value={
-                    formData.displayTimeRange?.[0] ? dayjs(formData.displayTimeRange[0]) : undefined
-                  }
-                  onUpdate:value={(v: any) => {
-                    formData.displayTimeRange = [
-                      v ? v.format('YYYY-MM-DD') : '',
-                      formData.displayTimeRange?.[1] || '',
-                    ];
-                  }}
-                  style={{ width: '100%' }}
-                />
-              </Form.Item>
-
-              <Form.Item
-                label="结束时间"
-                name="displayEndTime"
-                class={styles.timeItem}
-                rules={[
-                  { required: true, message: '请选择结束时间' },
-                  {
-                    validator: async () => {
-                      const [s, e] = formData.displayTimeRange || [];
-                      if (s && e && new Date(e) < new Date(s)) {
-                        return Promise.reject(new Error('结束时间不能早于开始时间'));
-                      }
-                      return Promise.resolve();
-                    },
-                  },
-                ]}
-              >
-                <DatePicker
-                  placeholder="年-月-日"
-                  format="YYYY-MM-DD"
-                  value={
-                    formData.displayTimeRange?.[1] ? dayjs(formData.displayTimeRange[1]) : undefined
-                  }
-                  onUpdate:value={(v: any) => {
-                    formData.displayTimeRange = [
-                      formData.displayTimeRange?.[0] || '',
-                      v ? v.format('YYYY-MM-DD') : '',
-                    ];
-                  }}
-                  style={{ width: '100%' }}
-                />
-              </Form.Item>
+          {editLoading.value ? (
+            <div style={{ textAlign: 'center', padding: '80px 0' }}>
+              <Spin size="large" />
             </div>
+          ) : (
+            <>
+              <Form
+                ref={formRef}
+                layout="vertical"
+                model={formData}
+                class={styles.form}
+                requiredMark
+              >
+                {/* ===== Banner 标题 ===== */}
+                <Form.Item
+                  label="Banner标题"
+                  name="title"
+                  rules={[
+                    { required: true, message: '请输入' },
+                    { max: TITLE_MAX, message: `标题最多 ${TITLE_MAX} 个字符` },
+                  ]}
+                >
+                  <Input
+                    placeholder="请输入标题"
+                    maxlength={TITLE_MAX}
+                    allowClear
+                    v-model:value={formData.title}
+                  />
+                </Form.Item>
 
-            {/* ===== 排序 ===== */}
-            <Form.Item
-              label="排序"
-              name="sort"
-              rules={[
-                { required: true, message: '请输入排序' },
-                { type: 'number', min: 1, max: 999, message: '排序范围 1-999' },
-              ]}
-            >
-              <InputNumber
-                placeholder="数字越小越靠前"
-                min={1}
-                max={999}
-                precision={0}
-                style={{ width: '200px' }}
-                v-model:value={formData.sort}
-              />
-            </Form.Item>
-          </Form>
+                {/* ===== 上传图片（必填，带裁剪） ===== */}
+                <Form.Item
+                  label="上传图片"
+                  name="imageUrl"
+                  rules={[
+                    { required: true, message: '请上传 Banner 图片' },
+                    {
+                      validator: async () => {
+                        if (formData.imageStatus === 'uploading') {
+                          return Promise.reject(new Error('图片仍在上传中，请稍候'));
+                        }
+                        if (
+                          formData.imageUrl?.startsWith('blob:') ||
+                          formData.imageUrl?.startsWith('data:')
+                        ) {
+                          return Promise.reject(new Error('请等待图片上传完成'));
+                        }
+                        return Promise.resolve();
+                      },
+                    },
+                  ]}
+                >
+                  <div class={styles.uploader}>
+                    <input
+                      ref={fileInputRef}
+                      type="file"
+                      accept="image/*"
+                      style={{ display: 'none' }}
+                      onChange={handleFileChange}
+                    />
+                    {formData.imageStatus === 'empty' || formData.imageStatus === 'error' ? (
+                      <div
+                        class={`${styles.uploadCard} ${
+                          formData.imageStatus === 'error' ? styles.uploadCardError : ''
+                        }`}
+                        onClick={triggerFilePicker}
+                      >
+                        <span class={styles.uploadIcon}>
+                          <FileImageOutlined />
+                        </span>
+                        <span class={styles.uploadHint}>点击上传</span>
+                        <span class={styles.uploadTip}>
+                          建议尺寸 1053*351 像素
+                          <br />
+                          支持 JPG/PNG，最大 10MB
+                        </span>
+                      </div>
+                    ) : (
+                      <div class={styles.previewWrapper}>
+                        <Spin spinning={formData.imageStatus === 'uploading'} tip="上传中...">
+                          <img
+                            class={styles.previewImg}
+                            src={formData.imageUrl}
+                            alt="banner preview"
+                          />
+                        </Spin>
+                        <div class={styles.uploadAgainBtn} onClick={handleRemoveImage}>
+                          重新上传
+                        </div>
+                      </div>
+                    )}
+                  </div>
+                </Form.Item>
 
-          {/* ===== 底部按钮 ===== */}
-          <div class={styles.footer}>
-            <Button onClick={props.onClose}>取消</Button>
-            <Button type="primary" loading={props.submitting} onClick={handleSubmit}>
-              确认保存
-            </Button>
-          </div>
+                {/* ===== 跳转类型 ===== */}
+                <Form.Item
+                  label="跳转类型"
+                  name="type"
+                  rules={[{ required: true, message: '请选择跳转类型' }]}
+                >
+                  <Select
+                    options={JUMP_TYPE_OPTIONS as any}
+                    placeholder="请选择"
+                    v-model:value={formData.type}
+                  />
+                </Form.Item>
+
+                {/* ===== 联动字段：赛事详情页 → 模糊搜索关联赛事 ===== */}
+                {formData.type === '1' && (
+                  <Form.Item label="关联赛事" name="relatedEventId">
+                    <Select
+                      v-model:value={formData.relatedEventId}
+                      showSearch
+                      filterOption={false}
+                      allowClear={!eventSearchLoading.value}
+                      loading={eventSearchLoading.value}
+                      placeholder="请输入关键字搜索目标赛事"
+                      options={eventSelectOptions.value as any}
+                      onSearch={onEventSearch}
+                      onFocus={() => {
+                        if (formData.relatedEventId && eventOptions.value.length === 0) {
+                          doSearch(formData.relatedEventId);
+                        }
+                      }}
+                    />
+                  </Form.Item>
+                )}
+
+                {/* ===== 联动字段：自定义链接 ===== */}
+                {formData.type === '2' && (
+                  <Form.Item
+                    label="跳转地址"
+                    name="linkUrl"
+                    rules={[
+                      { required: true, message: '请输入跳转地址' },
+                      { max: URL_MAX, message: `链接最多 ${URL_MAX} 个字符` },
+                    ]}
+                  >
+                    <Input
+                      placeholder="https://xxx"
+                      maxlength={URL_MAX}
+                      allowClear
+                      v-model:value={formData.linkUrl}
+                    />
+                  </Form.Item>
+                )}
+
+                {/* ===== 联动字段：小程序页面 ===== */}
+                {formData.type === '3' && (
+                  <Form.Item
+                    label="小程序路径"
+                    name="linkUrl"
+                    rules={[
+                      { required: true, message: '请输入小程序页面路径' },
+                      { max: PATH_MAX, message: `路径最多 ${PATH_MAX} 个字符` },
+                    ]}
+                  >
+                    <Input
+                      placeholder="/pages/index/index"
+                      maxlength={PATH_MAX}
+                      allowClear
+                      v-model:value={formData.linkUrl}
+                    />
+                  </Form.Item>
+                )}
+
+                {/* ===== 所属区域（省市树种选择 + 全国） ===== */}
+                <Form.Item
+                  label="所属区域"
+                  name="area"
+                  rules={[{ required: true, message: '请选择所属区域' }]}
+                >
+                  <Cascader
+                    v-model:value={areaPath.value}
+                    options={areaCascaderOptions}
+                    placeholder="请选择所属区域"
+                    allowClear={false}
+                    onChange={onAreaChange}
+                  />
+                </Form.Item>
+
+                {/* ===== 展示时间（开始/结束） ===== */}
+                <div class={styles.timeRow}>
+                  <Form.Item
+                    label="开始时间"
+                    name="displayStartTime"
+                    class={styles.timeItem}
+                    rules={[
+                      {
+                        validator: async () => {
+                          if (!formData.displayTimeRange?.[0]) {
+                            return Promise.reject(new Error('请选择开始时间'));
+                          }
+                          return Promise.resolve();
+                        },
+                      },
+                    ]}
+                  >
+                    <DatePicker
+                      showTime
+                      placeholder="请选择开始时间"
+                      format="YYYY-MM-DD HH:mm:ss"
+                      value={
+                        formData.displayTimeRange?.[0]
+                          ? dayjs(formData.displayTimeRange[0])
+                          : undefined
+                      }
+                      onUpdate:value={(v: any) => {
+                        const newStart = v ? v.format('YYYY-MM-DD HH:mm:ss') : '';
+                        const currentEnd = formData.displayTimeRange?.[1] || '';
+                        if (newStart && currentEnd && dayjs(newStart).isAfter(dayjs(currentEnd))) {
+                          formData.displayTimeRange = [currentEnd, newStart];
+                        } else {
+                          formData.displayTimeRange = [newStart, currentEnd];
+                        }
+                        formRef.value?.clearValidate(['displayStartTime', 'displayEndTime']);
+                      }}
+                      style={{ width: '100%' }}
+                    />
+                  </Form.Item>
+
+                  <Form.Item
+                    label="结束时间"
+                    name="displayEndTime"
+                    class={styles.timeItem}
+                    rules={[
+                      {
+                        validator: async () => {
+                          if (!formData.displayTimeRange?.[1]) {
+                            return Promise.reject(new Error('请选择结束时间'));
+                          }
+                          return Promise.resolve();
+                        },
+                      },
+                    ]}
+                  >
+                    <DatePicker
+                      showTime
+                      placeholder="请选择结束时间"
+                      format="YYYY-MM-DD HH:mm:ss"
+                      value={
+                        formData.displayTimeRange?.[1]
+                          ? dayjs(formData.displayTimeRange[1])
+                          : undefined
+                      }
+                      onUpdate:value={(v: any) => {
+                        const newEnd = v ? v.format('YYYY-MM-DD HH:mm:ss') : '';
+                        const currentStart = formData.displayTimeRange?.[0] || '';
+                        if (newEnd && currentStart && dayjs(newEnd).isBefore(dayjs(currentStart))) {
+                          formData.displayTimeRange = [newEnd, currentStart];
+                        } else {
+                          formData.displayTimeRange = [currentStart, newEnd];
+                        }
+                        formRef.value?.clearValidate(['displayStartTime', 'displayEndTime']);
+                      }}
+                      style={{ width: '100%' }}
+                    />
+                  </Form.Item>
+                </div>
+
+                {/* ===== 排序 ===== */}
+                <Form.Item
+                  label="排序"
+                  name="sort"
+                  rules={[
+                    { required: true, message: '请输入排序' },
+                    { type: 'number', min: 1, max: 999, message: '排序范围 1-999' },
+                  ]}
+                >
+                  <InputNumber
+                    placeholder="数字越小越靠前"
+                    min={1}
+                    max={999}
+                    precision={0}
+                    style={{ width: '200px' }}
+                    v-model:value={formData.sort}
+                  />
+                </Form.Item>
+              </Form>
+
+              {/* ===== 底部按钮 ===== */}
+              <div class={styles.footer}>
+                <Button onClick={props.onClose}>取消</Button>
+                <Button type="primary" loading={props.submitting} onClick={handleSubmit}>
+                  确认保存
+                </Button>
+              </div>
+            </>
+          )}
         </Modal>
 
         {/* ===== 图片裁剪弹窗 ===== */}
@@ -555,7 +759,6 @@ export default defineComponent({
             <div style={{ height: '500px' }}>
               <ImageCropper
                 src={uploadImageUrl.value}
-                // aspectRatio={CROP_ASPECT_RATIO}
                 autoCrop={true}
                 autoCropArea={0.8}
                 viewMode={1}
diff --git a/src/pages/events/banner/model/services.ts b/src/pages/events/banner/model/services.ts
index e3dec86..e496ef6 100644
--- a/src/pages/events/banner/model/services.ts
+++ b/src/pages/events/banner/model/services.ts
@@ -26,11 +26,11 @@ export type {
 // ============================================================
 // URL 常量
 // ============================================================
-const bannerList = '/manager/banner/list';
-const bannerDel = '/manager/banner/del';
-const bannerSave = '/manager/banner/save';
-const bannerUpdate = '/manager/banner/update';
-const bannerActive = '/manager/banner/active';
+const bannerList = '/admin/manager/banner/list';
+const bannerDel = '/admin/manager/banner/del';
+const bannerSave = '/admin/manager/banner/save';
+const bannerUpdate = '/admin/manager/banner/update';
+const bannerActive = '/admin/manager/banner/active';
 
 const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
 
diff --git a/src/pages/events/banner/model/useBannerModel.ts b/src/pages/events/banner/model/useBannerModel.ts
index 85aa6ee..229d2c5 100644
--- a/src/pages/events/banner/model/useBannerModel.ts
+++ b/src/pages/events/banner/model/useBannerModel.ts
@@ -11,7 +11,6 @@ import {
   type TournamentAdminBannerListVO,
   type BannerListQueryParams,
 } from './services';
-import { getProvinceCityOptions } from '@/utils/areaData';
 
 // ============================================================
 // 常量
@@ -24,15 +23,17 @@ export const BANNER_STATUS_OPTIONS = [
   { value: '0', label: '禁用' },
 ] as const;
 
-/** 跳转类型选项（value 对应 API type: 1=赛事详情，2=自定义连接，3=小程序页面） */
+/** 跳转类型选项（value 对应 API type: 0=无链接，1=赛事详情，2=自定义连接，3=小程序页面） */
 export const JUMP_TYPE_OPTIONS = [
   { value: '1', label: '赛事详情页' },
   { value: '2', label: '自定义链接' },
   { value: '3', label: '小程序页面' },
+  { value: '0', label: '无链接' },
 ] as const;
 
 /** 跳转类型映射 */
 const JUMP_TYPE_MAP: Record<string, { label: string; tone: StatusTagTone }> = {
+  '0': { label: '无链接', tone: 'default' },
   '1': { label: '赛事详情页', tone: 'primary' },
   '2': { label: '自定义链接', tone: 'purple' },
   '3': { label: '小程序页面', tone: 'cyan' },
@@ -44,18 +45,6 @@ const STATUS_MAP: Record<string, { label: string; tone: StatusTagTone; dimmed?:
   '0': { label: '已禁用', tone: 'default', dimmed: true },
 };
 
-/** 关联赛事选项（mock，TODO: 替换为真实 API） */
-export const EVENT_OPTIONS = [
-  { value: 'EV20260701001', label: '2026全国青少年羽毛球锦标赛暨体育文化交流大会' },
-  { value: 'EV20260701002', label: '国际马拉松城市联赛' },
-  { value: 'EV20260701003', label: '全民健身运动会' },
-  { value: 'EV20260701004', label: '上海国际马拉松公开赛' },
-  { value: 'EV20260701005', label: '北京城市定向越野挑战赛' },
-];
-
-/** 所属区域选项（动态生成，直辖市仅市名，其他省市） */
-export const REGION_OPTIONS = getProvinceCityOptions();
-
 // ============================================================
 // Model
 // ============================================================
@@ -102,10 +91,9 @@ export function useBannerModel() {
       key: 'type',
       width: 120,
     },
-    { title: '跳转地址', dataIndex: 'linkUrl', key: 'linkUrl', width: 200 },
     { title: '所属区域', dataIndex: 'area', key: 'area', width: 140 },
     { title: '展示时间', key: 'displayTime', width: 260 },
-    { title: '创建时间', dataIndex: 'createTime', key: 'createTime', width: 160 },
+    { title: '创建时间', dataIndex: 'createDate', key: 'createDate', width: 160 },
     { title: '状态', dataIndex: 'status', key: 'status', width: 100, align: 'center' as const },
   ];
 
@@ -183,11 +171,16 @@ export function useBannerModel() {
     if (formSubmitting.value) return;
     setFormSubmitting(true);
     try {
-      const params = {
+      const payload = {
         img: formPayload.img || formPayload.imageUrl || '',
         title: formPayload.title || '',
         type: String(formPayload.type || formPayload.jumpType || '1'),
-        linkUrl: formPayload.linkUrl || formPayload.jumpUrl || '',
+        params:
+          formPayload.params ??
+          formPayload.parms ??
+          formPayload.linkUrl ??
+          formPayload.jumpUrl ??
+          '',
         area: formPayload.area || formPayload.region || '',
         showTimeBegin:
           formPayload.showTimeBegin ||
@@ -203,8 +196,8 @@ export function useBannerModel() {
       };
       const isEdit = editingRecord.value !== null;
       const res = isEdit
-        ? await updateBanner({ ...params, id: editingRecord.value.id })
-        : await saveBanner(params);
+        ? await updateBanner({ ...payload, id: editingRecord.value.id })
+        : await saveBanner(payload);
       if (res.code == 200) {
         message.success(isEdit ? '编辑成功' : '新增成功');
         handleCloseModal();
diff --git a/src/pages/events/orders/index.tsx b/src/pages/events/orders/index.tsx
index 30791f0..e9c51d3 100644
--- a/src/pages/events/orders/index.tsx
+++ b/src/pages/events/orders/index.tsx
@@ -82,7 +82,7 @@ function renderBodyCell({
   if (column.key === 'action') {
     // 退款状态：1=无退款，2=退款成功，3=退款失败，-1=其他
     // 只有退款失败（3）时显示重新退款按钮
-    const showReRefund = record.refundStatus === 3;
+    const showReRefund = record.refundStatus === '3';
     return (
       <Space>
         <Button type="link" size="small" onClick={() => onView(record)}>
diff --git a/src/pages/events/users/index.tsx b/src/pages/events/users/index.tsx
index f330196..7d9f5f6 100644
--- a/src/pages/events/users/index.tsx
+++ b/src/pages/events/users/index.tsx
@@ -10,7 +10,7 @@ import {
   Modal,
   message,
 } from 'ant-design-vue';
-import { useUserModel, USER_STATUS_OPTIONS, ROLE_OPTIONS } from './model/useUserModel';
+import { useUserModel, USER_STATUS_OPTIONS } from './model/useUserModel';
 import { toggleUserActive } from './model/services';
 import { useContainerSize } from '@/hooks';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
@@ -71,24 +71,26 @@ export default defineComponent({
       <div class={pageStyles.containerMain}>
         <div class={pageStyles.filter}>
           <Form style={{ rowGap: '10px' }} layout="inline" model={filterForm}>
-            <Form.Item label="用户姓名/手机号" name="text">
+            <Form.Item label="昵称" name="nickname">
               <Input
-                value={filterForm.text}
-                placeholder="请输入"
-                style={{ width: '200px' }}
+                value={filterForm.nickname}
+                placeholder="请输入昵称"
+                style={{ width: '180px' }}
                 allowClear
-                onUpdate:value={(val: any) => (filterForm.text = val.target?.value ?? val ?? '')}
+                onUpdate:value={(val: any) =>
+                  (filterForm.nickname = val.target?.value ?? val ?? '')
+                }
                 onPressEnter={handleSearch}
               />
             </Form.Item>
-            <Form.Item label="角色" name="roleId">
-              <Select
-                value={filterForm.roleId}
-                options={ROLE_OPTIONS as any}
-                style={{ width: '140px' }}
+            <Form.Item label="手机号" name="phone">
+              <Input
+                value={filterForm.phone}
+                placeholder="请输入手机号"
+                style={{ width: '180px' }}
                 allowClear
-                placeholder="全部"
-                onUpdate:value={(val: any) => (filterForm.roleId = val || '')}
+                onUpdate:value={(val: any) => (filterForm.phone = val.target?.value ?? val ?? '')}
+                onPressEnter={handleSearch}
               />
             </Form.Item>
             <Form.Item label="状态" name="status">
diff --git a/src/pages/events/users/model/services.ts b/src/pages/events/users/model/services.ts
index 91f90a4..504a21e 100644
--- a/src/pages/events/users/model/services.ts
+++ b/src/pages/events/users/model/services.ts
@@ -1,36 +1,61 @@
 /**
- * 用户列表 - 接口服务
- * 该页面使用的所有接口集中管理
+ * 赛事用户列表 - 接口服务
+ * 接口文档: GET /admin/manager/user/page
  */
 import { get, post } from '@/utils/request';
 import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockUserListPage } from '@/config/mock/userList';
 import type {
-  UserListQueryParams,
   UserSaveParams,
   UserUpdateParams,
   UserActiveParams,
   UserUpdatePwdParams,
-  TournamentAdminUserVO,
   PageData,
   ApiResult,
 } from '@/api/users/types';
 
+// ============================================================
+// 本页专用类型（与系统用户管理页的 TournamentAdminUserVO 不同）
+// ============================================================
+
+/** 赛事用户列表项 */
+export interface EventUserVO {
+  id: number;
+  nickname: string;
+  phone: string;
+  realName: string;
+  idCard: string;
+  idCardImg: string;
+  idCardImgList: string[];
+  status: number;
+  createTime: string;
+}
+
+/** 赛事用户列表查询参数 */
+export interface EventUserListQueryParams {
+  page: string;
+  limit: string;
+  nickname?: string;
+  phone?: string;
+  status?: string;
+}
+
+// 为兼容旧引用，也导出旧类型名
+export type TournamentAdminUserVO = EventUserVO;
+export type UserListQueryParams = EventUserListQueryParams;
+
 export type {
-  TournamentAdminUserVO,
-  UserListQueryParams,
   UserSaveParams,
   UserUpdateParams,
   UserActiveParams,
   UserUpdatePwdParams,
   PageData,
   ApiResult,
-} from '@/api/users/types';
+};
 
 // ============================================================
 // URL 常量
 // ============================================================
-const userList = '/sys/user/page';
+const userList = '/admin/manager/user/page';
 const userSave = '/sys/user/save';
 const userUpdate = '/sys/user/update';
 const userActive = '/sys/user/active';
@@ -42,16 +67,10 @@ const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 // API 函数
 // ============================================================
 
-/** 用户分页列表 */
-export async function getUserList(
-  params: UserListQueryParams,
-): Promise<ApiResult<PageData<TournamentAdminUserVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockUserListPage(page, limit) };
-  }
+/** 赛事用户分页列表 */
+export function getUserList(
+  params: EventUserListQueryParams,
+): Promise<ApiResult<PageData<EventUserVO>>> {
   return get(userList, params as Record<string, any>);
 }
 
diff --git a/src/pages/events/users/model/useUserModel.ts b/src/pages/events/users/model/useUserModel.ts
index dbf1458..2419035 100644
--- a/src/pages/events/users/model/useUserModel.ts
+++ b/src/pages/events/users/model/useUserModel.ts
@@ -14,15 +14,6 @@ export const USER_STATUS_OPTIONS = [
   { value: '1', label: '正常' },
 ] as const;
 
-/** 角色选项（TODO: 对接角色 API） */
-export const ROLE_OPTIONS = [
-  { value: '', label: '全部' },
-  { value: '1', label: '超级管理员' },
-  { value: '2', label: '赛事管理员' },
-  { value: '3', label: '裁判' },
-  { value: '4', label: '财务' },
-] as const;
-
 const STATUS_MAP: Record<string, { label: string; tone: StatusTagTone }> = {
   '1': { label: '正常', tone: 'success' },
   '0': { label: '停用', tone: 'danger' },
@@ -34,23 +25,29 @@ const STATUS_MAP: Record<string, { label: string; tone: StatusTagTone }> = {
 
 export function useUserModel() {
   const filterForm = reactive({
-    text: '',
-    roleId: '',
+    nickname: '',
+    phone: '',
     status: '',
   });
 
-  const { debouncedValue: debouncedText } = useDebounce(toRef(filterForm, 'text') as Ref<string>, {
-    delay: 300,
-  });
+  const { debouncedValue: debouncedNickname } = useDebounce(
+    toRef(filterForm, 'nickname') as Ref<string>,
+    { delay: 300 },
+  );
+  const { debouncedValue: debouncedPhone } = useDebounce(
+    toRef(filterForm, 'phone') as Ref<string>,
+    { delay: 300 },
+  );
 
   const [loading, setLoading] = useState<boolean>(false);
   const [dataSource, setDataSource] = useState<TournamentAdminUserVO[]>([]);
   const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 });
 
   const columns = [
+    { title: '昵称', dataIndex: 'nickname', key: 'nickname', width: 120 },
     { title: '用户姓名', dataIndex: 'realName', key: 'realName', width: 120 },
     { title: '手机号', dataIndex: 'phone', key: 'phone', width: 140 },
-    { title: '角色', dataIndex: 'roleName', key: 'roleName', width: 120 },
+    { title: '证件号', dataIndex: 'idCard', key: 'idCard', width: 180 },
     { title: '创建时间', dataIndex: 'createTime', key: 'createTime', width: 170 },
     {
       title: '状态',
@@ -58,8 +55,9 @@ export function useUserModel() {
       key: 'status',
       width: 90,
       align: 'center' as const,
-      customRender: ({ text }: { text: string }) => {
-        const info = STATUS_MAP[text] || { label: text, tone: 'default' as const };
+      customRender: ({ text }: { text: any }) => {
+        const key = String(text ?? '');
+        const info = STATUS_MAP[key] || { label: key || '-', tone: 'default' as StatusTagTone };
         return h(StatusTag, { label: info.label, tone: info.tone });
       },
     },
@@ -70,21 +68,22 @@ export function useUserModel() {
       page: String(pagination.value.current),
       limit: String(pagination.value.pageSize),
     };
-    if (filterForm.text.trim()) params.text = filterForm.text.trim();
-    if (filterForm.roleId) params.roleId = filterForm.roleId;
+    const nickname = debouncedNickname.value?.trim();
+    if (nickname) params.nickname = nickname;
+    const phone = debouncedPhone.value?.trim();
+    if (phone) params.phone = phone;
     if (filterForm.status) params.status = filterForm.status;
     return params;
   };
 
   const hasFilter = computed(
-    () => debouncedText.value.trim() !== '' || filterForm.roleId !== '' || filterForm.status !== '',
+    () => !!filterForm.nickname || !!filterForm.phone || !!filterForm.status,
   );
 
   const handleSearch = useThrottleFn(async () => {
     setLoading(true);
     try {
       const params = buildQueryParams();
-      console.log('用户列表查询参数:', params);
       const res = await getUserList(params);
       if (res.code == 200) {
         setDataSource(res.data.list);
@@ -98,8 +97,8 @@ export function useUserModel() {
   }, 500);
 
   const handleReset = useThrottleFn(() => {
-    filterForm.text = '';
-    filterForm.roleId = '';
+    filterForm.nickname = '';
+    filterForm.phone = '';
     filterForm.status = '';
     setPagination({ current: 1, pageSize: 10, total: 0 });
     setDataSource([]);
diff --git a/src/pages/finance/wallet/model/services.ts b/src/pages/finance/wallet/model/services.ts
index fd431aa..9bcce65 100644
--- a/src/pages/finance/wallet/model/services.ts
+++ b/src/pages/finance/wallet/model/services.ts
@@ -27,8 +27,8 @@ export type {
 // ============================================================
 // URL 常量
 // ============================================================
-const walletList = '/finance/wallet/summary';
-const walletTransaction = '/finance/wallet/page';
+const walletList = '/admin/finance/wallet/summary';
+const walletTransaction = '/admin/finance/wallet/page';
 
 const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
diff --git a/src/pages/finance/withdraw/model/services.ts b/src/pages/finance/withdraw/model/services.ts
index 44763cb..d09f3c5 100644
--- a/src/pages/finance/withdraw/model/services.ts
+++ b/src/pages/finance/withdraw/model/services.ts
@@ -25,9 +25,9 @@ export type {
 // ============================================================
 // URL 常量
 // ============================================================
-const withdrawList = '/finance/withdraw/page';
-const withdrawInfo = '/finance/withdraw/info';
-const withdrawAudit = '/finance/withdraw/audit';
+const withdrawList = '/admin/finance/withdraw/page';
+const withdrawInfo = '/admin/finance/withdraw/info';
+const withdrawAudit = '/admin/finance/withdraw/audit';
 
 const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
diff --git a/src/utils/areaData.ts b/src/utils/areaData.ts
index 91d28e8..0f59653 100644
--- a/src/utils/areaData.ts
+++ b/src/utils/areaData.ts
@@ -131,3 +131,73 @@ export function parseAreaToCascaderPath(area: string): string[] {
   if (!area) return [];
   return area.split('-');
 }
+
+// ============================================================
+// 城市级别选项（仅市名，加"全国"）
+// ============================================================
+
+/** 城市 Select 选项 */
+export interface CityOption {
+  value: string;
+  label: string;
+}
+
+/**
+ * 获取仅城市名的选项列表，第一项为"全国"
+ * 用于 Banner 弹窗中"所属区域"下拉选择
+ * - 直辖市：直接取市名（如"北京市"）
+ * - 普通省份：取市名（如"深圳市"）
+ */
+export function getCityOnlyOptions(): CityOption[] {
+  const options: CityOption[] = [{ value: '全国', label: '全国' }];
+  const provinces = areaData['86'];
+  if (!provinces) return options;
+
+  for (const [provinceCode, provinceName] of Object.entries(provinces)) {
+    if (MUNICIPALITY_CODES.includes(provinceCode)) {
+      options.push({ value: provinceName as string, label: provinceName as string });
+    } else {
+      const cities = areaData[provinceCode];
+      if (cities) {
+        for (const [, cityName] of Object.entries(cities)) {
+          options.push({ value: cityName as string, label: cityName as string });
+        }
+      }
+    }
+  }
+
+  return options;
+}
+
+/**
+ * 根据城市名反查 Cascader 路径数组
+ * "深圳市" → ["广东省", "深圳市"]
+ * "北京市" → ["北京市"]
+ * "全国" → ["全国"]
+ */
+export function cityNameToCascaderPath(cityName: string): string[] {
+  if (!cityName || cityName === '全国') return ['全国'];
+
+  const provinces = areaData['86'];
+  if (!provinces) return [cityName];
+
+  for (const [provinceCode, provinceName] of Object.entries(provinces)) {
+    const pname = provinceName as string;
+
+    if (MUNICIPALITY_CODES.includes(provinceCode)) {
+      if (pname === cityName) return [pname];
+    } else {
+      const cities = areaData[provinceCode];
+      if (cities) {
+        for (const [, cname] of Object.entries(cities)) {
+          if ((cname as string) === cityName) {
+            return [pname, cname as string];
+          }
+        }
+      }
+    }
+  }
+
+  // 兜底：找不到省份隶属，直接用市名
+  return [cityName];
+}
-- 
2.52.0


From 7cc56af0d5ef9b2290bd36c480c9392d49f1facd Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Tue, 4 Aug 2026 18:26:47 +0800
Subject: [PATCH 05/25] =?UTF-8?q?fix:=20=E5=AF=B9=E6=8E=A5=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E7=94=B3=E8=AF=B7=E4=B8=8E=E7=94=A8=E6=88=B7=E9=92=B1?=
 =?UTF-8?q?=E5=8C=85=EF=BC=8C=E6=94=AF=E4=BB=98=E6=B5=81=E6=B0=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=AF=B9=E6=8E=A5=E8=A7=92=E8=89=B2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/payments/index.ts                     | 17 +++++-
 src/api/payments/types.ts                     | 16 +++++
 src/api/roles/types.ts                        | 13 ++++
 src/api/users/index.ts                        |  4 +-
 src/config/mock/paymentFlow.ts                | 21 ++++++-
 src/pages/finance/payments/index.tsx          |  4 +-
 src/pages/finance/payments/model/services.ts  |  9 +--
 .../payments/model/usePaymentsModel.ts        | 19 ++----
 .../components/WithdrawDetailModal.tsx        |  6 +-
 src/pages/finance/withdraw/index.tsx          |  6 +-
 .../withdraw/model/useWithdrawModel.ts        | 48 +++++++++++----
 src/pages/system/roles/model/services.ts      | 61 ++++++++-----------
 src/pages/system/roles/model/useRoleModel.ts  | 32 ++++++++--
 src/pages/system/users/model/services.ts      | 47 +++-----------
 14 files changed, 180 insertions(+), 123 deletions(-)

diff --git a/src/api/payments/index.ts b/src/api/payments/index.ts
index e5daba7..95d3bb1 100644
--- a/src/api/payments/index.ts
+++ b/src/api/payments/index.ts
@@ -5,16 +5,27 @@
 import { get } from '@/utils/request';
 import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
 import { buildMockPaymentFlowPage } from '@/config/mock/paymentFlow';
-import type { PaymentFlowQueryParams, PaymentFlowVO, PageData, ApiResult } from './types';
+import type {
+  PaymentFlowQueryParams,
+  PaymentFlowVO,
+  PaymentFlowPageData,
+  ApiResult,
+} from './types';
 
-export type { PaymentFlowVO, PaymentFlowQueryParams, PageData, ApiResult } from './types';
+export type {
+  PaymentFlowVO,
+  PaymentFlowQueryParams,
+  PaymentFlowPageData,
+  PaymentFlowExData,
+  ApiResult,
+} from './types';
 
 const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
 /** GET /admin/finance/paymentFlow/page — 支付流水分页 */
 export async function getPaymentFlowList(
   params: PaymentFlowQueryParams,
-): Promise<ApiResult<PageData<PaymentFlowVO>>> {
+): Promise<ApiResult<PaymentFlowPageData>> {
   if (USE_MOCK) {
     await delay(MOCK_DELAY);
     const page = Number(params.page) || 1;
diff --git a/src/api/payments/types.ts b/src/api/payments/types.ts
index 4b52998..48b433f 100644
--- a/src/api/payments/types.ts
+++ b/src/api/payments/types.ts
@@ -41,6 +41,22 @@ export interface PageData<T> {
   total: number;
   list: T[];
 }
+
+/** 支付流水分页扩展汇总（与 total 同级） */
+export interface PaymentFlowExData {
+  /** 总支付金额 */
+  totalAmount: string;
+  /** 总退款金额 */
+  totalRefundAmount: string;
+}
+
+/** 支付流水分页响应 */
+export interface PaymentFlowPageData {
+  total: number;
+  list: PaymentFlowVO[];
+  exData: PaymentFlowExData;
+}
+
 export interface ApiResult<T> {
   code: number;
   msg: string;
diff --git a/src/api/roles/types.ts b/src/api/roles/types.ts
index 7dc35f7..b4b6219 100644
--- a/src/api/roles/types.ts
+++ b/src/api/roles/types.ts
@@ -41,6 +41,19 @@ export interface RoleUsageUserQueryParams {
   roleId?: string;
 }
 
+/** 保存角色 — POST /admin/sys/role/save */
+export interface RoleSaveParams {
+  name: string;
+  menuIds: string[];
+}
+
+/** 更新角色 — POST /admin/sys/role/update */
+export interface RoleUpdateParams {
+  id: string;
+  name: string;
+  menuIds: string[];
+}
+
 export interface PageData<T> {
   total: number;
   list: T[];
diff --git a/src/api/users/index.ts b/src/api/users/index.ts
index d76ac08..1ab6212 100644
--- a/src/api/users/index.ts
+++ b/src/api/users/index.ts
@@ -28,7 +28,7 @@ export type {
 
 const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
-/** GET /sys/user/page — 用户分页 */
+/** GET /admin/sys/user/page — 用户分页 */
 export async function getUserList(
   params: UserListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminUserVO>>> {
@@ -38,7 +38,7 @@ export async function getUserList(
     const limit = Number(params.limit) || 10;
     return { code: 200, msg: 'success', data: buildMockUserListPage(page, limit) };
   }
-  return get('/sys/user/page', params as Record<string, any>);
+  return get('/admin/sys/user/page', params as Record<string, any>);
 }
 
 /** POST /sys/user/save — 新增用户 */
diff --git a/src/config/mock/paymentFlow.ts b/src/config/mock/paymentFlow.ts
index 1ddc00e..e48463d 100644
--- a/src/config/mock/paymentFlow.ts
+++ b/src/config/mock/paymentFlow.ts
@@ -2,7 +2,7 @@
  * 支付流水假数据
  * 对应接口：GET /admin/finance/paymentFlow/page
  */
-import type { PaymentFlowVO, PaymentFlowQueryParams, PageData } from '@/api/payments';
+import type { PaymentFlowVO, PaymentFlowQueryParams, PaymentFlowPageData } from '@/api/payments';
 
 const MOCK_LIST: PaymentFlowVO[] = [
   {
@@ -127,7 +127,7 @@ export function buildMockPaymentFlowPage(
   page: number,
   limit: number,
   params: PaymentFlowQueryParams,
-): PageData<PaymentFlowVO> {
+): PaymentFlowPageData {
   let filtered = [...MOCK_LIST];
 
   if (params.nickname) {
@@ -143,7 +143,22 @@ export function buildMockPaymentFlowPage(
     inDateRange(item.createDate, params.createDateBegin, params.createDateEnd),
   );
 
+  let totalAmount = 0;
+  let totalRefundAmount = 0;
+  for (const item of filtered) {
+    const amt = Number(item.amount) || 0;
+    if (item.type === 1) totalAmount += amt;
+    else if (item.type === 2) totalRefundAmount += amt;
+  }
+
   const total = filtered.length;
   const start = (page - 1) * limit;
-  return { total, list: filtered.slice(start, start + limit) };
+  return {
+    total,
+    list: filtered.slice(start, start + limit),
+    exData: {
+      totalAmount: totalAmount.toFixed(2),
+      totalRefundAmount: totalRefundAmount.toFixed(2),
+    },
+  };
 }
diff --git a/src/pages/finance/payments/index.tsx b/src/pages/finance/payments/index.tsx
index f3d2162..dfe6a4f 100644
--- a/src/pages/finance/payments/index.tsx
+++ b/src/pages/finance/payments/index.tsx
@@ -83,11 +83,11 @@ export default defineComponent({
           <div class={pageStyles.summary}>
             <span class={pageStyles.summaryItem}>
               <span class={pageStyles.summaryLabel}>总支付金额：</span>
-              <span class={pageStyles.summaryValue}>{summary.value.totalPay}元</span>
+              <span class={pageStyles.summaryValue}>{summary.value.totalAmount}元</span>
             </span>
             <span class={pageStyles.summaryItem}>
               <span class={pageStyles.summaryLabel}>总退款金额：</span>
-              <span class={pageStyles.summaryValue}>{summary.value.totalRefund}元</span>
+              <span class={pageStyles.summaryValue}>{summary.value.totalRefundAmount}元</span>
             </span>
           </div>
           <div ref={containerRef} class={pageStyles.tableBody}>
diff --git a/src/pages/finance/payments/model/services.ts b/src/pages/finance/payments/model/services.ts
index 7b1ced6..905aae6 100644
--- a/src/pages/finance/payments/model/services.ts
+++ b/src/pages/finance/payments/model/services.ts
@@ -8,21 +8,22 @@ import { buildMockPaymentFlowPage } from '@/config/mock/paymentFlow';
 import type {
   PaymentFlowQueryParams,
   PaymentFlowVO,
-  PageData,
+  PaymentFlowPageData,
   ApiResult,
 } from '@/api/payments/types';
 
 export type {
   PaymentFlowVO,
   PaymentFlowQueryParams,
-  PageData,
+  PaymentFlowPageData,
+  PaymentFlowExData,
   ApiResult,
 } from '@/api/payments/types';
 
 // ============================================================
 // URL 常量
 // ============================================================
-const paymentFlowList = '/finance/paymentFlow/page';
+const paymentFlowList = '/admin/finance/paymentFlow/page';
 
 const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
@@ -33,7 +34,7 @@ const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 /** 支付流水分页 */
 export async function getPaymentFlowList(
   params: PaymentFlowQueryParams,
-): Promise<ApiResult<PageData<PaymentFlowVO>>> {
+): Promise<ApiResult<PaymentFlowPageData>> {
   if (USE_MOCK) {
     await delay(MOCK_DELAY);
     const page = Number(params.page) || 1;
diff --git a/src/pages/finance/payments/model/usePaymentsModel.ts b/src/pages/finance/payments/model/usePaymentsModel.ts
index 45ed3ed..71d08f6 100644
--- a/src/pages/finance/payments/model/usePaymentsModel.ts
+++ b/src/pages/finance/payments/model/usePaymentsModel.ts
@@ -41,7 +41,7 @@ export function usePaymentsModel() {
   );
 
   // ===== 汇总 =====
-  const [summary, setSummary] = useState({ totalPay: '0.00', totalRefund: '0.00' });
+  const [summary, setSummary] = useState({ totalAmount: '0.00', totalRefundAmount: '0.00' });
 
   // ===== 表格状态 =====
   const [loading, setLoading] = useState<boolean>(false);
@@ -104,21 +104,14 @@ export function usePaymentsModel() {
     setLoading(true);
     try {
       const queryParams = buildQueryParams();
-      console.log('支付流水查询参数:', queryParams);
       const res = await getPaymentFlowList(queryParams);
       if (res.code == 200) {
-        console.log('支付流水查询结果:', { total: res.data.total, count: res.data.list.length });
         setDataSource(res.data.list);
         setPagination({ ...pagination.value, total: res.data.total });
-        // 汇总：type=1 金额为收入，type=2 金额为退款
-        let totalPay = 0;
-        let totalRefund = 0;
-        for (const item of res.data.list) {
-          const amt = Number(item.amount) || 0;
-          if (item.type === 1) totalPay += amt;
-          else if (item.type === 2) totalRefund += amt;
-        }
-        setSummary({ totalPay: totalPay.toFixed(2), totalRefund: totalRefund.toFixed(2) });
+        setSummary({
+          totalAmount: res.data.exData?.totalAmount ?? '0.00',
+          totalRefundAmount: res.data.exData?.totalRefundAmount ?? '0.00',
+        });
       }
     } catch {
       // 网络层已统一提示
@@ -134,7 +127,7 @@ export function usePaymentsModel() {
     filterForm.type = '';
     setPagination({ current: 1, pageSize: 10, total: 0 });
     setDataSource([]);
-    setSummary({ totalPay: '0.00', totalRefund: '0.00' });
+    setSummary({ totalAmount: '0.00', totalRefundAmount: '0.00' });
     setTimeout(() => handleSearch(), 350);
   }, 500);
 
diff --git a/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx b/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
index 9e83023..8cd54f8 100644
--- a/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
+++ b/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
@@ -2,7 +2,7 @@ import { defineComponent, reactive, ref, watch } from 'vue';
 import { Modal, Radio, Input, Button, Upload, Image, Spin, message } from 'ant-design-vue';
 import { PlusOutlined } from '@ant-design/icons-vue';
 import { getWithdrawInfo, postWithdrawAudit, type WithdrawInfoVO } from '../model/services';
-import { AUDIT_STATUS_MAP, PAY_STATUS_MAP } from '../model/useWithdrawModel';
+import { getAuditStatusText, getPayStatusText } from '../model/useWithdrawModel';
 import styles from './WithdrawDetailModal.module.less';
 
 const { TextArea } = Input;
@@ -135,8 +135,8 @@ export default defineComponent({
               {renderItem('费率：', `${(Number(d.feeRate) * 100).toFixed(2)}%`)}
               {renderItem('手续费：', `¥${d.feeAmount}`)}
               {renderItem('到账金额：', `¥${d.receivedAmount}`, true)}
-              {renderItem('审核状态：', AUDIT_STATUS_MAP[d.auditStatus] ?? '-', true)}
-              {renderItem('列账状态：', PAY_STATUS_MAP[d.payStatus] ?? '-')}
+              {renderItem('审核状态：', getAuditStatusText(d.auditStatus), true)}
+              {renderItem('列账状态：', getPayStatusText(d.payStatus))}
             </div>
           </div>
 
diff --git a/src/pages/finance/withdraw/index.tsx b/src/pages/finance/withdraw/index.tsx
index 715c713..233fa1b 100644
--- a/src/pages/finance/withdraw/index.tsx
+++ b/src/pages/finance/withdraw/index.tsx
@@ -1,6 +1,6 @@
 import { defineComponent, onMounted } from 'vue';
 import { Button, Input, Table, Form, Space, Pagination, Select } from 'ant-design-vue';
-import { useWithdrawModel, AUDIT_STATUS_MAP, PAY_STATUS_MAP } from './model/useWithdrawModel';
+import { useWithdrawModel, renderAuditStatus, renderPayStatus } from './model/useWithdrawModel';
 import { useContainerSize } from '@/hooks';
 import WithdrawDetailModal from './components/WithdrawDetailModal';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
@@ -21,10 +21,10 @@ function renderBodyCell({
   onView: (record: any) => void;
 }) {
   if (column.key === 'auditStatus') {
-    return <span>{AUDIT_STATUS_MAP[record.auditStatus] || record.auditStatus || '-'}</span>;
+    return renderAuditStatus(record.auditStatus);
   }
   if (column.key === 'payStatus') {
-    return <span>{PAY_STATUS_MAP[record.payStatus] ?? '-'}</span>;
+    return renderPayStatus(record.payStatus);
   }
   if (column.key === 'action') {
     // auditStatus=0（待审核）→ 显示「审核」，其他 → 显示「查看」
diff --git a/src/pages/finance/withdraw/model/useWithdrawModel.ts b/src/pages/finance/withdraw/model/useWithdrawModel.ts
index 43410f7..a68e784 100644
--- a/src/pages/finance/withdraw/model/useWithdrawModel.ts
+++ b/src/pages/finance/withdraw/model/useWithdrawModel.ts
@@ -1,4 +1,5 @@
-import { computed, reactive, toRef, Ref } from 'vue';
+import { computed, reactive, toRef, Ref, h } from 'vue';
+import { StatusTag, type StatusTagTone } from '@/components';
 import { useState, useDebounce, useThrottleFn } from '@/hooks';
 import { getWithdrawList, type WithdrawVO, type WithdrawQueryParams } from './services';
 
@@ -22,20 +23,45 @@ export const PAY_STATUS_OPTIONS = [
   { value: '2', label: '支付失败' },
 ] as const;
 
-/** 审核状态文案映射 */
-export const AUDIT_STATUS_MAP: Record<number, string> = {
-  0: '待审核',
-  1: '审核通过',
-  2: '审核驳回',
+/** 审核状态文案 + 色调映射 */
+const AUDIT_STATUS_MAP: Record<number, { label: string; tone: StatusTagTone }> = {
+  0: { label: '待审核', tone: 'warning' },
+  1: { label: '审核通过', tone: 'success' },
+  2: { label: '审核驳回', tone: 'danger' },
 };
 
-/** 到账状态文案映射 */
-export const PAY_STATUS_MAP: Record<number, string> = {
-  0: '未支付',
-  1: '支付成功',
-  2: '支付失败',
+/** 到账状态文案 + 色调映射 */
+const PAY_STATUS_MAP: Record<number, { label: string; tone: StatusTagTone }> = {
+  0: { label: '未支付', tone: 'default' },
+  1: { label: '支付成功', tone: 'success' },
+  2: { label: '支付失败', tone: 'danger' },
 };
 
+/** 渲染审核状态 StatusTag */
+export function renderAuditStatus(status: number) {
+  const info = AUDIT_STATUS_MAP[status] || {
+    label: String(status ?? '-'),
+    tone: 'default' as const,
+  };
+  return h(StatusTag, { label: info.label, tone: info.tone });
+}
+
+/** 渲染到账状态 StatusTag */
+export function renderPayStatus(status: number) {
+  const info = PAY_STATUS_MAP[status] || { label: String(status ?? '-'), tone: 'default' as const };
+  return h(StatusTag, { label: info.label, tone: info.tone });
+}
+
+/** 获取审核状态纯文本（详情弹窗用） */
+export function getAuditStatusText(status: number): string {
+  return AUDIT_STATUS_MAP[status]?.label ?? String(status ?? '-');
+}
+
+/** 获取到账状态纯文本（详情弹窗用） */
+export function getPayStatusText(status: number): string {
+  return PAY_STATUS_MAP[status]?.label ?? String(status ?? '-');
+}
+
 // ============================================================
 // Model
 // ============================================================
diff --git a/src/pages/system/roles/model/services.ts b/src/pages/system/roles/model/services.ts
index 8fe963e..6a28944 100644
--- a/src/pages/system/roles/model/services.ts
+++ b/src/pages/system/roles/model/services.ts
@@ -3,13 +3,11 @@
  * 该页面使用的所有接口集中管理
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockRoleListPage } from '@/config/mock/roleList';
-import { buildMockRoleUsageUserPage } from '@/config/mock/roleUsageUser';
-import { buildMockPermissionTree } from '@/config/mock/permissionTree';
 import type {
   RoleListQueryParams,
   RoleUsageUserQueryParams,
+  RoleSaveParams,
+  RoleUpdateParams,
   TournamentAdminRolePageVO,
   RoleUsageUserVO,
   PermissionTreeNode,
@@ -22,6 +20,8 @@ export type {
   RoleUsageUserVO,
   RoleListQueryParams,
   RoleUsageUserQueryParams,
+  RoleSaveParams,
+  RoleUpdateParams,
   PermissionTreeNode,
   PageData,
   ApiResult,
@@ -30,56 +30,49 @@ export type {
 // ============================================================
 // URL 常量
 // ============================================================
-const roleList = '/sys/role/page';
-const roleUsageUserList = '/sys/role/usageUserPage';
-const rolePermissionList = '/sys/role/permissionList';
-const roleDelete = '/sys/role/del';
-
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
+const roleList = '/admin/sys/role/page';
+const roleSave = '/admin/sys/role/save';
+const roleUpdate = '/admin/sys/role/update';
+const roleUsageUserList = '/admin/sys/role/usageUserPage';
+const rolePermissionList = '/admin/sys/role/permissionList';
+const roleDelete = '/admin/sys/role/del';
 
 // ============================================================
 // API 函数
 // ============================================================
 
-/** 角色列表分页 */
-export async function getRoleList(
+/** 角色列表分页 — GET /admin/sys/role/page */
+export function getRoleList(
   params: RoleListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminRolePageVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockRoleListPage(page, limit) };
-  }
   return get(roleList, params as Record<string, any>);
 }
 
-/** 角色下用户列表分页 */
-export async function getRoleUsageUserList(
+/** 新增角色 — POST /admin/sys/role/save */
+export function saveRole(params: RoleSaveParams): Promise<ApiResult<Record<string, never>>> {
+  return post(roleSave, params);
+}
+
+/** 更新角色 — POST /admin/sys/role/update */
+export function updateRole(params: RoleUpdateParams): Promise<ApiResult<Record<string, never>>> {
+  return post(roleUpdate, params);
+}
+
+/** 角色下用户列表分页 — GET /admin/sys/role/usageUserPage */
+export function getRoleUsageUserList(
   params: RoleUsageUserQueryParams,
 ): Promise<ApiResult<PageData<RoleUsageUserVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockRoleUsageUserPage(page, limit) };
-  }
   return get(roleUsageUserList, params as Record<string, any>);
 }
 
-/** 角色权限树 */
-export async function getPermissionTree(
+/** 角色权限树 — GET /admin/sys/role/permissionList */
+export function getPermissionTree(
   roleId: number | string,
 ): Promise<ApiResult<PermissionTreeNode[]>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const id = Number(roleId) || 0;
-    return { code: 200, msg: 'success', data: buildMockPermissionTree(id) };
-  }
   return get(rolePermissionList, { roleId: String(roleId) });
 }
 
-/** 删除角色 */
+/** 删除角色 — POST /admin/sys/role/del */
 export function deleteRole(id: number): Promise<ApiResult<null>> {
   return post(roleDelete, { id });
 }
diff --git a/src/pages/system/roles/model/useRoleModel.ts b/src/pages/system/roles/model/useRoleModel.ts
index 7355ebe..65f2452 100644
--- a/src/pages/system/roles/model/useRoleModel.ts
+++ b/src/pages/system/roles/model/useRoleModel.ts
@@ -3,6 +3,8 @@ import { message } from 'ant-design-vue';
 import { useState, useDebounce, useThrottleFn } from '@/hooks';
 import {
   getRoleList,
+  saveRole,
+  updateRole,
   deleteRole,
   type TournamentAdminRolePageVO,
   type RoleListQueryParams,
@@ -125,11 +127,31 @@ export function useRoleModel() {
     if (formSubmitting.value) return;
     setFormSubmitting(true);
     try {
-      console.log(isEdit.value ? '编辑角色' : '新增角色', formPayload);
-      // TODO: 替换为真实 API 调用（/sys/role/save、/sys/role/update）
-      message.success(isEdit.value ? '编辑成功' : '新增成功');
-      handleCloseForm();
-      handleSearch();
+      // 从叶节点权限中提取选中的 menuIds
+      const menuIds: string[] = (formPayload.leafPermissions || [])
+        .filter((item: any) => item.selected === true)
+        .map((item: any) => String(item.id));
+
+      let res: any;
+      if (isEdit.value) {
+        res = await updateRole({
+          id: String(formPayload.roleId),
+          name: formPayload.roleName,
+          menuIds,
+        });
+      } else {
+        res = await saveRole({
+          name: formPayload.roleName,
+          menuIds,
+        });
+      }
+      if (res.code == 200) {
+        message.success(isEdit.value ? '编辑成功' : '新增成功');
+        handleCloseForm();
+        handleSearch();
+      } else {
+        message.error(res.msg || '操作失败');
+      }
     } catch {
       // 网络层已统一提示，不再重复 message.error
     } finally {
diff --git a/src/pages/system/users/model/services.ts b/src/pages/system/users/model/services.ts
index d850d85..bd3362a 100644
--- a/src/pages/system/users/model/services.ts
+++ b/src/pages/system/users/model/services.ts
@@ -3,7 +3,6 @@
  * 该页面使用的所有接口集中管理
  */
 import { get, post } from '@/utils/request';
-import { fetchPermissions } from '@/api/menu';
 import type {
   UserListQueryParams,
   UserSaveParams,
@@ -29,6 +28,7 @@ export type {
 // ============================================================
 // URL 常量
 // ============================================================
+const userPage = '/admin/sys/user/page';
 const userSave = '/sys/user/save';
 const userUpdate = '/sys/user/update';
 const userActive = '/sys/user/active';
@@ -39,47 +39,14 @@ const userUpdatePwd = '/sys/user/updatepwd';
 // ============================================================
 
 /**
- * 用户列表 - 通过 fetchPermissions 接口获取用户权限列表
- * 接口: GET /admin/sys/role/permissionList
- * 返回权限编码列表，前端做分页处理
+ * 用户列表分页
+ * 接口: GET /admin/sys/user/page
+ * 参数: page, limit, text(姓名/手机号), roleId(角色ID), status(0=停用,1=正常)
  */
-export async function getUserList(
-  _params: UserListQueryParams,
+export function getUserList(
+  params: UserListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminUserVO>>> {
-  // 调用 fetchPermissions 获取用户权限数据
-  const list = await fetchPermissions();
-
-  // 将权限编码字符串转为类用户列表格式，支持分页
-  const page = Number(_params.page) || 1;
-  const limit = Number(_params.limit) || 10;
-  const start = (page - 1) * limit;
-  const end = start + limit;
-  const pagedList = list.slice(start, end);
-
-  // 将权限编码映射为用户 VO 格式（后端返回的权限码可能包含用户信息）
-  const userListData: TournamentAdminUserVO[] = pagedList.map((item, index) => {
-    // 如果 item 是对象则直接使用，如果是字符串则构造基本结构
-    if (typeof item === 'object' && item !== null) {
-      return item as unknown as TournamentAdminUserVO;
-    }
-    return {
-      id: String(start + index + 1),
-      realName: String(item),
-      phone: '',
-      roleName: '',
-      status: '1',
-      createTime: '',
-    } as TournamentAdminUserVO;
-  });
-
-  return {
-    code: 200,
-    msg: 'success',
-    data: {
-      total: list.length,
-      list: userListData,
-    },
-  };
+  return get(userPage, params as Record<string, any>);
 }
 
 /** 新增用户 */
-- 
2.52.0


From 1251a0be83b11ec40685b6be16b98edf52cf6dcd Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Tue, 4 Aug 2026 18:45:49 +0800
Subject: [PATCH 06/25] =?UTF-8?q?fix:=20=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=A1=B5=E9=9D=A2=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system/logs/model/services.ts       |  2 +-
 .../system/roles/components/RoleFormModal.tsx | 31 ++++++++++---------
 src/pages/system/roles/controller.ts          | 30 ------------------
 src/pages/system/roles/model/useRoleModel.ts  |  6 ++--
 4 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/src/pages/system/logs/model/services.ts b/src/pages/system/logs/model/services.ts
index 0ae76db..bcdf9d3 100644
--- a/src/pages/system/logs/model/services.ts
+++ b/src/pages/system/logs/model/services.ts
@@ -22,7 +22,7 @@ export type {
 // ============================================================
 // URL 常量
 // ============================================================
-const operationLogList = '/sys/operation/page';
+const operationLogList = '/admin/sys/operation/page';
 
 const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
diff --git a/src/pages/system/roles/components/RoleFormModal.tsx b/src/pages/system/roles/components/RoleFormModal.tsx
index e1effd5..84fbd86 100644
--- a/src/pages/system/roles/components/RoleFormModal.tsx
+++ b/src/pages/system/roles/components/RoleFormModal.tsx
@@ -2,12 +2,7 @@ import { defineComponent, ref, reactive, watch } from 'vue';
 import { Modal, Form, Input, Tree, Button, Spin, message } from 'ant-design-vue';
 import type { TreeProps } from 'ant-design-vue';
 import { getPermissionTree, type PermissionTreeNode } from '../model/services';
-import {
-  roleNameRules,
-  buildTreeData,
-  extractLeafPermissions,
-  type AntdTreeNode,
-} from '../controller';
+import { roleNameRules, buildTreeData, type AntdTreeNode } from '../controller';
 import styles from './RoleFormModal.module.less';
 
 interface RoleFormModalProps {
@@ -110,18 +105,26 @@ export default defineComponent({
         return;
       }
 
-      const isEdit = !!props.record;
-      // 仅提取叶节点 { id, selected } 传给后端
-      const leafPermissions = extractLeafPermissions(rawApiTree.value);
+      // 从原始权限树中收集所有叶节点 ID（children 为空或不存在）
+      const leafNodeIds = new Set<string>();
+      const collectLeafIds = (nodes: PermissionTreeNode[]) => {
+        for (const node of nodes) {
+          if (!node.children || node.children.length === 0) {
+            leafNodeIds.add(String(node.id));
+          } else {
+            collectLeafIds(node.children);
+          }
+        }
+      };
+      collectLeafIds(rawApiTree.value);
+
+      // 从用户当前勾选的 checkedKeys 中只取叶节点 ID
+      const menuIds = formData.checkedKeys.filter((key: string) => leafNodeIds.has(key));
 
       props.onSave({
         roleName: formData.roleName,
         roleId: props.record?.roleId,
-        // 完整选中 key 列表（含父节点），供向后兼容
-        permissions: formData.checkedKeys,
-        // 仅叶节点数据，后端实际需要的格式
-        leafPermissions,
-        isEdit,
+        menuIds,
       });
     };
 
diff --git a/src/pages/system/roles/controller.ts b/src/pages/system/roles/controller.ts
index 4c31f20..4598935 100644
--- a/src/pages/system/roles/controller.ts
+++ b/src/pages/system/roles/controller.ts
@@ -66,33 +66,3 @@ export function buildTreeData(apiTree: PermissionTreeNode[]): {
   const treeData = apiTree.map((node) => convertNode(node, leafKeys));
   return { treeData, checkedKeys: Array.from(leafKeys) };
 }
-
-/**
- * 从后端权限树中提取叶节点数据，整理为提交格式。
- *
- * 只返回叶节点，格式为 `{ id, selected }` 数组。
- * 父节点的勾选状态由后端根据叶节点数据推导，前端不传父节点。
- */
-export function extractLeafPermissions(
-  apiTree: PermissionTreeNode[],
-): { id: number; selected: boolean }[] {
-  const result: { id: number; selected: boolean }[] = [];
-
-  const walk = (nodes: PermissionTreeNode[]) => {
-    for (const node of nodes) {
-      const isLeaf = !node.children || node.children.length === 0;
-      if (isLeaf) {
-        result.push({
-          id: node.id,
-          // null 视为 false，即未授权
-          selected: node.selected === true,
-        });
-      } else {
-        walk(node.children!);
-      }
-    }
-  };
-
-  walk(apiTree);
-  return result;
-}
diff --git a/src/pages/system/roles/model/useRoleModel.ts b/src/pages/system/roles/model/useRoleModel.ts
index 65f2452..f9fbdb8 100644
--- a/src/pages/system/roles/model/useRoleModel.ts
+++ b/src/pages/system/roles/model/useRoleModel.ts
@@ -127,10 +127,8 @@ export function useRoleModel() {
     if (formSubmitting.value) return;
     setFormSubmitting(true);
     try {
-      // 从叶节点权限中提取选中的 menuIds
-      const menuIds: string[] = (formPayload.leafPermissions || [])
-        .filter((item: any) => item.selected === true)
-        .map((item: any) => String(item.id));
+      // menuIds 由 RoleFormModal 从用户勾选的 checkedKeys 中过滤叶节点后传入
+      const menuIds: string[] = formPayload.menuIds || [];
 
       let res: any;
       if (isEdit.value) {
-- 
2.52.0


From 2e6f7ca552eeb9caec43c5e98c2a4aaa2d275a67 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Tue, 4 Aug 2026 19:00:34 +0800
Subject: [PATCH 07/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E8=B5=9B?=
 =?UTF-8?q?=E4=BA=8B=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E4=B8=AD=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=B1=BB=E5=9E=8B=E4=B8=8E=E6=93=8D=E4=BD=9C=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E4=B8=8D=E8=BD=AC=E5=8C=96=E6=88=90=E4=B8=AD=E6=96=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

---
 src/api/logs/types.ts           |  5 ++++-
 src/pages/events/logs/index.tsx | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/api/logs/types.ts b/src/api/logs/types.ts
index 21cefd2..87cdf03 100644
--- a/src/api/logs/types.ts
+++ b/src/api/logs/types.ts
@@ -16,8 +16,11 @@ export interface SysOperationLogVO {
 
 /** 赛事操作日志列表项 */
 export interface TournamentAdminOperationPageVO {
-  opName: string;
+  /** 操作类型：1=创建赛事、2=删除赛事、3=取消报名、4=编辑选手、5=对阵管理、6=批量修改组别 */
+  type: string;
+  /** 操作来源：1=PC、2=小程序 */
   source: string;
+  opName: string;
   nickname: string;
   phone: string;
   tournamentName: string;
diff --git a/src/pages/events/logs/index.tsx b/src/pages/events/logs/index.tsx
index 92e9564..ea7d58d 100644
--- a/src/pages/events/logs/index.tsx
+++ b/src/pages/events/logs/index.tsx
@@ -81,12 +81,25 @@ export default defineComponent({
     const { containerRef, height } = useContainerSize({ headerOffset: 55 });
 
     /** 渲染 bodyCell */
-    const renderBodyCell = ({ column, text }: { column: any; text: any }) => {
+    const renderBodyCell = ({
+      column,
+      text,
+      record,
+      index,
+    }: {
+      column: any;
+      text: any;
+      record: any;
+      index: number;
+    }) => {
       if (column.key === 'content') {
         const raw = text || '';
         return raw ? <LogContentCell text={raw} /> : <span>-</span>;
       }
-      // 其他列使用 columns 中的 customRender
+      // 有 customRender 的列使用其渲染函数（如操作类型/操作来源的代码→中文映射）
+      if (column.customRender) {
+        return column.customRender({ text, record, index, column });
+      }
       return <span>{text || '-'}</span>;
     };
 
-- 
2.52.0


From 503ee266b0d72d1efcd2d5d52e988fde3cbcd4e3 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Wed, 5 Aug 2026 14:33:21 +0800
Subject: [PATCH 08/25] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88vue=E5=8E=9F?=
 =?UTF-8?q?=E7=94=9F=E9=92=A9=E5=AD=90=E5=87=BD=E6=95=B0=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/roles/index.ts                        |   2 +-
 src/api/users/index.ts                        |   8 +-
 src/pages/events/banner/index.tsx             |  12 +-
 .../events/banner/model/useBannerModel.ts     |  72 +++++-----
 src/pages/events/logs/index.tsx               |  22 +--
 src/pages/finance/payments/index.tsx          |  12 +-
 .../payments/model/usePaymentsModel.ts        | 101 ++++++-------
 src/pages/finance/reports/index.tsx           |  31 ++--
 src/pages/finance/wallet/index.tsx            |  12 +-
 .../finance/wallet/model/useWalletModel.ts    | 129 ++++++++---------
 src/pages/finance/withdraw/index.tsx          |  13 +-
 .../withdraw/model/useWithdrawModel.ts        |  93 ++++++------
 src/pages/system/logs/index.tsx               |  13 +-
 src/pages/system/logs/model/useLogModel.ts    | 100 +++++++------
 .../system/roles/components/UserListModal.tsx |   2 -
 src/pages/system/roles/index.tsx              |  13 +-
 src/pages/system/roles/model/useRoleModel.ts  |  90 ++++++------
 .../system/users/components/UserFormModal.tsx | 126 ++++++++++++++++-
 src/pages/system/users/controller.ts          |   8 --
 src/pages/system/users/index.tsx              |  18 +--
 src/pages/system/users/model/services.ts      |   6 +-
 src/pages/system/users/model/useUserModel.ts  | 133 ++++++++++--------
 22 files changed, 569 insertions(+), 447 deletions(-)

diff --git a/src/api/roles/index.ts b/src/api/roles/index.ts
index fcda64f..4a0628d 100644
--- a/src/api/roles/index.ts
+++ b/src/api/roles/index.ts
@@ -38,7 +38,7 @@ export async function getRoleList(
     const limit = Number(params.limit) || 10;
     return { code: 200, msg: 'success', data: buildMockRoleListPage(page, limit) };
   }
-  return get('/sys/role/page', params as Record<string, any>);
+  return get('/admin/sys/role/page', params as Record<string, any>);
 }
 
 /** GET /sys/role/usageUserPage — 角色下用户列表分页 */
diff --git a/src/api/users/index.ts b/src/api/users/index.ts
index 1ab6212..0375cfc 100644
--- a/src/api/users/index.ts
+++ b/src/api/users/index.ts
@@ -41,16 +41,16 @@ export async function getUserList(
   return get('/admin/sys/user/page', params as Record<string, any>);
 }
 
-/** POST /sys/user/save — 新增用户 */
+/** POST /admin/sys/user/save — 新增用户 */
 export function saveUser(params: UserSaveParams): Promise<ApiResult<Record<string, never>>> {
   if (USE_MOCK) return delay(MOCK_DELAY).then(() => ({ code: 200, msg: 'success', data: {} }));
-  return post('/sys/user/save', params);
+  return post('/admin/sys/user/save', params);
 }
 
-/** POST /sys/user/update — 更新用户 */
+/** POST /admin/sys/user/update — 更新用户 */
 export function updateUser(params: UserUpdateParams): Promise<ApiResult<Record<string, never>>> {
   if (USE_MOCK) return delay(MOCK_DELAY).then(() => ({ code: 200, msg: 'success', data: {} }));
-  return post('/sys/user/update', params);
+  return post('/admin/sys/user/update', params);
 }
 
 /** POST /sys/user/active — 启用/禁用（直接调接口） */
diff --git a/src/pages/events/banner/index.tsx b/src/pages/events/banner/index.tsx
index af46bac..b7c3722 100644
--- a/src/pages/events/banner/index.tsx
+++ b/src/pages/events/banner/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent } from 'vue';
 import {
   Button,
   Input,
@@ -171,10 +171,6 @@ export default defineComponent({
       },
     ];
 
-    onMounted(() => {
-      handleSearch();
-    });
-
     return () => (
       <div class={pageStyles.containerMain}>
         <div class={pageStyles.filter}>
@@ -237,9 +233,9 @@ export default defineComponent({
 
           <div class={pageStyles.pagination}>
             <Pagination
-              current={pagination.value.current}
-              pageSize={pagination.value.pageSize}
-              total={pagination.value.total}
+              current={(pagination as any).current.value}
+              pageSize={(pagination as any).pageSize.value}
+              total={(pagination as any).total.value}
               showSizeChanger
               showTotal={(total: number) => `共 ${total} 条`}
               onChange={handlePageChange}
diff --git a/src/pages/events/banner/model/useBannerModel.ts b/src/pages/events/banner/model/useBannerModel.ts
index 229d2c5..132c633 100644
--- a/src/pages/events/banner/model/useBannerModel.ts
+++ b/src/pages/events/banner/model/useBannerModel.ts
@@ -2,6 +2,9 @@ import { computed, reactive, toRef, Ref, h } from 'vue';
 import { message } from 'ant-design-vue';
 import { StatusTag, type StatusTagTone } from '@/components';
 import { useState, useDebounce, useThrottleFn } from '@/hooks';
+import { useRequest } from '@/hooks/useRequest';
+import { useEffect } from '@/hooks/useEffect';
+import { usePagination } from '@/hooks/usePagination';
 import {
   getBannerList,
   delBanner,
@@ -61,21 +64,32 @@ export function useBannerModel() {
     { delay: 300 },
   );
 
-  // ===== 表格状态（API 返回全量，前端分页） =====
-  const [loading, setLoading] = useState<boolean>(false);
-  const [allData, setAllData] = useState<TournamentAdminBannerListVO[]>([]);
-  const [pagination, setPagination] = useState({
-    current: 1,
-    pageSize: 10,
-    total: 0,
+  // ===== 数据请求（API 返回全量，前端分页） =====
+  const {
+    data,
+    loading,
+    run: fetchList,
+  } = useRequest<TournamentAdminBannerListVO[]>(() => getBannerList(buildQueryParams()), {
+    refreshDeps: [],
+    formatResult: (res) => (res.code == 200 ? res.data : []),
   });
 
+  const allData = computed(() => data.value || []);
+
+  // ===== 前端分页 =====
+  const pagination = usePagination({ defaultCurrent: 1, defaultPageSize: 10 });
+
   /** 当前页数据（客户端切片） */
   const dataSource = computed(() => {
-    const start = (pagination.value.current - 1) * pagination.value.pageSize;
-    return allData.value.slice(start, start + pagination.value.pageSize);
+    const start = ((pagination as any).current.value - 1) * (pagination as any).pageSize.value;
+    return allData.value.slice(start, start + (pagination as any).pageSize.value);
   });
 
+  // 同步前端分页 total
+  useEffect(() => {
+    pagination.setTotal(allData.value.length);
+  }, [allData]);
+
   // ===== 弹窗状态 =====
   const [modalVisible, setModalVisible] = useState<boolean>(false);
   const [editingRecord, setEditingRecord] = useState<any>(null);
@@ -119,37 +133,21 @@ export function useBannerModel() {
   // ===== 方法 =====
 
   /** 查询 */
-  const handleSearch = useThrottleFn(async () => {
-    setLoading(true);
-    try {
-      const queryParams = buildQueryParams();
-      console.log('Banner列表查询参数:', queryParams);
-      const res = await getBannerList(queryParams);
-
-      if (res.code == 200) {
-        setAllData(res.data);
-        setPagination({ current: 1, pageSize: 10, total: res.data.length });
-      } else {
-        message.error(res.msg || '查询失败');
-      }
-    } catch (error: any) {
-      console.error('Banner查询失败:', error);
-    } finally {
-      setLoading(false);
-    }
-  }, 500);
+  const handleSearch = () => fetchList();
 
   /** 重置 */
   const handleReset = useThrottleFn(() => {
     filterForm.title = '';
     filterForm.status = '';
-    setPagination({ current: 1, pageSize: 10, total: 0 });
-    setAllData([]);
-    setTimeout(() => handleSearch(), 350);
+    pagination.reset();
+    setTimeout(fetchList, 350);
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
-    setPagination({ ...pagination.value, current: page, pageSize });
+    pagination.setCurrent(page);
+    if (pageSize !== (pagination as any).pageSize.value) {
+      pagination.setPageSize(pageSize);
+    }
   };
 
   /** 打开新增弹窗 */
@@ -214,39 +212,33 @@ export function useBannerModel() {
 
   /** 删除 */
   const handleDelete = useThrottleFn(async (record: any) => {
-    setLoading(true);
     try {
       const res = await delBanner(record.id);
       if (res.code == 200) {
         message.success('删除成功');
-        handleSearch();
+        fetchList();
       } else {
         message.error(res.msg || '删除失败');
       }
     } catch (e: any) {
       console.error('Banner删除失败:', e);
-    } finally {
-      setLoading(false);
     }
   }, 500);
 
   /** 启用/禁用切换 */
   const handleToggleStatus = useThrottleFn(async (record: any) => {
-    setLoading(true);
     try {
       const newStatus = record.status === '1' ? '0' : '1';
       const actionText = newStatus === '1' ? '启用' : '禁用';
       const res = await toggleBannerActive({ id: record.id, status: newStatus });
       if (res.code == 200) {
         message.success(`${actionText}成功`);
-        handleSearch();
+        fetchList();
       } else {
         message.error(res.msg || '操作失败');
       }
     } catch (e: any) {
       console.error('Banner状态切换失败:', e);
-    } finally {
-      setLoading(false);
     }
   }, 500);
 
diff --git a/src/pages/events/logs/index.tsx b/src/pages/events/logs/index.tsx
index ea7d58d..431f049 100644
--- a/src/pages/events/logs/index.tsx
+++ b/src/pages/events/logs/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, onUnmounted, nextTick } from 'vue';
+import { defineComponent, ref, nextTick } from 'vue';
 import {
   Button,
   Input,
@@ -12,7 +12,7 @@ import {
 } from 'ant-design-vue';
 import { useLogModel, ACTION_TYPE_OPTIONS, ACTION_SOURCE_OPTIONS } from './model/useLogModel';
 import { useLogColumns } from './model/useLogColumns';
-import { useState, useContainerSize } from '@/hooks';
+import { useState, useEffect, useContainerSize } from '@/hooks';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
 import './index.module.less';
 
@@ -29,15 +29,17 @@ const LogContentCell = defineComponent({
       if (el) setOverflow(el.scrollHeight > el.clientHeight);
     };
     let observer: ResizeObserver | null = null;
-    onMounted(() => {
-      nextTick(checkOverflow);
+    useEffect(() => {
       const el = textRef.value;
-      if (el) {
-        observer = new ResizeObserver(checkOverflow);
-        observer.observe(el);
-      }
-    });
-    onUnmounted(() => observer?.disconnect());
+      if (!el) return;
+      nextTick(checkOverflow);
+      observer = new ResizeObserver(checkOverflow);
+      observer.observe(el);
+      return () => {
+        observer?.disconnect();
+        observer = null;
+      };
+    }, [() => textRef.value]);
     return () => {
       const raw = props.text;
       return (
diff --git a/src/pages/finance/payments/index.tsx b/src/pages/finance/payments/index.tsx
index dfe6a4f..a115760 100644
--- a/src/pages/finance/payments/index.tsx
+++ b/src/pages/finance/payments/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent } from 'vue';
 import { Button, Input, Table, Form, Space, Pagination, Select, DatePicker } from 'ant-design-vue';
 import { usePaymentsModel } from './model/usePaymentsModel';
 import { useContainerSize } from '@/hooks';
@@ -24,10 +24,6 @@ export default defineComponent({
 
     const { containerRef, height } = useContainerSize({ headerOffset: 55 });
 
-    onMounted(() => {
-      handleSearch();
-    });
-
     return () => (
       <div class={pageStyles.containerMain}>
         <div class={pageStyles.filter}>
@@ -101,9 +97,9 @@ export default defineComponent({
           </div>
           <div class={pageStyles.pagination}>
             <Pagination
-              current={pagination.value.current}
-              pageSize={pagination.value.pageSize}
-              total={pagination.value.total}
+              current={(pagination as any).current.value}
+              pageSize={(pagination as any).pageSize.value}
+              total={(pagination as any).total.value}
               showSizeChanger
               showTotal={(total: number) => `共 ${total} 条`}
               onChange={handlePageChange}
diff --git a/src/pages/finance/payments/model/usePaymentsModel.ts b/src/pages/finance/payments/model/usePaymentsModel.ts
index 71d08f6..a84e3c9 100644
--- a/src/pages/finance/payments/model/usePaymentsModel.ts
+++ b/src/pages/finance/payments/model/usePaymentsModel.ts
@@ -1,5 +1,5 @@
 import { computed, reactive, toRef, Ref } from 'vue';
-import { useState, useDebounce, useThrottleFn } from '@/hooks';
+import { useDebounce, useThrottleFn, useRequest, usePagination, useEffect } from '@/hooks';
 import { getPaymentFlowList, type PaymentFlowVO, type PaymentFlowQueryParams } from './services';
 import dayjs from 'dayjs';
 
@@ -40,13 +40,50 @@ export function usePaymentsModel() {
     { delay: 300 },
   );
 
-  // ===== 汇总 =====
-  const [summary, setSummary] = useState({ totalAmount: '0.00', totalRefundAmount: '0.00' });
+  // ===== 分页 =====
+  const pagination = usePagination({ defaultCurrent: 1, defaultPageSize: 10 });
 
-  // ===== 表格状态 =====
-  const [loading, setLoading] = useState<boolean>(false);
-  const [dataSource, setDataSource] = useState<PaymentFlowVO[]>([]);
-  const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 });
+  // ===== 构建 API 查询参数 =====
+  const buildQueryParams = (): PaymentFlowQueryParams => {
+    const params: PaymentFlowQueryParams = {
+      page: String((pagination as any).current.value),
+      limit: String((pagination as any).pageSize.value),
+    };
+    if (filterForm.timeRange) {
+      const [start, end] = filterForm.timeRange;
+      if (start) params.createDateBegin = dayjs(start).format('YYYY-MM-DD');
+      if (end) params.createDateEnd = dayjs(end).format('YYYY-MM-DD');
+    }
+    if (debouncedNickname.value.trim()) params.nickname = debouncedNickname.value.trim();
+    if (debouncedPhone.value.trim()) params.phone = debouncedPhone.value.trim();
+    if (filterForm.type) params.type = filterForm.type;
+    return params;
+  };
+
+  // ===== 请求 =====
+  const {
+    data,
+    loading,
+    run: fetchList,
+  } = useRequest(() => getPaymentFlowList(buildQueryParams()), {
+    refreshDeps: [],
+    formatResult: (res) => res,
+  });
+
+  const listData = computed(() => (data.value as any)?.data);
+  const dataSource = computed(() => listData.value?.list || []);
+
+  // 汇总：从 listData（即 res.data，包含 exData）派生
+  const summary = computed(() => ({
+    totalAmount: listData.value?.exData?.totalAmount ?? '0.00',
+    totalRefundAmount: listData.value?.exData?.totalRefundAmount ?? '0.00',
+  }));
+
+  // 同步 total 到 pagination
+  useEffect(() => {
+    const total = (data.value as any)?.data?.total;
+    if (total !== undefined) pagination.setTotal(total);
+  }, [data]);
 
   // ===== 表格列（dataIndex 对齐 API） =====
   const columns = [
@@ -81,59 +118,25 @@ export function usePaymentsModel() {
     );
   });
 
-  // ===== 构建 API 查询参数 =====
-  const buildQueryParams = (): PaymentFlowQueryParams => {
-    const params: PaymentFlowQueryParams = {
-      page: String(pagination.value.current),
-      limit: String(pagination.value.pageSize),
-    };
-    if (filterForm.timeRange) {
-      const [start, end] = filterForm.timeRange;
-      if (start) params.createDateBegin = dayjs(start).format('YYYY-MM-DD');
-      if (end) params.createDateEnd = dayjs(end).format('YYYY-MM-DD');
-    }
-    if (debouncedNickname.value.trim()) params.nickname = debouncedNickname.value.trim();
-    if (debouncedPhone.value.trim()) params.phone = debouncedPhone.value.trim();
-    if (filterForm.type) params.type = filterForm.type;
-    return params;
-  };
-
   // ===== 方法 =====
 
-  const handleSearch = useThrottleFn(async () => {
-    setLoading(true);
-    try {
-      const queryParams = buildQueryParams();
-      const res = await getPaymentFlowList(queryParams);
-      if (res.code == 200) {
-        setDataSource(res.data.list);
-        setPagination({ ...pagination.value, total: res.data.total });
-        setSummary({
-          totalAmount: res.data.exData?.totalAmount ?? '0.00',
-          totalRefundAmount: res.data.exData?.totalRefundAmount ?? '0.00',
-        });
-      }
-    } catch {
-      // 网络层已统一提示
-    } finally {
-      setLoading(false);
-    }
-  }, 500);
+  const handleSearch = () => fetchList();
 
   const handleReset = useThrottleFn(() => {
     filterForm.timeRange = null;
     filterForm.nickname = '';
     filterForm.phone = '';
     filterForm.type = '';
-    setPagination({ current: 1, pageSize: 10, total: 0 });
-    setDataSource([]);
-    setSummary({ totalAmount: '0.00', totalRefundAmount: '0.00' });
-    setTimeout(() => handleSearch(), 350);
+    pagination.reset();
+    setTimeout(fetchList, 350);
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
-    setPagination({ ...pagination.value, current: page, pageSize });
-    handleSearch();
+    pagination.setCurrent(page);
+    if (pageSize !== (pagination as any).pageSize.value) {
+      pagination.setPageSize(pageSize);
+    }
+    setTimeout(fetchList, 0);
   };
 
   return {
diff --git a/src/pages/finance/reports/index.tsx b/src/pages/finance/reports/index.tsx
index af30a0a..19c8968 100644
--- a/src/pages/finance/reports/index.tsx
+++ b/src/pages/finance/reports/index.tsx
@@ -1,7 +1,8 @@
-import { defineComponent, ref, onMounted, onBeforeUnmount, watch, nextTick } from 'vue';
+import { defineComponent, ref, nextTick } from 'vue';
 import { Select, Table } from 'ant-design-vue';
 import * as echarts from 'echarts';
 import { useReportsModel } from './model/useReportsModel';
+import { useEffect } from '@/hooks';
 import styles from './index.module.less';
 
 /**
@@ -140,23 +141,23 @@ export default defineComponent({
       chartInstance?.resize();
     };
 
-    onMounted(() => {
-      nextTick(() => {
-        renderChart();
-      });
+    // ECharts 挂载/销毁 + 窗口 resize 监听
+    useEffect(() => {
+      const el = chartRef.value;
+      if (!el) return;
+      nextTick(() => renderChart());
       window.addEventListener('resize', handleResize);
-    });
+      return () => {
+        window.removeEventListener('resize', handleResize);
+        chartInstance?.dispose();
+        chartInstance = null;
+      };
+    }, [() => chartRef.value]);
 
-    onBeforeUnmount(() => {
-      window.removeEventListener('resize', handleResize);
-      chartInstance?.dispose();
-      chartInstance = null;
-    });
-
-    // 时间范围切换时刷新图表（接入 API 后生效）
-    watch(range, () => {
+    // 时间范围切换时刷新图表
+    useEffect(() => {
       renderChart();
-    });
+    }, [range]);
 
     return () => {
       /** 根据增长率构建箭头 + 颜色（正值 ↑ 绿，负值 ↓ 红，null 时固定文本） */
diff --git a/src/pages/finance/wallet/index.tsx b/src/pages/finance/wallet/index.tsx
index 9c58968..550a0dd 100644
--- a/src/pages/finance/wallet/index.tsx
+++ b/src/pages/finance/wallet/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent } from 'vue';
 import { Button, Input, Table, Form, Space, Pagination } from 'ant-design-vue';
 import { WalletOutlined, LockOutlined, RiseOutlined } from '@ant-design/icons-vue';
 import { useWalletModel } from './model/useWalletModel';
@@ -68,10 +68,6 @@ export default defineComponent({
       },
     ];
 
-    onMounted(() => {
-      handleSearch();
-    });
-
     return () => {
       const statCards: StatCardItem[] = [
         {
@@ -206,9 +202,9 @@ export default defineComponent({
             </div>
             <div class={pageStyles.pagination}>
               <Pagination
-                current={pagination.value.current}
-                pageSize={pagination.value.pageSize}
-                total={pagination.value.total}
+                current={(pagination as any).current.value}
+                pageSize={(pagination as any).pageSize.value}
+                total={(pagination as any).total.value}
                 showSizeChanger
                 showTotal={(total: number) => `共 ${total} 条`}
                 onChange={handlePageChange}
diff --git a/src/pages/finance/wallet/model/useWalletModel.ts b/src/pages/finance/wallet/model/useWalletModel.ts
index 437496a..f98661e 100644
--- a/src/pages/finance/wallet/model/useWalletModel.ts
+++ b/src/pages/finance/wallet/model/useWalletModel.ts
@@ -1,5 +1,12 @@
 import { computed, reactive, toRef, Ref } from 'vue';
-import { useState, useDebounce, useThrottleFn } from '@/hooks';
+import {
+  useState,
+  useDebounce,
+  useThrottleFn,
+  useRequest,
+  usePagination,
+  useEffect,
+} from '@/hooks';
 import { getWalletList, type WalletSummaryVO, type WalletQueryParams } from './services';
 
 // ============================================================
@@ -58,17 +65,58 @@ export function useWalletModel() {
     { delay: 300 },
   );
 
-  // ===== 顶部统计（汇总值从接口返回的第一条记录中提取） =====
-  const [summary, setSummary] = useState({
-    totalBalance: '0.00',
-    frozenAmount: '0.00',
-    totalWithdraw: '0.00',
+  // ===== 分页 =====
+  const pagination = usePagination({ defaultCurrent: 1, defaultPageSize: 10 });
+
+  // ===== 构建 API 查询参数 =====
+  const buildQueryParams = (): WalletQueryParams => {
+    // 余额筛选：若起始 > 截止，互换两值
+    const min = Number(filterForm.minBalance);
+    const max = Number(filterForm.maxBalance);
+    if (filterForm.minBalance && filterForm.maxBalance && min > max) {
+      filterForm.minBalance = filterForm.maxBalance;
+      filterForm.maxBalance = String(min);
+    }
+
+    const params: WalletQueryParams = {
+      page: String((pagination as any).current.value),
+      limit: String((pagination as any).pageSize.value),
+    };
+    if (debouncedNickname.value.trim()) params.nickname = debouncedNickname.value.trim();
+    if (debouncedPhone.value.trim()) params.phone = debouncedPhone.value.trim();
+    if (filterForm.minBalance) params.amountBegin = filterForm.minBalance;
+    if (filterForm.maxBalance) params.amountEnd = filterForm.maxBalance;
+    return params;
+  };
+
+  // ===== 请求 =====
+  const {
+    data,
+    loading,
+    run: fetchList,
+  } = useRequest(() => getWalletList(buildQueryParams()), {
+    refreshDeps: [],
+    formatResult: (res) => res,
   });
 
-  // ===== 表格状态 =====
-  const [loading, setLoading] = useState<boolean>(false);
-  const [dataSource, setDataSource] = useState<WalletSummaryVO[]>([]);
-  const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 });
+  const listData = computed(() => (data.value as any)?.data);
+  const dataSource = computed(() => listData.value?.list || []);
+
+  // 汇总：从第一条记录提取
+  const summary = computed(() => {
+    const first = dataSource.value?.[0] as any;
+    return {
+      totalBalance: first?.totalAmount ?? '0.00',
+      frozenAmount: first?.totalFrozenAmount ?? '0.00',
+      totalWithdraw: first?.totalWithdrawalAmount ?? '0.00',
+    };
+  });
+
+  // 同步 total 到 pagination
+  useEffect(() => {
+    const total = (data.value as any)?.data?.total;
+    if (total !== undefined) pagination.setTotal(total);
+  }, [data]);
 
   // ===== 详情弹窗状态 =====
   const [detailVisible, setDetailVisible] = useState<boolean>(false);
@@ -112,70 +160,25 @@ export function useWalletModel() {
     );
   });
 
-  // ===== 构建 API 查询参数 =====
-  const buildQueryParams = (): WalletQueryParams => {
-    const params: WalletQueryParams = {
-      page: String(pagination.value.current),
-      limit: String(pagination.value.pageSize),
-    };
-    if (debouncedNickname.value.trim()) params.nickname = debouncedNickname.value.trim();
-    if (debouncedPhone.value.trim()) params.phone = debouncedPhone.value.trim();
-    if (filterForm.minBalance) params.amountBegin = filterForm.minBalance;
-    if (filterForm.maxBalance) params.amountEnd = filterForm.maxBalance;
-    return params;
-  };
-
   // ===== 方法 =====
 
-  const handleSearch = useThrottleFn(async () => {
-    setLoading(true);
-    try {
-      // 余额筛选：若起始 > 截止，互换两值
-      const min = Number(filterForm.minBalance);
-      const max = Number(filterForm.maxBalance);
-      if (filterForm.minBalance && filterForm.maxBalance && min > max) {
-        filterForm.minBalance = filterForm.maxBalance;
-        filterForm.maxBalance = String(min);
-      }
-
-      const params = buildQueryParams();
-      console.log('钱包列表查询参数:', params);
-      const res = await getWalletList(params);
-      if (res.code == 200) {
-        console.log('钱包列表查询结果:', { total: res.data.total, count: res.data.list.length });
-        setDataSource(res.data.list);
-        setPagination({ ...pagination.value, total: res.data.total });
-        // 从第一条记录提取汇总值
-        if (res.data.list.length > 0) {
-          const first = res.data.list[0];
-          setSummary({
-            totalBalance: first.totalAmount || '0.00',
-            frozenAmount: first.totalFrozenAmount || '0.00',
-            totalWithdraw: first.totalWithdrawalAmount || '0.00',
-          });
-        }
-      }
-    } catch {
-      // 网络层已统一提示
-    } finally {
-      setLoading(false);
-    }
-  }, 500);
+  const handleSearch = () => fetchList();
 
   const handleReset = useThrottleFn(() => {
     filterForm.nickname = '';
     filterForm.phone = '';
     filterForm.minBalance = '';
     filterForm.maxBalance = '';
-    setPagination({ current: 1, pageSize: 10, total: 0 });
-    setDataSource([]);
-    setSummary({ totalBalance: '0.00', frozenAmount: '0.00', totalWithdraw: '0.00' });
-    setTimeout(() => handleSearch(), 350);
+    pagination.reset();
+    setTimeout(fetchList, 350);
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
-    setPagination({ ...pagination.value, current: page, pageSize });
-    handleSearch();
+    pagination.setCurrent(page);
+    if (pageSize !== (pagination as any).pageSize.value) {
+      pagination.setPageSize(pageSize);
+    }
+    setTimeout(fetchList, 0);
   };
 
   const handleViewDetail = (record: any) => {
diff --git a/src/pages/finance/withdraw/index.tsx b/src/pages/finance/withdraw/index.tsx
index 233fa1b..e0aacd8 100644
--- a/src/pages/finance/withdraw/index.tsx
+++ b/src/pages/finance/withdraw/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent } from 'vue';
 import { Button, Input, Table, Form, Space, Pagination, Select } from 'ant-design-vue';
 import { useWithdrawModel, renderAuditStatus, renderPayStatus } from './model/useWithdrawModel';
 import { useContainerSize } from '@/hooks';
@@ -82,11 +82,6 @@ export default defineComponent({
       },
     ];
 
-    // 首次进入自动加载
-    onMounted(() => {
-      handleSearch();
-    });
-
     return () => (
       <div class={pageStyles.containerMain}>
         {/* ===== 筛选区 ===== */}
@@ -175,9 +170,9 @@ export default defineComponent({
           {/* 独立分页，右下方 */}
           <div class={pageStyles.pagination}>
             <Pagination
-              current={pagination.value.current}
-              pageSize={pagination.value.pageSize}
-              total={pagination.value.total}
+              current={(pagination as any).current.value}
+              pageSize={(pagination as any).pageSize.value}
+              total={(pagination as any).total.value}
               showSizeChanger
               showTotal={(total: number) => `共 ${total} 条`}
               onChange={handlePageChange}
diff --git a/src/pages/finance/withdraw/model/useWithdrawModel.ts b/src/pages/finance/withdraw/model/useWithdrawModel.ts
index a68e784..7239a2f 100644
--- a/src/pages/finance/withdraw/model/useWithdrawModel.ts
+++ b/src/pages/finance/withdraw/model/useWithdrawModel.ts
@@ -1,6 +1,13 @@
 import { computed, reactive, toRef, Ref, h } from 'vue';
 import { StatusTag, type StatusTagTone } from '@/components';
-import { useState, useDebounce, useThrottleFn } from '@/hooks';
+import {
+  useState,
+  useDebounce,
+  useThrottleFn,
+  useRequest,
+  usePagination,
+  useEffect,
+} from '@/hooks';
 import { getWithdrawList, type WithdrawVO, type WithdrawQueryParams } from './services';
 
 // ============================================================
@@ -93,10 +100,41 @@ export function useWithdrawModel() {
     { delay: 300 },
   );
 
-  // ===== 表格状态 =====
-  const [loading, setLoading] = useState<boolean>(false);
-  const [dataSource, setDataSource] = useState<WithdrawVO[]>([]);
-  const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 });
+  // ===== 分页 =====
+  const pagination = usePagination({ defaultCurrent: 1, defaultPageSize: 10 });
+
+  // ===== 构建 API 查询参数 =====
+  const buildQueryParams = (): WithdrawQueryParams => {
+    const params: WithdrawQueryParams = {
+      page: String((pagination as any).current.value),
+      limit: String((pagination as any).pageSize.value),
+    };
+    if (debouncedNickname.value.trim()) params.nickname = debouncedNickname.value.trim();
+    if (debouncedPhone.value.trim()) params.phone = debouncedPhone.value.trim();
+    if (debouncedRealName.value.trim()) params.realName = debouncedRealName.value.trim();
+    if (filterForm.auditStatus) params.auditStatus = filterForm.auditStatus;
+    if (filterForm.payStatus) params.payStatus = filterForm.payStatus;
+    return params;
+  };
+
+  // ===== 请求 =====
+  const {
+    data,
+    loading,
+    run: fetchList,
+  } = useRequest(() => getWithdrawList(buildQueryParams()), {
+    refreshDeps: [],
+    formatResult: (res) => res,
+  });
+
+  const listData = computed(() => (data.value as any)?.data);
+  const dataSource = computed(() => listData.value?.list || []);
+
+  // 同步 total 到 pagination
+  useEffect(() => {
+    const total = (data.value as any)?.data?.total;
+    if (total !== undefined) pagination.setTotal(total);
+  }, [data]);
 
   // ===== 审核弹窗状态 =====
   const [auditVisible, setAuditVisible] = useState<boolean>(false);
@@ -139,40 +177,9 @@ export function useWithdrawModel() {
     );
   });
 
-  // ===== 构建 API 查询参数 =====
-  const buildQueryParams = (): WithdrawQueryParams => {
-    const params: WithdrawQueryParams = {
-      page: String(pagination.value.current),
-      limit: String(pagination.value.pageSize),
-    };
-    if (debouncedNickname.value.trim()) params.nickname = debouncedNickname.value.trim();
-    if (debouncedPhone.value.trim()) params.phone = debouncedPhone.value.trim();
-    if (debouncedRealName.value.trim()) params.realName = debouncedRealName.value.trim();
-    if (filterForm.auditStatus) params.auditStatus = filterForm.auditStatus;
-    if (filterForm.payStatus) params.payStatus = filterForm.payStatus;
-    return params;
-  };
-
   // ===== 方法 =====
 
-  /** 查询（节流 500ms） */
-  const handleSearch = useThrottleFn(async () => {
-    setLoading(true);
-    try {
-      const queryParams = buildQueryParams();
-      console.log('提现列表查询参数:', queryParams);
-      const res = await getWithdrawList(queryParams);
-      if (res.code == 200) {
-        console.log('提现列表查询结果:', { total: res.data.total, count: res.data.list.length });
-        setDataSource(res.data.list);
-        setPagination({ ...pagination.value, total: res.data.total });
-      }
-    } catch {
-      // 网络层已统一提示
-    } finally {
-      setLoading(false);
-    }
-  }, 500);
+  const handleSearch = () => fetchList();
 
   /** 重置（重置后自动查询） */
   const handleReset = useThrottleFn(() => {
@@ -181,14 +188,16 @@ export function useWithdrawModel() {
     filterForm.realName = '';
     filterForm.auditStatus = '';
     filterForm.payStatus = '';
-    setPagination({ current: 1, pageSize: 10, total: 0 });
-    setDataSource([]);
-    setTimeout(() => handleSearch(), 350);
+    pagination.reset();
+    setTimeout(fetchList, 350);
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
-    setPagination({ ...pagination.value, current: page, pageSize });
-    handleSearch();
+    pagination.setCurrent(page);
+    if (pageSize !== (pagination as any).pageSize.value) {
+      pagination.setPageSize(pageSize);
+    }
+    setTimeout(fetchList, 0);
   };
 
   /** 打开审核弹窗 */
diff --git a/src/pages/system/logs/index.tsx b/src/pages/system/logs/index.tsx
index 265caf7..2054920 100644
--- a/src/pages/system/logs/index.tsx
+++ b/src/pages/system/logs/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent } from 'vue';
 import { Button, Input, Table, DatePicker, Form, Space, Select, Pagination } from 'ant-design-vue';
 import { useLogModel, ACTION_TYPE_OPTIONS, ACTION_TYPE_MAP } from './model/useLogModel';
 import { useContainerSize } from '@/hooks';
@@ -35,11 +35,6 @@ export default defineComponent({
 
     const { containerRef, height } = useContainerSize({ headerOffset: 55 });
 
-    // 首次进入自动加载
-    onMounted(() => {
-      handleSearch();
-    });
-
     return () => (
       <div class={pageStyles.containerMain}>
         {/* ===== 筛选区 ===== */}
@@ -102,9 +97,9 @@ export default defineComponent({
           {/* 独立分页 */}
           <div class={pageStyles.pagination}>
             <Pagination
-              current={pagination.value.current}
-              pageSize={pagination.value.pageSize}
-              total={pagination.value.total}
+              current={(pagination as any).current.value}
+              pageSize={(pagination as any).pageSize.value}
+              total={(pagination as any).total.value}
               showSizeChanger
               showTotal={(total: number) => `共 ${total} 条`}
               onChange={handlePageChange}
diff --git a/src/pages/system/logs/model/useLogModel.ts b/src/pages/system/logs/model/useLogModel.ts
index 6a269be..48c64f4 100644
--- a/src/pages/system/logs/model/useLogModel.ts
+++ b/src/pages/system/logs/model/useLogModel.ts
@@ -1,10 +1,15 @@
 import { computed, reactive, toRef, Ref } from 'vue';
 import dayjs from 'dayjs';
-import { useState, useDebounce, useThrottleFn } from '@/hooks';
+import { useDebounce, useThrottleFn } from '@/hooks';
+import { useRequest } from '@/hooks/useRequest';
+import { useEffect } from '@/hooks/useEffect';
+import { usePagination } from '@/hooks/usePagination';
 import {
   getOperationLogList,
   type SysOperationLogVO,
   type OperationLogQueryParams,
+  type PageData,
+  type ApiResult,
 } from './services';
 
 // ============================================================
@@ -49,33 +54,14 @@ export function useLogModel() {
     { delay: 300 },
   );
 
-  // ===== 表格状态 =====
-  const [loading, setLoading] = useState<boolean>(false);
-  const [dataSource, setDataSource] = useState<SysOperationLogVO[]>([]);
-  const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 });
-
-  // ===== 表格列配置（字段名对齐 API） =====
-  const columns = [
-    { title: '操作类型', dataIndex: 'type', key: 'type', width: 140 },
-    { title: '操作人', dataIndex: 'nickname', key: 'nickname', width: 140 },
-    { title: '操作内容', dataIndex: 'content', key: 'content', minWidth: 360 },
-    { title: '操作时间', dataIndex: 'createDate', key: 'createDate', width: 180 },
-  ];
-
-  // ===== 计算属性 =====
-  const hasFilter = computed(() => {
-    return (
-      filterForm.actionTimeRange !== null ||
-      filterForm.actionType !== '' ||
-      debouncedOperator.value.trim() !== ''
-    );
-  });
+  // ===== 分页 =====
+  const pagination = usePagination({ defaultCurrent: 1, defaultPageSize: 10 });
 
   // ===== 构建 API 查询参数 =====
   const buildQueryParams = (): OperationLogQueryParams => {
     const params: OperationLogQueryParams = {
-      page: String(pagination.value.current),
-      limit: String(pagination.value.pageSize),
+      page: String((pagination as any).current.value),
+      limit: String((pagination as any).pageSize.value),
     };
 
     // 时间范围 → dateBegin / dateEnd
@@ -98,38 +84,62 @@ export function useLogModel() {
     return params;
   };
 
+  // ===== 数据请求 =====
+  const {
+    data,
+    loading,
+    run: fetchList,
+  } = useRequest<ApiResult<PageData<SysOperationLogVO>>>(
+    () => getOperationLogList(buildQueryParams()),
+    { refreshDeps: [], formatResult: (res) => res },
+  );
+
+  const dataSource = computed(() => {
+    const res = data.value;
+    return res ? (res as any).data?.list || [] : [];
+  });
+
+  useEffect(() => {
+    const total = (data.value as any)?.data?.total;
+    if (total !== undefined) pagination.setTotal(total);
+  }, [data]);
+
+  // ===== 表格列配置（字段名对齐 API） =====
+  const columns = [
+    { title: '操作类型', dataIndex: 'type', key: 'type', width: 140 },
+    { title: '操作人', dataIndex: 'nickname', key: 'nickname', width: 140 },
+    { title: '操作内容', dataIndex: 'content', key: 'content', minWidth: 360 },
+    { title: '操作时间', dataIndex: 'createDate', key: 'createDate', width: 180 },
+  ];
+
+  // ===== 计算属性 =====
+  const hasFilter = computed(() => {
+    return (
+      filterForm.actionTimeRange !== null ||
+      filterForm.actionType !== '' ||
+      debouncedOperator.value.trim() !== ''
+    );
+  });
+
   // ===== 方法 =====
 
-  /** 查询（节流 500ms） */
-  const handleSearch = useThrottleFn(async () => {
-    setLoading(true);
-    try {
-      const queryParams = buildQueryParams();
-      const res = await getOperationLogList(queryParams);
-      if (res.code == 200) {
-        setDataSource(res.data.list);
-        setPagination({ ...pagination.value, total: res.data.total });
-      }
-    } catch {
-      // 网络层已统一提示
-    } finally {
-      setLoading(false);
-    }
-  }, 500);
+  const handleSearch = () => fetchList();
 
   /** 重置（重置后自动查询） */
   const handleReset = useThrottleFn(() => {
     filterForm.actionTimeRange = null;
     filterForm.actionType = '';
     filterForm.searchOperator = '';
-    setPagination({ current: 1, pageSize: 10, total: 0 });
-    setDataSource([]);
-    setTimeout(() => handleSearch(), 350);
+    pagination.reset();
+    setTimeout(fetchList, 350);
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
-    setPagination({ ...pagination.value, current: page, pageSize });
-    handleSearch();
+    pagination.setCurrent(page);
+    if (pageSize !== (pagination as any).pageSize.value) {
+      pagination.setPageSize(pageSize);
+    }
+    setTimeout(fetchList, 0);
   };
 
   return {
diff --git a/src/pages/system/roles/components/UserListModal.tsx b/src/pages/system/roles/components/UserListModal.tsx
index 19456cc..ab72ea7 100644
--- a/src/pages/system/roles/components/UserListModal.tsx
+++ b/src/pages/system/roles/components/UserListModal.tsx
@@ -143,7 +143,6 @@ export default defineComponent({
           columns={columns}
           dataSource={dataSource.value}
           loading={loading.value}
-          scroll={{ y: 300 }}
           size="small"
           pagination={false}
           bordered
@@ -164,7 +163,6 @@ export default defineComponent({
               pageSize={pagination.value.pageSize}
               total={pagination.value.total}
               size="small"
-              showSizeChanger
               showTotal={(total: number) => `共 ${total} 条`}
               onChange={handlePageChange}
             />
diff --git a/src/pages/system/roles/index.tsx b/src/pages/system/roles/index.tsx
index da6b2a0..9b614ff 100644
--- a/src/pages/system/roles/index.tsx
+++ b/src/pages/system/roles/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent } from 'vue';
 import { Button, Input, Table, Form, Space, Select, Modal, Pagination } from 'ant-design-vue';
 import type { ModalProps } from 'ant-design-vue';
 import { useRoleModel } from './model/useRoleModel';
@@ -114,11 +114,6 @@ export default defineComponent({
       },
     ];
 
-    // ===== 初始化 =====
-    onMounted(() => {
-      handleSearch();
-    });
-
     return () => (
       <div class={pageStyles.containerMain}>
         {/* ===== 筛选区 ===== */}
@@ -173,9 +168,9 @@ export default defineComponent({
           {/* 分页 */}
           <div class={pageStyles.pagination}>
             <Pagination
-              current={pagination.value.current}
-              pageSize={pagination.value.pageSize}
-              total={pagination.value.total}
+              current={(pagination as any).current.value}
+              pageSize={(pagination as any).pageSize.value}
+              total={(pagination as any).total.value}
               showSizeChanger
               showTotal={(total: number) => `共 ${total} 条`}
               onChange={handlePageChange}
diff --git a/src/pages/system/roles/model/useRoleModel.ts b/src/pages/system/roles/model/useRoleModel.ts
index f9fbdb8..015db08 100644
--- a/src/pages/system/roles/model/useRoleModel.ts
+++ b/src/pages/system/roles/model/useRoleModel.ts
@@ -1,6 +1,9 @@
 import { computed, reactive, toRef, Ref } from 'vue';
 import { message } from 'ant-design-vue';
 import { useState, useDebounce, useThrottleFn } from '@/hooks';
+import { useRequest } from '@/hooks/useRequest';
+import { useEffect } from '@/hooks/useEffect';
+import { usePagination } from '@/hooks/usePagination';
 import {
   getRoleList,
   saveRole,
@@ -8,6 +11,8 @@ import {
   deleteRole,
   type TournamentAdminRolePageVO,
   type RoleListQueryParams,
+  type PageData,
+  type ApiResult,
 } from './services';
 
 // ============================================================
@@ -27,10 +32,38 @@ export function useRoleModel() {
     delay: 300,
   });
 
-  // ===== 表格状态 =====
-  const [loading, setLoading] = useState<boolean>(false);
-  const [dataSource, setDataSource] = useState<TournamentAdminRolePageVO[]>([]);
-  const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 });
+  // ===== 分页 =====
+  const pagination = usePagination({ defaultCurrent: 1, defaultPageSize: 10 });
+
+  // ===== 构建 API 查询参数 =====
+  const buildQueryParams = (): RoleListQueryParams => {
+    const params: RoleListQueryParams = {
+      page: String((pagination as any).current.value),
+      limit: String((pagination as any).pageSize.value),
+    };
+    if (filterForm.name.trim()) params.name = filterForm.name.trim();
+    return params;
+  };
+
+  // ===== 数据请求 =====
+  const {
+    data,
+    loading,
+    run: fetchList,
+  } = useRequest<ApiResult<PageData<TournamentAdminRolePageVO>>>(
+    () => getRoleList(buildQueryParams()),
+    { refreshDeps: [], formatResult: (res) => res },
+  );
+
+  const dataSource = computed(() => {
+    const res = data.value;
+    return res ? (res as any).data?.list || [] : [];
+  });
+
+  useEffect(() => {
+    const total = (data.value as any)?.data?.total;
+    if (total !== undefined) pagination.setTotal(total);
+  }, [data]);
 
   // ===== 弹窗状态 =====
   const [formVisible, setFormVisible] = useState<boolean>(false);
@@ -55,53 +88,27 @@ export function useRoleModel() {
     { title: '创建时间', dataIndex: 'createTime', key: 'createTime', width: 200 },
   ];
 
-  // ===== 构建 API 查询参数 =====
-  const buildQueryParams = (): RoleListQueryParams => {
-    const params: RoleListQueryParams = {
-      page: String(pagination.value.current),
-      limit: String(pagination.value.pageSize),
-    };
-    if (filterForm.name.trim()) params.name = filterForm.name.trim();
-    return params;
-  };
-
   // ===== 计算属性 =====
   const hasFilter = computed(() => debouncedName.value.trim() !== '');
   const isEdit = computed(() => editingRecord.value !== null);
 
   // ===== 方法 =====
 
-  /** 查询（节流 500ms） */
-  const handleSearch = useThrottleFn(async () => {
-    setLoading(true);
-    try {
-      const queryParams = buildQueryParams();
-      console.log('角色列表查询参数:', queryParams);
-      const res = await getRoleList(queryParams);
-      if (res.code == 200) {
-        setDataSource(res.data.list);
-        setPagination({ ...pagination.value, total: res.data.total });
-      } else {
-        message.error(res.msg || '查询失败');
-      }
-    } catch (error: any) {
-      console.error('角色列表查询失败:', error);
-    } finally {
-      setLoading(false);
-    }
-  }, 500);
+  const handleSearch = () => fetchList();
 
   /** 重置（重置后自动查询） */
   const handleReset = useThrottleFn(() => {
     filterForm.name = '';
-    setPagination({ current: 1, pageSize: 10, total: 0 });
-    setDataSource([]);
-    setTimeout(() => handleSearch(), 350);
+    pagination.reset();
+    setTimeout(fetchList, 350);
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
-    setPagination({ ...pagination.value, current: page, pageSize });
-    handleSearch();
+    pagination.setCurrent(page);
+    if (pageSize !== (pagination as any).pageSize.value) {
+      pagination.setPageSize(pageSize);
+    }
+    setTimeout(fetchList, 0);
   };
 
   /** 新增 */
@@ -146,7 +153,7 @@ export function useRoleModel() {
       if (res.code == 200) {
         message.success(isEdit.value ? '编辑成功' : '新增成功');
         handleCloseForm();
-        handleSearch();
+        fetchList();
       } else {
         message.error(res.msg || '操作失败');
       }
@@ -159,19 +166,16 @@ export function useRoleModel() {
 
   /** 删除 */
   const handleDelete = useThrottleFn(async (record: any) => {
-    setLoading(true);
     try {
       const res = await deleteRole(record.roleId);
       if (res.code == 200) {
-        setDataSource(dataSource.value.filter((item: any) => item.roleId !== record.roleId));
         message.success('删除成功');
+        fetchList();
       } else {
         message.error(res.msg || '删除失败');
       }
     } catch {
       // 网络层已统一提示，不再重复 message.error
-    } finally {
-      setLoading(false);
     }
   }, 500);
 
diff --git a/src/pages/system/users/components/UserFormModal.tsx b/src/pages/system/users/components/UserFormModal.tsx
index 5eacad5..e1a2a3d 100644
--- a/src/pages/system/users/components/UserFormModal.tsx
+++ b/src/pages/system/users/components/UserFormModal.tsx
@@ -1,8 +1,8 @@
 import { defineComponent, ref, reactive } from 'vue';
 import { useEffect, useState } from '@/hooks';
 import { Modal, Form, Input, Select, Button } from 'ant-design-vue';
+import { getRoleList, type TournamentAdminRolePageVO } from '../../roles/model/services';
 import {
-  ROLE_FORM_OPTIONS,
   PASSWORD_PLACEHOLDER,
   realNameRules,
   phoneRules,
@@ -55,12 +55,84 @@ export default defineComponent({
     /** 编辑模式下是否处于"重置密码"状态 */
     const [isResetting, setIsResetting] = useState(false);
 
+    // ---- 角色搜索状态 ----
+    const roleKeyword = ref('');
+    const [roleOptions, setRoleOptions] = useState<{ value: string; label: string }[]>([]);
+    const [roleSearchLoading, setRoleSearchLoading] = useState(false);
+    /** 手动防抖计时器 */
+    let roleSearchTimer: ReturnType<typeof setTimeout> | null = null;
+
+    /** 已加载的全量角色缓存 */
+    const [allRoleOptions, setAllRoleOptions] = useState<{ value: string; label: string }[]>([]);
+
+    // ---- 角色搜索 API 调用（用户主动搜索，带 loading） ----
+    const doRoleSearch = async (keyword: string) => {
+      setRoleSearchLoading(true);
+      try {
+        const params: Record<string, string> = { page: '1', limit: '999', name: keyword.trim() };
+        const res = await getRoleList(params);
+        if (res.code == 200) {
+          const list: TournamentAdminRolePageVO[] = res.data?.list || [];
+          setRoleOptions(
+            list.map((item) => ({
+              value: String(item.roleId),
+              label: item.roleName,
+            })),
+          );
+        }
+      } catch (e) {
+        console.error('[UserForm] 搜索角色失败:', e);
+      } finally {
+        setRoleSearchLoading(false);
+      }
+    };
+
+    /** 初始加载全量角色（弹窗打开时调用，不带 loading，不覆盖已选值） */
+    const fetchInitialRoles = async () => {
+      try {
+        const res = await getRoleList({ page: '1', limit: '999' });
+        if (res.code == 200) {
+          const list: TournamentAdminRolePageVO[] = res.data?.list || [];
+          const opts = list.map((item) => ({
+            value: String(item.roleId),
+            label: item.roleName,
+          }));
+          // 确保已选角色在列表中
+          const selectedId = formData.roleId;
+          if (selectedId && !opts.some((o) => o.value === selectedId)) {
+            const cached = allRoleOptions.value.find((o) => o.value === selectedId);
+            if (cached) opts.unshift(cached);
+          }
+          setAllRoleOptions(opts);
+          setRoleOptions(opts);
+        }
+      } catch (e) {
+        console.error('[UserForm] 加载角色列表失败:', e);
+      }
+    };
+
+    /** 角色搜索输入（带 350ms 手动防抖） */
+    const onRoleSearch = (value: string) => {
+      roleKeyword.value = value;
+      if (roleSearchTimer) clearTimeout(roleSearchTimer);
+      if (!value.trim()) {
+        // 清空搜索：恢复全量角色
+        setRoleOptions(allRoleOptions.value);
+        return;
+      }
+      roleSearchTimer = setTimeout(() => {
+        doRoleSearch(value);
+      }, 350);
+    };
+
     /** 根据 record 初始化表单 */
     const initFormFromRecord = (record: any) => {
       if (!record) {
         // 新增：预填默认密码 + 确认密码
         Object.assign(formData, getAddForm());
         setIsResetting(false);
+        roleKeyword.value = '';
+        fetchInitialRoles();
         return;
       }
       const fresh = getDefaultForm();
@@ -71,6 +143,22 @@ export default defineComponent({
         roleId: record.roleId || undefined,
       });
       setIsResetting(false);
+
+      // 编辑模式：先回显已选角色，再静默加载全量角色
+      roleKeyword.value = '';
+      if (record.roleId) {
+        const selectedOpt = {
+          value: String(record.roleId),
+          label: record.roleName || String(record.roleId),
+        };
+        setAllRoleOptions([selectedOpt]);
+        setRoleOptions([selectedOpt]);
+      } else {
+        setAllRoleOptions([]);
+        setRoleOptions([]);
+      }
+      // 后台静默加载全量角色列表（API 返回后合并到选项，loading 为 false 不影响显示）
+      fetchInitialRoles();
     };
 
     /** 监听 visible 变化重置表单 */
@@ -82,6 +170,14 @@ export default defineComponent({
       }
     }, [() => props.visible]);
 
+    /** 关闭时清理防抖计时器 */
+    useEffect(() => {
+      if (!props.visible && roleSearchTimer) {
+        clearTimeout(roleSearchTimer);
+        roleSearchTimer = null;
+      }
+    }, [() => props.visible]);
+
     /** 点击"重置密码" */
     const handleResetPassword = () => {
       setIsResetting(true);
@@ -172,9 +268,19 @@ export default defineComponent({
                 </Form.Item>
                 <Form.Item label="角色" name="roleId" rules={roleRules} class={styles.col}>
                   <Select
-                    options={ROLE_FORM_OPTIONS as any}
-                    placeholder="请选择角色"
                     v-model:value={formData.roleId}
+                    showSearch
+                    filterOption={false}
+                    allowClear={!roleSearchLoading.value}
+                    loading={roleSearchLoading.value}
+                    placeholder="请输入关键字搜索角色"
+                    options={roleOptions.value as any}
+                    onSearch={onRoleSearch}
+                    onFocus={() => {
+                      if (formData.roleId && roleOptions.value.length === 0) {
+                        doRoleSearch(formData.roleId);
+                      }
+                    }}
                   />
                 </Form.Item>
               </div>
@@ -210,9 +316,19 @@ export default defineComponent({
                 {/* 角色：单独一行 */}
                 <Form.Item label="角色" name="roleId" rules={roleRules}>
                   <Select
-                    options={ROLE_FORM_OPTIONS as any}
-                    placeholder="请选择角色"
                     v-model:value={formData.roleId}
+                    showSearch
+                    filterOption={false}
+                    allowClear={!roleSearchLoading.value}
+                    loading={roleSearchLoading.value}
+                    placeholder="请输入关键字搜索角色"
+                    options={roleOptions.value as any}
+                    onSearch={onRoleSearch}
+                    onFocus={() => {
+                      if (formData.roleId && roleOptions.value.length === 0) {
+                        doRoleSearch(formData.roleId);
+                      }
+                    }}
                     style={{ width: '200px' }}
                   />
                 </Form.Item>
diff --git a/src/pages/system/users/controller.ts b/src/pages/system/users/controller.ts
index c13ca64..de0a6e1 100644
--- a/src/pages/system/users/controller.ts
+++ b/src/pages/system/users/controller.ts
@@ -14,14 +14,6 @@ import { isChinaPhone, isValidPassword, isValidRealName } from '@/utils/form';
 /** 密码占位符（写死长度，避免暴露真实密码长度） */
 export const PASSWORD_PLACEHOLDER = '********';
 
-/** 角色下拉选项（表单使用，value 对应 API roleId） */
-export const ROLE_FORM_OPTIONS = [
-  { value: '1', label: '超级管理员' },
-  { value: '2', label: '赛事管理员' },
-  { value: '3', label: '裁判' },
-  { value: '4', label: '财务' },
-] as const;
-
 // ============================================================
 // 真实姓名规则
 // ============================================================
diff --git a/src/pages/system/users/index.tsx b/src/pages/system/users/index.tsx
index 0eb6caf..c3d476b 100644
--- a/src/pages/system/users/index.tsx
+++ b/src/pages/system/users/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent } from 'vue';
 import {
   Button,
   Input,
@@ -10,7 +10,7 @@ import {
   Pagination,
   message,
 } from 'ant-design-vue';
-import { useUserModel, ROLE_OPTIONS, USER_STATUS_OPTIONS } from './model/useUserModel';
+import { useUserModel, USER_STATUS_OPTIONS } from './model/useUserModel';
 import { toggleUserActive, saveUser, updateUser } from './model/services';
 import { useState, useThrottleFn, useContainerSize } from '@/hooks';
 import UserFormModal from './components/UserFormModal';
@@ -60,6 +60,7 @@ export default defineComponent({
       dataSource,
       columns,
       pagination,
+      roleOptions,
       handleSearch,
       handleReset,
       handlePageChange,
@@ -175,11 +176,6 @@ export default defineComponent({
       },
     ];
 
-    // ===== 初始化 =====
-    onMounted(() => {
-      handleSearch();
-    });
-
     return () => (
       <div class={pageStyles.containerMain}>
         {/* ===== 筛选区 ===== */}
@@ -198,7 +194,7 @@ export default defineComponent({
             <Form.Item label="角色" name="roleId">
               <Select
                 value={filterForm.roleId}
-                options={ROLE_OPTIONS as any}
+                options={roleOptions.value as any}
                 style={{ width: '140px' }}
                 allowClear
                 placeholder="全部"
@@ -252,9 +248,9 @@ export default defineComponent({
           {/* 独立分页 */}
           <div class={pageStyles.pagination}>
             <Pagination
-              current={pagination.value.current}
-              pageSize={pagination.value.pageSize}
-              total={pagination.value.total}
+              current={(pagination as any).current.value}
+              pageSize={(pagination as any).pageSize.value}
+              total={(pagination as any).total.value}
               showSizeChanger
               showTotal={(total: number) => `共 ${total} 条`}
               onChange={handlePageChange}
diff --git a/src/pages/system/users/model/services.ts b/src/pages/system/users/model/services.ts
index bd3362a..0bba1a0 100644
--- a/src/pages/system/users/model/services.ts
+++ b/src/pages/system/users/model/services.ts
@@ -29,9 +29,9 @@ export type {
 // URL 常量
 // ============================================================
 const userPage = '/admin/sys/user/page';
-const userSave = '/sys/user/save';
-const userUpdate = '/sys/user/update';
-const userActive = '/sys/user/active';
+const userSave = '/admin/sys/user/save';
+const userUpdate = '/admin/sys/user/update';
+const userActive = '/admin/sys/user/active';
 const userUpdatePwd = '/sys/user/updatepwd';
 
 // ============================================================
diff --git a/src/pages/system/users/model/useUserModel.ts b/src/pages/system/users/model/useUserModel.ts
index 16b9c1f..1e7bf6e 100644
--- a/src/pages/system/users/model/useUserModel.ts
+++ b/src/pages/system/users/model/useUserModel.ts
@@ -1,22 +1,23 @@
-import { computed, reactive, toRef, Ref, h } from 'vue';
+import { computed, reactive, toRef, Ref, h, ref } from 'vue';
 import { message } from 'ant-design-vue';
 import { StatusTag, type StatusTagTone } from '@/components';
-import { useState, useDebounce, useThrottleFn } from '@/hooks';
-import { getUserList, type TournamentAdminUserVO, type UserListQueryParams } from './services';
+import { useDebounce, useThrottleFn } from '@/hooks';
+import { useRequest } from '@/hooks/useRequest';
+import { useEffect } from '@/hooks/useEffect';
+import { usePagination } from '@/hooks/usePagination';
+import {
+  getUserList,
+  type TournamentAdminUserVO,
+  type UserListQueryParams,
+  type PageData,
+  type ApiResult,
+} from './services';
+import { getRoleList, type TournamentAdminRolePageVO } from '../../roles/model/services';
 
 // ============================================================
 // 常量
 // ============================================================
 
-/** 角色选项（筛选） */
-export const ROLE_OPTIONS = [
-  { value: '', label: '全部' },
-  { value: '1', label: '超级管理员' },
-  { value: '2', label: '赛事管理员' },
-  { value: '3', label: '裁判' },
-  { value: '4', label: '财务' },
-] as const;
-
 /** 状态选项（筛选） */
 export const USER_STATUS_OPTIONS = [
   { value: '', label: '全部' },
@@ -45,20 +46,66 @@ export function useUserModel() {
     status: '' as '' | '0' | '1',
   });
 
+  // ===== 动态角色选项 =====
+  const roleOptions = ref<{ value: string; label: string }[]>([{ value: '', label: '全部' }]);
+
+  /** 加载全部角色列表（用于筛选下拉） */
+  const fetchRoleOptions = async () => {
+    try {
+      const res = await getRoleList({ page: '1', limit: '999' });
+      if (res.code == 200) {
+        const list: TournamentAdminRolePageVO[] = res.data?.list || [];
+        const opts = list.map((item) => ({
+          value: String(item.roleId),
+          label: item.roleName,
+        }));
+        roleOptions.value = [{ value: '', label: '全部' }, ...opts];
+      }
+    } catch (e) {
+      console.error('[UserModel] 加载角色列表失败:', e);
+    }
+  };
+
   // 文本筛选防抖 300ms
   const { debouncedValue: debouncedText } = useDebounce(toRef(filterForm, 'text') as Ref<string>, {
     delay: 300,
   });
 
-  // ===== 表格状态 =====
-  const [loading, setLoading] = useState<boolean>(false);
-  const [dataSource, setDataSource] = useState<TournamentAdminUserVO[]>([]);
-  const [pagination, setPagination] = useState({
-    current: 1,
-    pageSize: 10,
-    total: 0,
+  // ===== 分页 =====
+  const pagination = usePagination({ defaultCurrent: 1, defaultPageSize: 10 });
+
+  // ===== 构建 API 查询参数 =====
+  const buildQueryParams = (): UserListQueryParams => {
+    const params: UserListQueryParams = {
+      page: String((pagination as any).current.value),
+      limit: String((pagination as any).pageSize.value),
+    };
+    if (filterForm.text.trim()) params.text = filterForm.text.trim();
+    if (filterForm.roleId) params.roleId = filterForm.roleId;
+    if (filterForm.status) params.status = filterForm.status;
+    return params;
+  };
+
+  // ===== 数据请求 =====
+  const {
+    data,
+    loading,
+    run: fetchList,
+  } = useRequest<ApiResult<PageData<TournamentAdminUserVO>>>(
+    () => getUserList(buildQueryParams()),
+    { refreshDeps: [], formatResult: (res) => res },
+  );
+
+  const dataSource = computed(() => {
+    const res = data.value;
+    return res ? (res as any).data?.list || [] : [];
   });
 
+  useEffect(() => {
+    const total = (data.value as any)?.data?.total;
+    if (total !== undefined) pagination.setTotal(total);
+  }, [data]);
+
   // ===== 表格列配置 =====
   const columns = [
     { title: '姓名', dataIndex: 'realName', key: 'realName', width: 120 },
@@ -78,18 +125,6 @@ export function useUserModel() {
     { title: '创建时间', dataIndex: 'createTime', key: 'createTime', width: 180 },
   ];
 
-  // ===== 构建 API 查询参数 =====
-  const buildQueryParams = (): UserListQueryParams => {
-    const params: UserListQueryParams = {
-      page: String(pagination.value.current),
-      limit: String(pagination.value.pageSize),
-    };
-    if (filterForm.text.trim()) params.text = filterForm.text.trim();
-    if (filterForm.roleId) params.roleId = filterForm.roleId;
-    if (filterForm.status) params.status = filterForm.status;
-    return params;
-  };
-
   // ===== 计算属性 =====
   const hasFilter = computed(() => {
     return (
@@ -99,49 +134,37 @@ export function useUserModel() {
 
   // ===== 方法 =====
 
-  /** 查询（节流 500ms） */
-  const handleSearch = useThrottleFn(async () => {
-    setLoading(true);
-    try {
-      const queryParams = buildQueryParams();
-      console.log('用户列表查询参数:', queryParams);
-      const res = await getUserList(queryParams);
-      if (res.code == 200) {
-        setDataSource(res.data.list);
-        setPagination({ ...pagination.value, total: res.data.total });
-      } else {
-        message.error(res.msg || '查询失败');
-      }
-    } catch (error: any) {
-      console.error('用户列表查询失败:', error);
-    } finally {
-      setLoading(false);
-    }
-  }, 500);
+  const handleSearch = () => fetchList();
 
   /** 重置（节流 500ms，重置后自动查询） */
   const handleReset = useThrottleFn(() => {
     filterForm.text = '';
     filterForm.roleId = '';
     filterForm.status = '';
-    setPagination({ current: 1, pageSize: 10, total: 0 });
-    setDataSource([]);
+    pagination.reset();
     // 等待 debounce(300ms) 生效后自动查询
-    setTimeout(() => handleSearch(), 350);
+    setTimeout(fetchList, 350);
   }, 500);
 
   /** 分页变更 */
   const handlePageChange = (page: number, pageSize: number) => {
-    setPagination({ ...pagination.value, current: page, pageSize });
-    handleSearch();
+    pagination.setCurrent(page);
+    if (pageSize !== (pagination as any).pageSize.value) {
+      pagination.setPageSize(pageSize);
+    }
+    setTimeout(fetchList, 0);
   };
 
+  // ===== 初始化：加载角色选项 =====
+  fetchRoleOptions();
+
   return {
     filterForm,
     loading,
     dataSource,
     columns,
     pagination,
+    roleOptions,
     hasFilter,
     handleSearch,
     handleReset,
-- 
2.52.0


From 73d4d8fd34ba9b60e6cb3451b1d808e812810708 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Wed, 5 Aug 2026 15:30:09 +0800
Subject: [PATCH 09/25] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=94=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/authCache.ts                          | 17 ++++++
 src/api/menu.ts                               | 57 +++++++++++--------
 src/api/users/index.ts                        |  4 +-
 src/hooks/useAuth.ts                          | 55 ++++++++++++++----
 src/pages/events/banner/index.tsx             | 50 ++++++++++++----
 src/pages/events/list/index.tsx               | 52 ++++++++++-------
 .../orders/components/OrderDetailModal.tsx    |  4 +-
 src/pages/events/orders/index.tsx             |  9 ++-
 src/pages/events/users/index.tsx              |  5 ++
 src/pages/finance/wallet/index.tsx            | 13 ++++-
 src/pages/finance/withdraw/index.tsx          |  8 ++-
 src/pages/system/roles/index.tsx              | 40 ++++++++++---
 src/pages/system/users/index.tsx              | 40 ++++++++++---
 src/pages/system/users/model/services.ts      |  2 +-
 src/router/guard.ts                           | 11 ++++
 src/stores/menuStore.ts                       |  3 +
 src/stores/permissionStore.ts                 |  2 +
 src/utils/request.ts                          |  6 +-
 18 files changed, 283 insertions(+), 95 deletions(-)
 create mode 100644 src/api/authCache.ts

diff --git a/src/api/authCache.ts b/src/api/authCache.ts
new file mode 100644
index 0000000..590fe53
--- /dev/null
+++ b/src/api/authCache.ts
@@ -0,0 +1,17 @@
+import type { AuthData } from './menu';
+
+/** Promise 级缓存：并发调用共享同一个请求，失败时清除以便重试 */
+let authDataPromise: Promise<AuthData> | null = null;
+
+export function getAuthDataPromise() {
+  return authDataPromise;
+}
+
+export function setAuthDataPromise(promise: Promise<AuthData> | null) {
+  authDataPromise = promise;
+}
+
+/** 清除权限数据缓存（退出登录时调用，确保下次登录不读到旧数据） */
+export function clearAuthDataCache() {
+  authDataPromise = null;
+}
diff --git a/src/api/menu.ts b/src/api/menu.ts
index 5256af1..7c5d73c 100644
--- a/src/api/menu.ts
+++ b/src/api/menu.ts
@@ -1,15 +1,10 @@
 import { get } from '@/utils/request';
 import type { MenuNode, PermissionCode } from '@/types';
 import { FALLBACK_MENU_NODES } from '@/config/fallbackRoutes';
+import { getAuthDataPromise, setAuthDataPromise, clearAuthDataCache } from '@/api/authCache';
+import { forceReLogin } from '@/hooks/useAuth';
 
-// ============================================================
-// 权限数据缓存（/op/permission 只请求一次）
-// ============================================================
-
-/**
- * Promise 级缓存：并发调用共享同一个请求，失败时清除以便重试
- */
-let authDataPromise: Promise<AuthData> | null = null;
+export { clearAuthDataCache } from '@/api/authCache';
 
 /**
  * 权限数据（角色 + 权限码）
@@ -19,30 +14,46 @@ export interface AuthData {
   permsList: string[];
 }
 
+const AUTH_FETCH_FAIL_MSG = '账户权限获取失败，请重新登录';
+
+function normalizeAuthData(res: any): AuthData {
+  if (res?.code != null && res.code != 200) {
+    throw new Error(res.msg || AUTH_FETCH_FAIL_MSG);
+  }
+
+  const roleList = res?.data?.roleList || [];
+  const permsList = res?.data?.permsList || [];
+
+  if (permsList.length === 0) {
+    throw new Error(AUTH_FETCH_FAIL_MSG);
+  }
+
+  return { roleList, permsList };
+}
+
+function handleAuthFetchFailure() {
+  clearAuthDataCache();
+  forceReLogin(AUTH_FETCH_FAIL_MSG);
+}
+
 /**
  * 获取当前用户的完整权限数据（角色列表 + 权限编码列表）
  * 接口: GET /op/permission
  * Promise 级缓存：并发调用共享同一个请求，失败时清除缓存以允许重试
  */
 export function fetchAuthData(): Promise<AuthData> {
-  if (authDataPromise) return authDataPromise;
-  authDataPromise = get('/op/permission')
-    .then((res: any) => ({
-      roleList: res.data?.roleList || [],
-      permsList: res.data?.permsList || [],
-    }))
+  const cached = getAuthDataPromise();
+  if (cached) return cached;
+
+  const promise = get('/op/permission')
+    .then((res) => normalizeAuthData(res))
     .catch((err) => {
-      authDataPromise = null;
+      handleAuthFetchFailure();
       throw err;
     });
-  return authDataPromise;
-}
 
-/**
- * 清除权限数据缓存（退出登录时调用，确保下次登录不读到旧数据）
- */
-export function clearAuthDataCache() {
-  authDataPromise = null;
+  setAuthDataPromise(promise);
+  return promise;
 }
 
 /**
@@ -95,7 +106,7 @@ function filterMenuNodesByPermission(nodes: MenuNode[], permsSet: Set<string>):
  * 2. 用权限码过滤 FALLBACK_MENU_NODES
  * 3. 返回过滤后的菜单树
  *
- * 异常时抛出，由调用方（menuStore.loadMenu）降级使用未过滤的兜底路由
+ * 权限获取失败时由 fetchAuthData 统一强制重新登录
  */
 export function fetchMenuTree(): Promise<MenuNode[]> {
   return fetchAuthData().then(({ permsList }) => {
diff --git a/src/api/users/index.ts b/src/api/users/index.ts
index 0375cfc..8d5b318 100644
--- a/src/api/users/index.ts
+++ b/src/api/users/index.ts
@@ -57,12 +57,12 @@ export function updateUser(params: UserUpdateParams): Promise<ApiResult<Record<s
 export function toggleUserActive(
   params: UserActiveParams,
 ): Promise<ApiResult<Record<string, never>>> {
-  return post('/sys/user/active', params);
+  return post('/admin/sys/user/active', params);
 }
 
 /** POST /sys/user/updatepwd — 修改密码（直接调接口） */
 export function updateUserPwd(
   params: UserUpdatePwdParams,
 ): Promise<ApiResult<Record<string, never>>> {
-  return post('/sys/user/updatepwd', params);
+  return post('/admin/sys/user/updatepwd', params);
 }
diff --git a/src/hooks/useAuth.ts b/src/hooks/useAuth.ts
index 677b41e..8a81d87 100644
--- a/src/hooks/useAuth.ts
+++ b/src/hooks/useAuth.ts
@@ -1,14 +1,18 @@
 // src/hooks/useAuth.ts
+import { notification } from 'ant-design-vue';
 import { useState } from './useState';
 import { useEffect } from './useEffect';
 import { useMenuStore } from '@/stores/menuStore';
 import { usePermissionStore } from '@/stores/permissionStore';
 import { useTabsStore } from '@/stores/tabsStore';
-import { clearAuthDataCache } from '@/api/menu';
+import { useUserStore } from '@/stores/userStore';
+import { clearAuthDataCache } from '@/api/authCache';
 import router from '@/router';
 
 const TOKEN_KEY = 'MY_APP_AUTH_TOKEN';
 
+let isForceLoggingOut = false;
+
 function createAuth() {
   const [token, setToken] = useState<string | null>(window.localStorage.getItem(TOKEN_KEY));
 
@@ -23,10 +27,26 @@ function createAuth() {
 
   const isLoggedIn = () => !!token.value;
 
+  const clearSession = () => {
+    setToken(null);
+
+    const { clearUser } = useUserStore();
+    const { clearMenu } = useMenuStore();
+    const { clearPermissions } = usePermissionStore();
+    const { clearTabs } = useTabsStore();
+
+    clearUser();
+    clearTabs();
+    clearMenu();
+    clearPermissions();
+    clearAuthDataCache();
+  };
+
   /**
    * 登录:保存 token → 拉取菜单+权限 → 动态注册路由 → 跳转首页
    */
   const login = async (newToken: string, targetPath?: string) => {
+    isForceLoggingOut = false;
     setToken(newToken);
 
     const { loadMenu, homePath, isRoutePathAvailable } = useMenuStore();
@@ -35,6 +55,9 @@ function createAuth() {
     // 并行拉取菜单和权限
     await Promise.all([loadMenu(), loadPermissions()]);
 
+    // 权限获取失败时会清空会话，此时不再跳转首页
+    if (!isLoggedIn()) return;
+
     const nextPath =
       targetPath && isRoutePathAvailable(targetPath) ? targetPath : homePath.value || '/404';
 
@@ -46,17 +69,7 @@ function createAuth() {
    * 退出:清除 token → 清除菜单+权限 → 清除动态路由 → 跳转登录页
    */
   const logout = () => {
-    setToken(null);
-
-    const { clearMenu } = useMenuStore();
-    const { clearPermissions } = usePermissionStore();
-    const { clearTabs } = useTabsStore();
-
-    clearTabs();
-    clearMenu();
-    clearPermissions();
-    clearAuthDataCache();
-
+    clearSession();
     router.push('/login');
   };
 
@@ -65,7 +78,25 @@ function createAuth() {
     isLoggedIn,
     login,
     logout,
+    clearSession,
   };
 }
 
 export const auth = createAuth();
+
+/**
+ * 强制重新登录：提示错误 → 清空会话 → 跳转登录页
+ * 用于权限获取失败、登录态失效等需要彻底重置会话的场景
+ */
+export function forceReLogin(msg = '账户权限获取失败，请重新登录') {
+  if (isForceLoggingOut) return;
+  isForceLoggingOut = true;
+
+  notification.error({
+    message: '提示',
+    description: msg,
+    duration: 2600,
+  });
+  auth.clearSession();
+  router.push('/login');
+}
diff --git a/src/pages/events/banner/index.tsx b/src/pages/events/banner/index.tsx
index b7c3722..fdaa669 100644
--- a/src/pages/events/banner/index.tsx
+++ b/src/pages/events/banner/index.tsx
@@ -13,6 +13,7 @@ import {
 } from 'ant-design-vue';
 import { useBannerModel, BANNER_STATUS_OPTIONS } from './model/useBannerModel';
 import { useContainerSize } from '@/hooks';
+import { usePermissionStore } from '@/stores/permissionStore';
 import BannerFormModal from './components/BannerFormModal';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
 
@@ -28,6 +29,7 @@ function renderBodyCell({
   onEdit,
   onToggleStatus,
   onDelete,
+  permissions,
 }: {
   column: any;
   text: any;
@@ -37,6 +39,11 @@ function renderBodyCell({
   onEdit: (record: any) => void;
   onToggleStatus: (record: any) => void;
   onDelete: (record: any) => void;
+  permissions: {
+    canEdit: boolean;
+    canToggleStatus: boolean;
+    canDelete: boolean;
+  };
 }) {
   // 图片列
   if (column.key === 'image') {
@@ -92,17 +99,26 @@ function renderBodyCell({
   // 操作列
   if (column.key === 'action') {
     const isEnabled = record.status === '1';
+    const { canEdit, canToggleStatus, canDelete } = permissions;
+    if (!canEdit && !canToggleStatus && !canDelete) return <span>-</span>;
+
     return (
       <Space>
-        <Button type="link" size="small" onClick={() => onEdit(record)}>
-          编辑
-        </Button>
-        <Button type="link" size="small" onClick={() => onToggleStatus(record)}>
-          {isEnabled ? '禁用' : '启用'}
-        </Button>
-        <Button type="link" size="small" danger onClick={() => onDelete(record)}>
-          删除
-        </Button>
+        {canEdit && (
+          <Button type="link" size="small" onClick={() => onEdit(record)}>
+            编辑
+          </Button>
+        )}
+        {canToggleStatus && (
+          <Button type="link" size="small" onClick={() => onToggleStatus(record)}>
+            {isEnabled ? '禁用' : '启用'}
+          </Button>
+        )}
+        {canDelete && (
+          <Button type="link" size="small" danger onClick={() => onDelete(record)}>
+            删除
+          </Button>
+        )}
       </Space>
     );
   }
@@ -136,6 +152,13 @@ export default defineComponent({
     } = useBannerModel();
 
     const { containerRef, height } = useContainerSize();
+    const { hasPermission } = usePermissionStore();
+    const canAdd = hasPermission('events.banner.add');
+    const operationPermissions = {
+      canEdit: hasPermission('events.banner.edit'),
+      canToggleStatus: hasPermission('events.banner.toggle_status'),
+      canDelete: hasPermission('events.banner.delete'),
+    };
 
     const confirmDelete = (record: any) => {
       Modal.confirm({
@@ -200,9 +223,11 @@ export default defineComponent({
                   查询
                 </Button>
                 <Button onClick={handleReset}>重置</Button>
-                <Button type="primary" onClick={handleAdd}>
-                  新增
-                </Button>
+                {canAdd && (
+                  <Button type="primary" onClick={handleAdd}>
+                    新增
+                  </Button>
+                )}
               </Space>
             </Form.Item>
           </Form>
@@ -226,6 +251,7 @@ export default defineComponent({
                     onEdit: handleEdit,
                     onToggleStatus: confirmToggleStatus,
                     onDelete: confirmDelete,
+                    permissions: operationPermissions,
                   }),
               }}
             </Table>
diff --git a/src/pages/events/list/index.tsx b/src/pages/events/list/index.tsx
index f0967c8..eb2a026 100644
--- a/src/pages/events/list/index.tsx
+++ b/src/pages/events/list/index.tsx
@@ -21,6 +21,7 @@ import {
 import { useEventListColumns } from './model/useEventListColumns';
 import { getProvinceCityCascaderOptions } from '@/utils/areaData';
 import { useContainerSize } from '@/hooks';
+import { usePermissionStore } from '@/stores/permissionStore';
 import EventRegulationModal from './components/EventRegulationModal';
 import EventDetailModal from './components/EventDetailModal';
 import EventAuditModal from './components/EventAuditModal';
@@ -63,6 +64,9 @@ export default defineComponent({
 
     const { columns } = useEventListColumns();
     const { containerRef, height } = useContainerSize();
+    const { hasPermission } = usePermissionStore();
+    const canToggleStatus = hasPermission('events.list.toggle_status');
+    const canViewRegulation = hasPermission('events.regulation.view');
 
     /** 省市两级 Cascader 数据（无区） */
     const provinceCityOptions = getProvinceCityCascaderOptions();
@@ -91,14 +95,16 @@ export default defineComponent({
             <Button type="link" size="small" onClick={() => openDetailModal(record)}>
               查看
             </Button>
-            <Button
-              type="link"
-              size="small"
-              loading={togglingId.value === record.id}
-              onClick={() => handleToggleShelf(record)}
-            >
-              下架
-            </Button>
+            {canToggleStatus && (
+              <Button
+                type="link"
+                size="small"
+                loading={togglingId.value === record.id}
+                onClick={() => handleToggleShelf(record)}
+              >
+                下架
+              </Button>
+            )}
           </Space>
         );
       }
@@ -109,14 +115,16 @@ export default defineComponent({
             <Button type="link" size="small" onClick={() => openDetailModal(record)}>
               查看
             </Button>
-            <Button
-              type="link"
-              size="small"
-              loading={togglingId.value === record.id}
-              onClick={() => handleToggleShelf(record)}
-            >
-              上架
-            </Button>
+            {canToggleStatus && (
+              <Button
+                type="link"
+                size="small"
+                loading={togglingId.value === record.id}
+                onClick={() => handleToggleShelf(record)}
+              >
+                上架
+              </Button>
+            )}
           </Space>
         );
       }
@@ -145,9 +153,15 @@ export default defineComponent({
         width: 100,
         align: 'center' as const,
         customRender: ({ record }: { record: any }) => (
-          <a style={{ cursor: 'pointer' }} onClick={() => openRegulationModal(record)}>
-            查看
-          </a>
+          <>
+            {canViewRegulation ? (
+              <a style={{ cursor: 'pointer' }} onClick={() => openRegulationModal(record)}>
+                查看
+              </a>
+            ) : (
+              <span>-</span>
+            )}
+          </>
         ),
       },
       {
diff --git a/src/pages/events/orders/components/OrderDetailModal.tsx b/src/pages/events/orders/components/OrderDetailModal.tsx
index 2166e7e..1bb44f4 100644
--- a/src/pages/events/orders/components/OrderDetailModal.tsx
+++ b/src/pages/events/orders/components/OrderDetailModal.tsx
@@ -17,6 +17,7 @@ interface OrderDetailModalProps {
   uniqueId: string;
   onClose: () => void;
   onReRefund: () => void;
+  canReRefund?: boolean;
 }
 
 const GENDER_MAP: Record<string, string> = { '1': '男', '2': '女' };
@@ -118,6 +119,7 @@ export default defineComponent({
     uniqueId: { type: String, default: '' },
     onClose: { type: Function, default: null },
     onReRefund: { type: Function, default: null },
+    canReRefund: { type: Boolean, default: false },
   },
   setup(props: OrderDetailModalProps) {
     const [detail, setDetail] = useState<TournamentAdminOrderInfoVO | null>(null);
@@ -360,7 +362,7 @@ export default defineComponent({
           <div class={styles.modalFooter}>
             <Button onClick={props.onClose}>取消</Button>
             {/* 只有存在退款失败记录时才显示重新退款按钮 */}
-            {hasRefundFailed.value ? (
+            {props.canReRefund && hasRefundFailed.value ? (
               <Button danger onClick={props.onReRefund}>
                 重新退款
               </Button>
diff --git a/src/pages/events/orders/index.tsx b/src/pages/events/orders/index.tsx
index e9c51d3..5a97b67 100644
--- a/src/pages/events/orders/index.tsx
+++ b/src/pages/events/orders/index.tsx
@@ -15,6 +15,7 @@ import {
 import { useOrderModel, ORDER_STATUS_OPTIONS, REFUND_STATUS_OPTIONS } from './model/useOrderModel';
 import { retryRefundOrder } from './model/services';
 import { useContainerSize, useState } from '@/hooks';
+import { usePermissionStore } from '@/stores/permissionStore';
 import OrderDetailModal from './components/OrderDetailModal';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
 
@@ -58,12 +59,14 @@ function renderBodyCell({
   record,
   onView,
   onReRefund,
+  canReRefund,
 }: {
   column: any;
   text: any;
   record: any;
   onView: (record: any) => void;
   onReRefund: (record: any) => void;
+  canReRefund: boolean;
 }) {
   // 赛事名称：最多15字符，超出显示 Tooltip
   if (column.dataIndex === 'name') {
@@ -82,7 +85,7 @@ function renderBodyCell({
   if (column.key === 'action') {
     // 退款状态：1=无退款，2=退款成功，3=退款失败，-1=其他
     // 只有退款失败（3）时显示重新退款按钮
-    const showReRefund = record.refundStatus === '3';
+    const showReRefund = canReRefund && record.refundStatus === '3';
     return (
       <Space>
         <Button type="link" size="small" onClick={() => onView(record)}>
@@ -119,6 +122,8 @@ export default defineComponent({
     } = useOrderModel();
 
     const { containerRef, height } = useContainerSize();
+    const { hasPermission } = usePermissionStore();
+    const canReRefund = hasPermission('events.orders.refund');
 
     // 详情弹窗状态
     const [detailVisible, setDetailVisible] = useState<boolean>(false);
@@ -257,6 +262,7 @@ export default defineComponent({
                     ...args,
                     onView: handleView,
                     onReRefund: handleReRefund,
+                    canReRefund,
                   }),
               }}
             </Table>
@@ -286,6 +292,7 @@ export default defineComponent({
               setDetailVisible(false);
               promptReRefund(currentRecord.value);
             }}
+            canReRefund={canReRefund}
           />
         )}
       </div>
diff --git a/src/pages/events/users/index.tsx b/src/pages/events/users/index.tsx
index 39d2994..9548cc8 100644
--- a/src/pages/events/users/index.tsx
+++ b/src/pages/events/users/index.tsx
@@ -3,6 +3,7 @@ import { Button, Input, Table, Form, Space, Select, Pagination } from 'ant-desig
 import { useUserModel, USER_STATUS_OPTIONS } from './model/useUserModel';
 import { useUserColumns } from './model/useUserColumns';
 import { useContainerSize } from '@/hooks';
+import { usePermissionStore } from '@/stores/permissionStore';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
 
 /**
@@ -30,9 +31,13 @@ export default defineComponent({
 
     const { columns } = useUserColumns();
     const { containerRef, height } = useContainerSize();
+    const { hasPermission } = usePermissionStore();
+    const canToggleStatus = hasPermission('events.users.toggle_status');
 
     /** 渲染操作列 */
     const renderAction = (record: any) => {
+      if (!canToggleStatus) return <span>-</span>;
+
       const isActive = record.status === '1';
       return (
         <Button
diff --git a/src/pages/finance/wallet/index.tsx b/src/pages/finance/wallet/index.tsx
index 550a0dd..2919939 100644
--- a/src/pages/finance/wallet/index.tsx
+++ b/src/pages/finance/wallet/index.tsx
@@ -3,6 +3,7 @@ import { Button, Input, Table, Form, Space, Pagination } from 'ant-design-vue';
 import { WalletOutlined, LockOutlined, RiseOutlined } from '@ant-design/icons-vue';
 import { useWalletModel } from './model/useWalletModel';
 import { useContainerSize } from '@/hooks';
+import { usePermissionStore } from '@/stores/permissionStore';
 import WalletDetailModal from './components/WalletDetailModal';
 import styles from './index.module.less';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
@@ -20,13 +21,17 @@ function renderBodyCell({
   column,
   record,
   onViewDetail,
+  canViewDetail,
 }: {
   column: any;
   text: any;
   record: any;
   onViewDetail: (record: any) => void;
+  canViewDetail: boolean;
 }) {
   if (column.key === 'action') {
+    if (!canViewDetail) return <span>-</span>;
+
     return (
       <Button type="link" size="small" onClick={() => onViewDetail(record)}>
         明细
@@ -56,6 +61,8 @@ export default defineComponent({
     } = useWalletModel();
 
     const { containerRef, height } = useContainerSize({ headerOffset: 55 });
+    const { hasPermission } = usePermissionStore();
+    const canViewDetail = hasPermission('finance.wallet.detail');
 
     const tableColumns = [
       ...columns,
@@ -196,7 +203,11 @@ export default defineComponent({
               >
                 {{
                   bodyCell: (args: any) =>
-                    renderBodyCell({ ...args, onViewDetail: handleViewDetail }),
+                    renderBodyCell({
+                      ...args,
+                      onViewDetail: handleViewDetail,
+                      canViewDetail,
+                    }),
                 }}
               </Table>
             </div>
diff --git a/src/pages/finance/withdraw/index.tsx b/src/pages/finance/withdraw/index.tsx
index e0aacd8..bae8d92 100644
--- a/src/pages/finance/withdraw/index.tsx
+++ b/src/pages/finance/withdraw/index.tsx
@@ -2,6 +2,7 @@ import { defineComponent } from 'vue';
 import { Button, Input, Table, Form, Space, Pagination, Select } from 'ant-design-vue';
 import { useWithdrawModel, renderAuditStatus, renderPayStatus } from './model/useWithdrawModel';
 import { useContainerSize } from '@/hooks';
+import { usePermissionStore } from '@/stores/permissionStore';
 import WithdrawDetailModal from './components/WithdrawDetailModal';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
 
@@ -13,12 +14,14 @@ function renderBodyCell({
   record,
   onAudit,
   onView,
+  canAudit,
 }: {
   column: any;
   text: any;
   record: any;
   onAudit: (record: any) => void;
   onView: (record: any) => void;
+  canAudit: boolean;
 }) {
   if (column.key === 'auditStatus') {
     return renderAuditStatus(record.auditStatus);
@@ -28,7 +31,7 @@ function renderBodyCell({
   }
   if (column.key === 'action') {
     // auditStatus=0（待审核）→ 显示「审核」，其他 → 显示「查看」
-    if (record.auditStatus === 0) {
+    if (canAudit && record.auditStatus === 0) {
       return (
         <Button type="link" size="small" onClick={() => onAudit(record)}>
           审核
@@ -69,6 +72,8 @@ export default defineComponent({
     } = useWithdrawModel();
 
     const { containerRef, height } = useContainerSize({ headerOffset: 55 });
+    const { hasPermission } = usePermissionStore();
+    const canAudit = hasPermission('finance.withdraw.audit');
 
     /** 最终表格列：模型列 + 操作 */
     const tableColumns = [
@@ -162,6 +167,7 @@ export default defineComponent({
                     ...args,
                     onAudit: handleAudit,
                     onView: handleView,
+                    canAudit,
                   }),
               }}
             </Table>
diff --git a/src/pages/system/roles/index.tsx b/src/pages/system/roles/index.tsx
index 9b614ff..9ae6ce2 100644
--- a/src/pages/system/roles/index.tsx
+++ b/src/pages/system/roles/index.tsx
@@ -3,6 +3,7 @@ import { Button, Input, Table, Form, Space, Select, Modal, Pagination } from 'an
 import type { ModalProps } from 'ant-design-vue';
 import { useRoleModel } from './model/useRoleModel';
 import { useContainerSize } from '@/hooks';
+import { usePermissionStore } from '@/stores/permissionStore';
 import RoleFormModal from './components/RoleFormModal';
 import UserListModal from './components/UserListModal';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
@@ -16,6 +17,7 @@ function renderBodyCell({
   onViewUsers,
   onEdit,
   onDelete,
+  permissions,
 }: {
   column: any;
   text: any;
@@ -23,6 +25,10 @@ function renderBodyCell({
   onViewUsers: (record: any) => void;
   onEdit: (record: any) => void;
   onDelete: (record: any) => void;
+  permissions: {
+    canEdit: boolean;
+    canDelete: boolean;
+  };
 }) {
   if (column.dataIndex === 'userCount') {
     return (
@@ -33,14 +39,21 @@ function renderBodyCell({
   }
 
   if (column.key === 'action') {
+    const { canEdit, canDelete } = permissions;
+    if (!canEdit && !canDelete) return <span>-</span>;
+
     return (
       <Space>
-        <Button type="link" size="small" onClick={() => onEdit(record)}>
-          编辑
-        </Button>
-        <Button type="link" size="small" danger onClick={() => onDelete(record)}>
-          删除
-        </Button>
+        {canEdit && (
+          <Button type="link" size="small" onClick={() => onEdit(record)}>
+            编辑
+          </Button>
+        )}
+        {canDelete && (
+          <Button type="link" size="small" danger onClick={() => onDelete(record)}>
+            删除
+          </Button>
+        )}
       </Space>
     );
   }
@@ -100,6 +113,12 @@ export default defineComponent({
     } = useRoleModel();
 
     const { containerRef, height } = useContainerSize();
+    const { hasPermission } = usePermissionStore();
+    const canAdd = hasPermission('system.roles.add');
+    const operationPermissions = {
+      canEdit: hasPermission('system.roles.edit'),
+      canDelete: hasPermission('system.roles.delete'),
+    };
 
     const triggerDelete = (record: any) => confirmDelete({ record, onOk: handleDelete });
 
@@ -135,9 +154,11 @@ export default defineComponent({
                 <Button type="primary" onClick={handleSearch} loading={loading.value}>
                   查询
                 </Button>
-                <Button type="primary" onClick={handleAdd}>
-                  新增角色
-                </Button>
+                {canAdd && (
+                  <Button type="primary" onClick={handleAdd}>
+                    新增角色
+                  </Button>
+                )}
               </Space>
             </Form.Item>
           </Form>
@@ -160,6 +181,7 @@ export default defineComponent({
                     onViewUsers: handleViewUsers,
                     onEdit: handleEdit,
                     onDelete: triggerDelete,
+                    permissions: operationPermissions,
                   }),
               }}
             </Table>
diff --git a/src/pages/system/users/index.tsx b/src/pages/system/users/index.tsx
index c3d476b..7a152ce 100644
--- a/src/pages/system/users/index.tsx
+++ b/src/pages/system/users/index.tsx
@@ -13,6 +13,7 @@ import {
 import { useUserModel, USER_STATUS_OPTIONS } from './model/useUserModel';
 import { toggleUserActive, saveUser, updateUser } from './model/services';
 import { useState, useThrottleFn, useContainerSize } from '@/hooks';
+import { usePermissionStore } from '@/stores/permissionStore';
 import UserFormModal from './components/UserFormModal';
 import pageStyles from '@/assets/styles/pageLayout.module.less';
 
@@ -24,24 +25,36 @@ function renderBodyCell({
   record,
   onEdit,
   onToggleStatus,
+  permissions,
 }: {
   column: any;
   text: any;
   record: any;
   onEdit: (record: any) => void;
   onToggleStatus: (record: any) => void;
+  permissions: {
+    canEdit: boolean;
+    canToggleStatus: boolean;
+  };
 }) {
   // 操作列
   if (column.key === 'action') {
     const isActive = record.status === '1';
+    const { canEdit, canToggleStatus } = permissions;
+    if (!canEdit && !canToggleStatus) return <span>-</span>;
+
     return (
       <Space>
-        <Button type="link" size="small" onClick={() => onEdit(record)}>
-          编辑
-        </Button>
-        <Button type="link" size="small" onClick={() => onToggleStatus(record)}>
-          {isActive ? '停用' : '启用'}
-        </Button>
+        {canEdit && (
+          <Button type="link" size="small" onClick={() => onEdit(record)}>
+            编辑
+          </Button>
+        )}
+        {canToggleStatus && (
+          <Button type="link" size="small" onClick={() => onToggleStatus(record)}>
+            {isActive ? '停用' : '启用'}
+          </Button>
+        )}
       </Space>
     );
   }
@@ -67,6 +80,12 @@ export default defineComponent({
     } = useUserModel();
 
     const { containerRef, height } = useContainerSize();
+    const { hasPermission } = usePermissionStore();
+    const canAdd = hasPermission('system.users.add');
+    const operationPermissions = {
+      canEdit: hasPermission('system.users.edit'),
+      canToggleStatus: hasPermission('system.users.toggle_status'),
+    };
 
     // ===== 弹窗状态（组件级） =====
     const [modalVisible, setModalVisible] = useState<boolean>(false);
@@ -216,9 +235,11 @@ export default defineComponent({
                 <Button type="primary" onClick={handleSearch} loading={loading.value}>
                   查询
                 </Button>
-                <Button type="primary" onClick={handleAdd}>
-                  新增
-                </Button>
+                {canAdd && (
+                  <Button type="primary" onClick={handleAdd}>
+                    新增
+                  </Button>
+                )}
               </Space>
             </Form.Item>
           </Form>
@@ -240,6 +261,7 @@ export default defineComponent({
                     ...args,
                     onEdit: handleEdit,
                     onToggleStatus: handleToggleStatus,
+                    permissions: operationPermissions,
                   }),
               }}
             </Table>
diff --git a/src/pages/system/users/model/services.ts b/src/pages/system/users/model/services.ts
index 0bba1a0..6f4b4d3 100644
--- a/src/pages/system/users/model/services.ts
+++ b/src/pages/system/users/model/services.ts
@@ -32,7 +32,7 @@ const userPage = '/admin/sys/user/page';
 const userSave = '/admin/sys/user/save';
 const userUpdate = '/admin/sys/user/update';
 const userActive = '/admin/sys/user/active';
-const userUpdatePwd = '/sys/user/updatepwd';
+const userUpdatePwd = '/admin/sys/user/updatepwd';
 
 // ============================================================
 // API 函数
diff --git a/src/router/guard.ts b/src/router/guard.ts
index b3a501b..1e60872 100644
--- a/src/router/guard.ts
+++ b/src/router/guard.ts
@@ -39,6 +39,11 @@ router.beforeEach(async (to, _from, next) => {
         await Promise.all([loadMenu(), loadPermissions()]);
       }
 
+      if (!auth.isLoggedIn()) {
+        next();
+        return;
+      }
+
       const redirectPath = getRedirectPath(to.query.redirect);
       const targetPath =
         redirectPath && isRoutePathAvailable(redirectPath)
@@ -63,6 +68,12 @@ router.beforeEach(async (to, _from, next) => {
     const { loadPermissions } = usePermissionStore();
     await Promise.all([loadMenu(), loadPermissions()]);
 
+    // 权限获取失败时会清空会话，此时回登录页而不是继续进入业务页
+    if (!auth.isLoggedIn()) {
+      next({ path: '/login', replace: true });
+      return;
+    }
+
     // 动态路由刚注册,需要用新路由表重新匹配当前路径
     next({ path: to.fullPath, replace: true });
     return;
diff --git a/src/stores/menuStore.ts b/src/stores/menuStore.ts
index 5c29a3f..11f67d0 100644
--- a/src/stores/menuStore.ts
+++ b/src/stores/menuStore.ts
@@ -3,6 +3,7 @@ import type { RouteRecordRaw } from 'vue-router';
 import type { MenuNode, MenuItemRaw } from '@/types';
 import router, { resetRouter } from '@/router';
 import { fetchMenuTree } from '@/api/menu';
+import { auth } from '@/hooks/useAuth';
 import { pageModules } from '@/router/glob';
 import { FALLBACK_MENU_NODES } from '@/config/fallbackRoutes';
 
@@ -276,6 +277,8 @@ export function useMenuStore() {
       state.loaded = true;
     } catch (err) {
       console.error('加载菜单失败:', err);
+      // 权限获取失败时会强制重新登录，此时不再降级兜底菜单，避免错误路由状态
+      if (!auth.isLoggedIn()) return;
       // 降级:使用本地兜底菜单
       applyMenuTree(FALLBACK_MENU_NODES);
       state.loaded = true;
diff --git a/src/stores/permissionStore.ts b/src/stores/permissionStore.ts
index 9a49ee3..f250eac 100644
--- a/src/stores/permissionStore.ts
+++ b/src/stores/permissionStore.ts
@@ -1,6 +1,7 @@
 import { reactive, computed, toRefs } from 'vue';
 import type { PermissionCode } from '@/types';
 import { fetchAuthData } from '@/api/menu';
+import { auth } from '@/hooks/useAuth';
 
 interface PermissionState {
   /** 权限编码集合 */
@@ -31,6 +32,7 @@ export function usePermissionStore() {
       state.loaded = true;
     } catch (err) {
       console.error('加载权限失败:', err);
+      if (!auth.isLoggedIn()) return;
       state.codes = new Set();
       state.roles = [];
       state.loaded = true;
diff --git a/src/utils/request.ts b/src/utils/request.ts
index e386511..f89036f 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,4 +1,4 @@
-import { auth } from '@/hooks/';
+import { auth, forceReLogin } from '@/hooks/';
 import { message } from 'ant-design-vue';
 
 const baseUrl = import.meta.env?.VITE_API_BASE_URL || '';
@@ -8,9 +8,7 @@ const activeControllers = new Set<AbortController>();
 
 /** 统一处理 401 未授权逻辑 */
 const handleUnauthorized = (msg?: string) => {
-  auth.logout();
-  message.error(msg || '登录状态已过期，请重新登录');
-  window.location.href = '/login';
+  forceReLogin(msg || '登录状态已过期，请重新登录');
 };
 
 const request = (
-- 
2.52.0


From e79404aba90ef4a36da0aa0bedbc41586ecae2f8 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Wed, 5 Aug 2026 15:40:57 +0800
Subject: [PATCH 10/25] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/BasicLayout.tsx | 7 +++++--
 src/pages/login/index.tsx   | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx
index fc6064b..cd73a31 100644
--- a/src/layouts/BasicLayout.tsx
+++ b/src/layouts/BasicLayout.tsx
@@ -78,7 +78,7 @@ export default defineComponent({
     const [collapsed, setCollapsed] = useState(false);
 
     const { menuItems } = useMenuStore();
-    const { phone } = useUserStore();
+    const { phone, nickname } = useUserStore();
     const {
       tabs,
       cachedViews,
@@ -138,6 +138,9 @@ export default defineComponent({
         if (res.code == 200) {
           message.success('密码修改成功');
           setChangePwdVisible(false);
+          window.setTimeout(() => {
+            auth.logout();
+          }, 1500);
         } else {
           message.error(res.msg || '修改失败');
         }
@@ -229,7 +232,7 @@ export default defineComponent({
 
               {/* 右侧: 账号信息 + 退出 */}
               <div class={styles.headerRight}>
-                <span class={styles.userPhone}>{phone.value}</span>
+                <span class={styles.userPhone}>{nickname.value}</span>
                 <Dropdown trigger={['hover']} placement="bottomLeft">
                   {{
                     default: () => <img src={logoutSvg} class={styles.logoutIcon} />,
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 176767a..481fd37 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -55,6 +55,11 @@ export default defineComponent({
 
       try {
         const res = await loginApi({ phone: form.phone, password: form.password });
+        if (res.code != 200) {
+          message.error(res.msg || '登录失败');
+          return;
+        }
+
         setUser({ phone: form.phone, nickname: res.data.nickname, token: res.data.token });
 
         if (rememberMe.value) {
-- 
2.52.0


From b3458fd4b89ad094c8c0270b4d4cb931c5049d00 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Wed, 5 Aug 2026 16:02:01 +0800
Subject: [PATCH 11/25] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login/index.ts              |  9 ++++++++-
 src/api/login/types.ts              |  8 ++++++++
 src/api/menu.ts                     | 21 +++++++++++++++++---
 src/layouts/BasicLayout.module.less |  2 +-
 src/layouts/BasicLayout.tsx         |  3 ++-
 src/pages/login/index.tsx           |  6 +++++-
 src/stores/userStore.ts             | 30 +++++++++++++++++++++++++++--
 7 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 src/api/login/types.ts

diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index ab552ec..1acfc8a 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -1,5 +1,12 @@
 import { post } from '@/utils/request';
+import type { LoginResult } from './types';
+
+export type { LoginResult } from './types';
 
 export const login = (params: { phone: string; password: string }) => {
-  return post(`/op/login`, params);
+  return post(`/op/login`, params) as Promise<{
+    code: number;
+    msg: string;
+    data: LoginResult;
+  }>;
 };
diff --git a/src/api/login/types.ts b/src/api/login/types.ts
new file mode 100644
index 0000000..d152867
--- /dev/null
+++ b/src/api/login/types.ts
@@ -0,0 +1,8 @@
+export interface LoginResult {
+  token: string;
+  phone?: string;
+  nickName?: string;
+  realName?: string;
+  userName?: string;
+  name?: string;
+}
diff --git a/src/api/menu.ts b/src/api/menu.ts
index 7c5d73c..f9be5b1 100644
--- a/src/api/menu.ts
+++ b/src/api/menu.ts
@@ -3,6 +3,7 @@ import type { MenuNode, PermissionCode } from '@/types';
 import { FALLBACK_MENU_NODES } from '@/config/fallbackRoutes';
 import { getAuthDataPromise, setAuthDataPromise, clearAuthDataCache } from '@/api/authCache';
 import { forceReLogin } from '@/hooks/useAuth';
+import { useUserStore } from '@/stores/userStore';
 
 export { clearAuthDataCache } from '@/api/authCache';
 
@@ -12,6 +13,8 @@ export { clearAuthDataCache } from '@/api/authCache';
 export interface AuthData {
   roleList: string[];
   permsList: string[];
+  nickname: string;
+  phone: string;
 }
 
 const AUTH_FETCH_FAIL_MSG = '账户权限获取失败，请重新登录';
@@ -21,14 +24,26 @@ function normalizeAuthData(res: any): AuthData {
     throw new Error(res.msg || AUTH_FETCH_FAIL_MSG);
   }
 
-  const roleList = res?.data?.roleList || [];
-  const permsList = res?.data?.permsList || [];
+  const data = res?.data || {};
+  const roleList = data.roleList || [];
+  const permsList = data.permsList || [];
 
   if (permsList.length === 0) {
     throw new Error(AUTH_FETCH_FAIL_MSG);
   }
 
-  return { roleList, permsList };
+  const nickname = data.nickName || '';
+  const phone = typeof data.phone === 'string' ? data.phone : '';
+
+  if (nickname || phone) {
+    const { setUser } = useUserStore();
+    setUser({
+      ...(nickname ? { nickname } : {}),
+      ...(phone ? { phone } : {}),
+    });
+  }
+
+  return { roleList, permsList, nickname, phone };
 }
 
 function handleAuthFetchFailure() {
diff --git a/src/layouts/BasicLayout.module.less b/src/layouts/BasicLayout.module.less
index 2a25135..bf59f0e 100644
--- a/src/layouts/BasicLayout.module.less
+++ b/src/layouts/BasicLayout.module.less
@@ -62,7 +62,7 @@
     align-items: center;
   }
 
-  .userPhone {
+  .displayName {
     font-size: 14px;
     color: rgba(0, 0, 0, 0.65);
   }
diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx
index cd73a31..bcbd633 100644
--- a/src/layouts/BasicLayout.tsx
+++ b/src/layouts/BasicLayout.tsx
@@ -79,6 +79,7 @@ export default defineComponent({
 
     const { menuItems } = useMenuStore();
     const { phone, nickname } = useUserStore();
+    const displayName = computed(() => nickname.value || phone.value);
     const {
       tabs,
       cachedViews,
@@ -232,7 +233,7 @@ export default defineComponent({
 
               {/* 右侧: 账号信息 + 退出 */}
               <div class={styles.headerRight}>
-                <span class={styles.userPhone}>{nickname.value}</span>
+                <span class={styles.displayName}>{displayName.value}</span>
                 <Dropdown trigger={['hover']} placement="bottomLeft">
                   {{
                     default: () => <img src={logoutSvg} class={styles.logoutIcon} />,
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 481fd37..8f1059c 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -60,7 +60,11 @@ export default defineComponent({
           return;
         }
 
-        setUser({ phone: form.phone, nickname: res.data.nickname, token: res.data.token });
+        setUser({
+          phone: res.data.phone || form.phone,
+          nickname: res.data.nickName || '',
+          token: res.data.token,
+        });
 
         if (rememberMe.value) {
           localStorage.setItem(
diff --git a/src/stores/userStore.ts b/src/stores/userStore.ts
index 1fc5fc1..6d8074d 100644
--- a/src/stores/userStore.ts
+++ b/src/stores/userStore.ts
@@ -9,9 +9,32 @@ interface UserState {
   token: string;
 }
 
+const USER_PROFILE_KEY = 'cpms_user_profile';
+
+function loadUserProfile(): Pick<UserState, 'phone' | 'nickname'> {
+  try {
+    const raw = window.localStorage.getItem(USER_PROFILE_KEY);
+    if (!raw) return { phone: '', nickname: '' };
+    const data = JSON.parse(raw);
+    return {
+      phone: typeof data.phone === 'string' ? data.phone : '',
+      nickname: typeof data.nickname === 'string' ? data.nickname : '',
+    };
+  } catch {
+    window.localStorage.removeItem(USER_PROFILE_KEY);
+    return { phone: '', nickname: '' };
+  }
+}
+
+function persistUserProfile(profile: Pick<UserState, 'phone' | 'nickname'>) {
+  window.localStorage.setItem(USER_PROFILE_KEY, JSON.stringify(profile));
+}
+
+const savedProfile = loadUserProfile();
+
 const state = reactive<UserState>({
-  phone: '',
-  nickname: '',
+  phone: savedProfile.phone,
+  nickname: savedProfile.nickname,
   token: '',
 });
 
@@ -20,12 +43,15 @@ export function useUserStore() {
     if (user.phone !== undefined) state.phone = user.phone;
     if (user.nickname !== undefined) state.nickname = user.nickname;
     if (user.token !== undefined) state.token = user.token;
+
+    persistUserProfile({ phone: state.phone, nickname: state.nickname });
   };
 
   const clearUser = () => {
     state.phone = '';
     state.nickname = '';
     state.token = '';
+    window.localStorage.removeItem(USER_PROFILE_KEY);
   };
 
   return {
-- 
2.52.0


From 8951733a2d92a1a99c75980e2983c3e78cb2d2d2 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Wed, 5 Aug 2026 16:28:44 +0800
Subject: [PATCH 12/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E6=96=B9=E9=9D=A2=E9=97=AE=E9=A2=98=E4=B8=8Ebanner?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wallet/index.ts                       |  4 +-
 src/api/wallet/types.ts                       | 17 +++++-
 src/config/mock/walletList.ts                 | 58 +++----------------
 .../events/banner/model/useBannerModel.ts     | 25 ++++----
 src/pages/finance/wallet/model/services.ts    |  4 +-
 .../finance/wallet/model/useWalletModel.ts    | 15 ++---
 src/pages/finance/withdraw/index.tsx          |  2 +-
 7 files changed, 47 insertions(+), 78 deletions(-)

diff --git a/src/api/wallet/index.ts b/src/api/wallet/index.ts
index 9d605d5..4714102 100644
--- a/src/api/wallet/index.ts
+++ b/src/api/wallet/index.ts
@@ -9,6 +9,7 @@ import { buildMockWalletTransactionPage } from '@/config/mock/walletTransactions
 import type {
   WalletQueryParams,
   WalletSummaryVO,
+  WalletSummaryPageData,
   WalletTransactionQueryParams,
   WalletTransactionVO,
   PageData,
@@ -17,6 +18,7 @@ import type {
 
 export type {
   WalletSummaryVO,
+  WalletSummaryPageData,
   WalletQueryParams,
   WalletTransactionVO,
   WalletTransactionQueryParams,
@@ -29,7 +31,7 @@ const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 /** GET /admin/finance/wallet/summary — 钱包列表分页 */
 export async function getWalletList(
   params: WalletQueryParams,
-): Promise<ApiResult<PageData<WalletSummaryVO>>> {
+): Promise<ApiResult<WalletSummaryPageData>> {
   if (USE_MOCK) {
     await delay(MOCK_DELAY);
     const page = Number(params.page) || 1;
diff --git a/src/api/wallet/types.ts b/src/api/wallet/types.ts
index 5f993e9..a0dc2aa 100644
--- a/src/api/wallet/types.ts
+++ b/src/api/wallet/types.ts
@@ -17,14 +17,25 @@ export interface WalletSummaryVO {
   frozenAmount: string;
   /** 累计成功提现金额（"0.00"格式） */
   withdrawalAmount: string;
-  /** 汇总行-总余额 */
+}
+
+/** 钱包汇总扩展数据（与 total 同级） */
+export interface WalletSummaryExData {
+  /** 总余额 */
   totalAmount: string;
-  /** 汇总行-总冻结金额 */
+  /** 总冻结金额 */
   totalFrozenAmount: string;
-  /** 汇总行-总累计提现 */
+  /** 总累计提现 */
   totalWithdrawalAmount: string;
 }
 
+/** 钱包列表分页响应 */
+export interface WalletSummaryPageData {
+  total: number;
+  list: WalletSummaryVO[];
+  exData: WalletSummaryExData;
+}
+
 /** 钱包列表查询参数 */
 export interface WalletQueryParams {
   page?: string;
diff --git a/src/config/mock/walletList.ts b/src/config/mock/walletList.ts
index afd273c..c7b4a5a 100644
--- a/src/config/mock/walletList.ts
+++ b/src/config/mock/walletList.ts
@@ -2,7 +2,7 @@
  * 钱包列表假数据
  * 对应接口：GET /admin/finance/wallet/summary
  */
-import type { WalletSummaryVO, WalletQueryParams, PageData } from '@/api/wallet';
+import type { WalletSummaryVO, WalletQueryParams, WalletSummaryPageData } from '@/api/wallet';
 
 const MOCK_LIST: WalletSummaryVO[] = [
   {
@@ -12,9 +12,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '0.00',
     frozenAmount: '0.00',
     withdrawalAmount: '0.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1002,
@@ -23,9 +20,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '350.00',
     frozenAmount: '200.00',
     withdrawalAmount: '1450.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1003,
@@ -34,9 +28,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '1280.00',
     frozenAmount: '0.00',
     withdrawalAmount: '800.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1004,
@@ -45,9 +36,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '560.00',
     frozenAmount: '100.00',
     withdrawalAmount: '200.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1005,
@@ -56,9 +44,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '4200.00',
     frozenAmount: '1500.00',
     withdrawalAmount: '5600.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1006,
@@ -67,9 +52,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '880.00',
     frozenAmount: '0.00',
     withdrawalAmount: '300.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1007,
@@ -78,9 +60,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '2100.00',
     frozenAmount: '800.00',
     withdrawalAmount: '3200.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1008,
@@ -89,9 +68,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '650.00',
     frozenAmount: '0.00',
     withdrawalAmount: '450.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1009,
@@ -100,9 +76,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '980.00',
     frozenAmount: '200.00',
     withdrawalAmount: '1200.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1010,
@@ -111,9 +84,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '320.00',
     frozenAmount: '50.00',
     withdrawalAmount: '100.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1011,
@@ -122,9 +92,6 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '5800.00',
     frozenAmount: '0.00',
     withdrawalAmount: '2000.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
   {
     userId: 1012,
@@ -133,14 +100,10 @@ const MOCK_LIST: WalletSummaryVO[] = [
     amount: '75.00',
     frozenAmount: '0.00',
     withdrawalAmount: '75.00',
-    totalAmount: '0.00',
-    totalFrozenAmount: '0.00',
-    totalWithdrawalAmount: '0.00',
   },
 ];
 
-/** 计算汇总值 */
-function computeSummary(list: WalletSummaryVO[]) {
+function computeExData(list: WalletSummaryVO[]) {
   const totalAmount = list.reduce((s, i) => s + Number(i.amount || 0), 0).toFixed(2);
   const totalFrozenAmount = list.reduce((s, i) => s + Number(i.frozenAmount || 0), 0).toFixed(2);
   const totalWithdrawalAmount = list
@@ -153,7 +116,7 @@ export function buildMockWalletPage(
   page: number,
   limit: number,
   params: WalletQueryParams,
-): PageData<WalletSummaryVO> {
+): WalletSummaryPageData {
   let filtered = [...MOCK_LIST];
 
   if (params.nickname) {
@@ -171,15 +134,10 @@ export function buildMockWalletPage(
 
   const total = filtered.length;
   const start = (page - 1) * limit;
-  const pageList = filtered.slice(start, start + limit);
 
-  // 将汇总值写入每条记录（方便前端提取统计卡数据）
-  const summary = computeSummary(filtered);
-  for (const item of pageList) {
-    item.totalAmount = summary.totalAmount;
-    item.totalFrozenAmount = summary.totalFrozenAmount;
-    item.totalWithdrawalAmount = summary.totalWithdrawalAmount;
-  }
-
-  return { total, list: pageList };
+  return {
+    total,
+    list: filtered.slice(start, start + limit),
+    exData: computeExData(filtered),
+  };
 }
diff --git a/src/pages/events/banner/model/useBannerModel.ts b/src/pages/events/banner/model/useBannerModel.ts
index 132c633..4f96cf1 100644
--- a/src/pages/events/banner/model/useBannerModel.ts
+++ b/src/pages/events/banner/model/useBannerModel.ts
@@ -64,13 +64,24 @@ export function useBannerModel() {
     { delay: 300 },
   );
 
+  // ===== 构建 API 查询参数 =====
+  const buildQueryParams = (): BannerListQueryParams => {
+    const params: BannerListQueryParams = {};
+    if (filterForm.title.trim()) {
+      params.title = filterForm.title.trim();
+    }
+    if (filterForm.status) {
+      params.status = filterForm.status;
+    }
+    return params;
+  };
+
   // ===== 数据请求（API 返回全量，前端分页） =====
   const {
     data,
     loading,
     run: fetchList,
   } = useRequest<TournamentAdminBannerListVO[]>(() => getBannerList(buildQueryParams()), {
-    refreshDeps: [],
     formatResult: (res) => (res.code == 200 ? res.data : []),
   });
 
@@ -111,18 +122,6 @@ export function useBannerModel() {
     { title: '状态', dataIndex: 'status', key: 'status', width: 100, align: 'center' as const },
   ];
 
-  // ===== 构建 API 查询参数 =====
-  const buildQueryParams = (): BannerListQueryParams => {
-    const params: BannerListQueryParams = {};
-    if (filterForm.title.trim()) {
-      params.title = filterForm.title.trim();
-    }
-    if (filterForm.status) {
-      params.status = filterForm.status;
-    }
-    return params;
-  };
-
   // ===== 计算属性 =====
   const hasFilter = computed(() => {
     return debouncedTitle.value.trim() !== '' || filterForm.status !== '';
diff --git a/src/pages/finance/wallet/model/services.ts b/src/pages/finance/wallet/model/services.ts
index 9bcce65..13d90bd 100644
--- a/src/pages/finance/wallet/model/services.ts
+++ b/src/pages/finance/wallet/model/services.ts
@@ -9,6 +9,7 @@ import { buildMockWalletTransactionPage } from '@/config/mock/walletTransactions
 import type {
   WalletQueryParams,
   WalletSummaryVO,
+  WalletSummaryPageData,
   WalletTransactionQueryParams,
   WalletTransactionVO,
   PageData,
@@ -17,6 +18,7 @@ import type {
 
 export type {
   WalletSummaryVO,
+  WalletSummaryPageData,
   WalletQueryParams,
   WalletTransactionVO,
   WalletTransactionQueryParams,
@@ -39,7 +41,7 @@ const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 /** 钱包列表分页 */
 export async function getWalletList(
   params: WalletQueryParams,
-): Promise<ApiResult<PageData<WalletSummaryVO>>> {
+): Promise<ApiResult<WalletSummaryPageData>> {
   if (USE_MOCK) {
     await delay(MOCK_DELAY);
     const page = Number(params.page) || 1;
diff --git a/src/pages/finance/wallet/model/useWalletModel.ts b/src/pages/finance/wallet/model/useWalletModel.ts
index f98661e..9a63da1 100644
--- a/src/pages/finance/wallet/model/useWalletModel.ts
+++ b/src/pages/finance/wallet/model/useWalletModel.ts
@@ -102,15 +102,12 @@ export function useWalletModel() {
   const listData = computed(() => (data.value as any)?.data);
   const dataSource = computed(() => listData.value?.list || []);
 
-  // 汇总：从第一条记录提取
-  const summary = computed(() => {
-    const first = dataSource.value?.[0] as any;
-    return {
-      totalBalance: first?.totalAmount ?? '0.00',
-      frozenAmount: first?.totalFrozenAmount ?? '0.00',
-      totalWithdraw: first?.totalWithdrawalAmount ?? '0.00',
-    };
-  });
+  // 汇总：从 exData 派生（与 list 同级）
+  const summary = computed(() => ({
+    totalBalance: listData.value?.exData?.totalAmount ?? '0.00',
+    frozenAmount: listData.value?.exData?.totalFrozenAmount ?? '0.00',
+    totalWithdraw: listData.value?.exData?.totalWithdrawalAmount ?? '0.00',
+  }));
 
   // 同步 total 到 pagination
   useEffect(() => {
diff --git a/src/pages/finance/withdraw/index.tsx b/src/pages/finance/withdraw/index.tsx
index bae8d92..c21552c 100644
--- a/src/pages/finance/withdraw/index.tsx
+++ b/src/pages/finance/withdraw/index.tsx
@@ -31,7 +31,7 @@ function renderBodyCell({
   }
   if (column.key === 'action') {
     // auditStatus=0（待审核）→ 显示「审核」，其他 → 显示「查看」
-    if (canAudit && record.auditStatus === 0) {
+    if (canAudit && record.auditStatus == 0) {
       return (
         <Button type="link" size="small" onClick={() => onAudit(record)}>
           审核
-- 
2.52.0


From bc7e9169db9302d3af2bd5046dc198fbd9d5799a Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Wed, 5 Aug 2026 17:34:01 +0800
Subject: [PATCH 13/25] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E5=AE=A1=E6=A0=B8=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E8=B4=A6=E5=8A=A1=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reports/index.ts                      |  13 ++
 src/api/reports/types.ts                      |  46 +++++
 src/api/withdraw/index.ts                     |  12 +-
 .../banner/components/BannerFormModal.tsx     |   2 +-
 src/pages/finance/reports/index.module.less   |   6 +
 src/pages/finance/reports/index.tsx           | 124 +++++++-----
 src/pages/finance/reports/model/services.ts   |  31 +++
 .../finance/reports/model/useReportsModel.ts  | 178 ++++++++++--------
 .../WithdrawDetailModal.module.less           |   5 +
 .../components/WithdrawDetailModal.tsx        | 120 +++++++++---
 src/pages/finance/withdraw/index.tsx          |   2 +-
 src/utils/oss.ts                              |   3 +-
 12 files changed, 374 insertions(+), 168 deletions(-)
 create mode 100644 src/api/reports/index.ts
 create mode 100644 src/api/reports/types.ts
 create mode 100644 src/pages/finance/reports/model/services.ts

diff --git a/src/api/reports/index.ts b/src/api/reports/index.ts
new file mode 100644
index 0000000..16f5415
--- /dev/null
+++ b/src/api/reports/index.ts
@@ -0,0 +1,13 @@
+/**
+ * 财务报表 API
+ * 对应 OpenAPI: GET /admin/finance/report/list
+ */
+import { get } from '@/utils/request';
+import type { ReportQueryParams, FinanceReportVO, ApiResult } from './types';
+
+export type { ReportQueryParams, FinanceReportVO, ReportMonthItem, ApiResult } from './types';
+
+/** GET /admin/finance/report/list — 财务报表 */
+export function getFinanceReport(params: ReportQueryParams): Promise<ApiResult<FinanceReportVO>> {
+  return get('/admin/finance/report/list', params as Record<string, any>);
+}
diff --git a/src/api/reports/types.ts b/src/api/reports/types.ts
new file mode 100644
index 0000000..6a813fe
--- /dev/null
+++ b/src/api/reports/types.ts
@@ -0,0 +1,46 @@
+/**
+ * 财务报表 — 类型定义
+ * 对应 OpenAPI: GET /admin/finance/report/list
+ */
+
+/** 月度明细项（对应 InnerMonthVO） */
+export interface ReportMonthItem {
+  /** 月份 yyyy-MM */
+  month: string;
+  /** 订单金额，0.00 格式 */
+  orderAmount: string;
+  /** 退款金额，0.00 格式 */
+  refundAmount: string;
+  /** 净收入 = orderAmount - refundAmount，0.00 格式 */
+  netIncome: string;
+  /** 提现金额，0.00 格式 */
+  withdrawAmount: string;
+}
+
+/** 财务报表汇总（对应 TournamentFinanceReportVO） */
+export interface FinanceReportVO {
+  /** 总收入（扣除退款后），0.00 格式 */
+  totalIncome: string;
+  /** 总收入较上月增长率 */
+  totalIncomeTendency: string;
+  /** 总提现金额，0.00 格式 */
+  totalWithdrawIncome: string;
+  /** 总提现金额较上月增长率 */
+  totalWithdrawIncomeTendency: string;
+  /** 平台余额 = totalIncome - totalWithdrawIncome，0.00 格式 */
+  totalBalanceAmount: string;
+  /** 月度收支明细 */
+  monthList: ReportMonthItem[];
+}
+
+/** 财务报表查询参数 */
+export interface ReportQueryParams {
+  /** 查询日期 yyyy-MM */
+  date: string;
+}
+
+export interface ApiResult<T> {
+  code: number;
+  msg: string;
+  data: T;
+}
diff --git a/src/api/withdraw/index.ts b/src/api/withdraw/index.ts
index 4c2c20b..39dd0ab 100644
--- a/src/api/withdraw/index.ts
+++ b/src/api/withdraw/index.ts
@@ -12,7 +12,7 @@ export type { WithdrawVO, WithdrawInfoVO, WithdrawQueryParams, PageData, ApiResu
 
 const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
-/** GET /finance/withdraw/page — 提现列表分页 */
+/** GET /admin/finance/withdraw/page — 提现列表分页 */
 export async function getWithdrawList(
   params: WithdrawQueryParams,
 ): Promise<ApiResult<PageData<WithdrawVO>>> {
@@ -26,16 +26,16 @@ export async function getWithdrawList(
       data: buildMockWithdrawPage(page, limit, params),
     };
   }
-  return get('/finance/withdraw/page', params as Record<string, any>);
+  return get('/admin/finance/withdraw/page', params as Record<string, any>);
 }
 
-/** GET /finance/withdraw/info?id=xxx — 提现详情 */
+/** GET /admin/finance/withdraw/info?id=xxx — 提现详情 */
 export async function getWithdrawInfo(id: number): Promise<ApiResult<WithdrawInfoVO>> {
   if (USE_MOCK) {
     await delay(MOCK_DELAY);
     return { code: 200, msg: 'success', data: buildMockWithdrawInfo(id) };
   }
-  return get('/finance/withdraw/info', { id: String(id) });
+  return get('/admin/finance/withdraw/info', { id: String(id) });
 }
 
 /** 提现审核请求参数 */
@@ -50,7 +50,7 @@ export interface WithdrawAuditParams {
   checkImg: string;
 }
 
-/** POST /finance/withdraw/audit — 审核提现 */
+/** POST /admin/finance/withdraw/audit — 审核提现 */
 export async function postWithdrawAudit(params: WithdrawAuditParams): Promise<ApiResult<null>> {
-  return post('/finance/withdraw/audit', params);
+  return post('/admin/finance/withdraw/audit', params);
 }
diff --git a/src/pages/events/banner/components/BannerFormModal.tsx b/src/pages/events/banner/components/BannerFormModal.tsx
index dc329fd..c4806c8 100644
--- a/src/pages/events/banner/components/BannerFormModal.tsx
+++ b/src/pages/events/banner/components/BannerFormModal.tsx
@@ -377,7 +377,7 @@ export default defineComponent({
 
       try {
         const file = base64ToFile(dataUrl, `banner_${Date.now()}.jpg`);
-        const result = await uploadFile(file, OssUploadType.Banner as any);
+        const result = await uploadFile(file, OssUploadType.EventCover);
 
         URL.revokeObjectURL(localUrl);
         formData.imageUrl = result.url;
diff --git a/src/pages/finance/reports/index.module.less b/src/pages/finance/reports/index.module.less
index 451b44a..c7590e9 100644
--- a/src/pages/finance/reports/index.module.less
+++ b/src/pages/finance/reports/index.module.less
@@ -123,4 +123,10 @@
       color: rgba(0, 0, 0, 0.85);
     }
   }
+
+  .detailTableWrap {
+    flex: 1;
+    min-height: 0;
+    overflow: hidden;
+  }
 }
diff --git a/src/pages/finance/reports/index.tsx b/src/pages/finance/reports/index.tsx
index 19c8968..c367fa9 100644
--- a/src/pages/finance/reports/index.tsx
+++ b/src/pages/finance/reports/index.tsx
@@ -2,7 +2,7 @@ import { defineComponent, ref, nextTick } from 'vue';
 import { Select, Table } from 'ant-design-vue';
 import * as echarts from 'echarts';
 import { useReportsModel } from './model/useReportsModel';
-import { useEffect } from '@/hooks';
+import { useEffect, useContainerSize } from '@/hooks';
 import styles from './index.module.less';
 
 /**
@@ -11,7 +11,7 @@ import styles from './index.module.less';
  * 页面结构：
  *   1. 顶部标题 + 时间范围选择
  *   2. 三张统计卡（总收入 / 总提现 / 平台余额）
- *   3. 月度收支趋势（近 6 个月，echarts 柱状 + 折线组合图）
+ *   3. 月度收支趋势（echarts 柱状 + 折线组合图）
  *   4. 月度收支明细（表格）
  */
 export default defineComponent({
@@ -33,22 +33,23 @@ export default defineComponent({
     let chartInstance: any = null;
 
     const getChartOption = () => {
-      const months = chartData.value.map((d) => d.month);
-      const order = chartData.value.map((d) => d.order);
-      const netIncome = chartData.value.map((d) => d.netIncome);
+      const data = chartData.value;
+      const months = data.map((d) => d.month);
+      const orderAmount = data.map((d) => d.order);
+      const refundAmount = data.map((d) => d.refund);
+      const withdrawAmount = data.map((d) => d.withdraw);
+      const netIncome = data.map((d) => d.netIncome);
       return {
         tooltip: {
           trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: { color: 'rgba(0, 0, 0, 0.15)' },
-            label: { backgroundColor: '#6a7985' },
-          },
+          axisPointer: { type: 'shadow' },
           valueFormatter: (v: number) => `¥${formatMoney(v)}`,
         },
         legend: {
           data: [
             { name: '订单金额', icon: 'roundRect' },
+            { name: '退款金额', icon: 'roundRect' },
+            { name: '提现金额', icon: 'roundRect' },
             { name: '净收入', icon: 'circle' },
           ],
           bottom: 8,
@@ -63,7 +64,6 @@ export default defineComponent({
           axisTick: { show: false },
           axisLine: { lineStyle: { color: '#e8e8e8' } },
           axisLabel: { color: 'rgba(0, 0, 0, 0.55)' },
-          axisPointer: { type: 'shadow' },
         },
         yAxis: {
           type: 'value',
@@ -77,23 +77,28 @@ export default defineComponent({
           {
             name: '订单金额',
             type: 'bar',
-            data: order,
-            barMaxWidth: 48,
-            barCategoryGap: '35%',
-            itemStyle: {
-              color: {
-                type: 'linear',
-                x: 0,
-                y: 0,
-                x2: 0,
-                y2: 1,
-                colorStops: [
-                  { offset: 0, color: '#4096ff' },
-                  { offset: 1, color: '#1677ff' },
-                ],
-              },
-              borderRadius: [4, 4, 0, 0],
-            },
+            stack: 'amount',
+            data: orderAmount,
+            barMaxWidth: 40,
+            itemStyle: { color: '#4096ff' },
+            emphasis: { focus: 'series' },
+          },
+          {
+            name: '退款金额',
+            type: 'bar',
+            stack: 'amount',
+            data: refundAmount,
+            barMaxWidth: 40,
+            itemStyle: { color: '#ff7875' },
+            emphasis: { focus: 'series' },
+          },
+          {
+            name: '提现金额',
+            type: 'bar',
+            stack: 'amount',
+            data: withdrawAmount,
+            barMaxWidth: 40,
+            itemStyle: { color: '#ffa940' },
             emphasis: { focus: 'series' },
           },
           {
@@ -154,48 +159,59 @@ export default defineComponent({
       };
     }, [() => chartRef.value]);
 
-    // 时间范围切换时刷新图表
+    // 数据更新时刷新图表
     useEffect(() => {
       renderChart();
-    }, [range]);
+    }, [chartData]);
+
+    // ===== 明细表容器高度 =====
+    const { containerRef: detailContainerRef, height: detailTableHeight } = useContainerSize({
+      headerOffset: 56,
+    });
 
     return () => {
-      /** 根据增长率构建箭头 + 颜色（正值 ↑ 绿，负值 ↓ 红，null 时固定文本） */
-      const changeDesc = (rate: number | null) => {
-        if (rate == null) return { desc: '= 总收入 - 提现金额', descColor: 'rgba(0, 0, 0, 0.55)' };
-        const arrow = rate > 0 ? '↑' : '↓';
+      /** 根据增长率构建箭头 + 颜色 */
+      const changeDesc = (rateStr: string | undefined, fallbackRate: number | null) => {
+        if (rateStr === undefined && fallbackRate !== null) rateStr = String(fallbackRate);
+        if (rateStr == null || rateStr === '' || isNaN(parseFloat(rateStr)))
+          return { desc: '= 总收入 - 提现金额', descColor: 'rgba(0, 0, 0, 0.55)' };
+        const rate = parseFloat(rateStr);
+        const arrow = rate > 0 ? '↑' : rate < 0 ? '↓' : '';
         const sign = rate > 0 ? '+' : '';
+        const absRate = Math.abs(rate).toFixed(2);
         return {
-          desc: `${arrow} 较上月 ${sign}${rate}%`,
-          descColor: rate > 0 ? '#52c41a' : '#ff4d4f',
+          desc: rate === 0 ? `→ 与上月持平` : `${arrow} 较上月 ${sign}${absRate}%`,
+          descColor: rate > 0 ? '#52c41a' : rate < 0 ? '#ff4d4f' : 'rgba(0, 0, 0, 0.55)',
         };
       };
 
+      const s = summary.value;
+
       /** 顶部 3 张统计卡配置 */
       const statCards = [
         {
           key: 'totalIncome',
           label: '总收入（扣除退款后）',
-          value: summary.value.totalIncome,
+          value: s.totalIncome,
           bgColor: '#f6ffed',
           accentColor: '#52c41a',
-          ...changeDesc(12.5),
+          ...changeDesc(s.totalIncomeTendency, null),
         },
         {
           key: 'totalWithdraw',
           label: '总提现金额',
-          value: summary.value.totalWithdraw,
+          value: s.totalWithdraw,
           bgColor: '#fffbe6',
           accentColor: '#faad14',
-          ...changeDesc(32),
+          ...changeDesc(s.totalWithdrawTendency, null),
         },
         {
           key: 'totalBalance',
           label: '平台余额（所有用户余额总和）',
-          value: summary.value.totalBalance,
+          value: s.totalBalance,
           bgColor: '#e6f4ff',
           accentColor: '#1677ff',
-          ...changeDesc(null),
+          ...changeDesc(undefined, null),
         },
       ];
 
@@ -236,7 +252,7 @@ export default defineComponent({
           <div class={styles.chartCard}>
             <div class={styles.cardTitle}>
               <span class={styles.cardTitleIcon}>📊</span>
-              月度收支趋势（近 6 个月）
+              月度收支趋势（近 {chartData.value.length} 个月）
             </div>
             <div
               ref={(el: any) => {
@@ -249,14 +265,20 @@ export default defineComponent({
           {/* ===== 月度收支明细 ===== */}
           <div class={styles.detailCard}>
             <div class={styles.cardTitle}>月度收支明细</div>
-            <Table
-              columns={detailColumns}
-              dataSource={detailData.value}
-              pagination={false}
-              size="middle"
-              bordered={false}
-              rowKey="key"
-            />
+            <div ref={detailContainerRef} class={styles.detailTableWrap}>
+              <Table
+                columns={detailColumns}
+                dataSource={detailData.value}
+                pagination={false}
+                size="middle"
+                bordered={false}
+                rowKey="key"
+                scroll={{
+                  y: detailTableHeight.value,
+                  x: 'max-content',
+                }}
+              />
+            </div>
           </div>
         </div>
       );
diff --git a/src/pages/finance/reports/model/services.ts b/src/pages/finance/reports/model/services.ts
new file mode 100644
index 0000000..3a56112
--- /dev/null
+++ b/src/pages/finance/reports/model/services.ts
@@ -0,0 +1,31 @@
+/**
+ * 财务报表 - 接口服务
+ */
+import { get } from '@/utils/request';
+import type {
+  ReportQueryParams,
+  FinanceReportVO,
+  ReportMonthItem,
+  ApiResult,
+} from '@/api/reports/types';
+
+export type {
+  ReportQueryParams,
+  FinanceReportVO,
+  ReportMonthItem,
+  ApiResult,
+} from '@/api/reports/types';
+
+// ============================================================
+// URL 常量
+// ============================================================
+const reportList = '/admin/finance/report/list';
+
+// ============================================================
+// API 函数
+// ============================================================
+
+/** 财务报表 — GET /admin/finance/report/list?date=yyyy-MM */
+export function getFinanceReport(params: ReportQueryParams): Promise<ApiResult<FinanceReportVO>> {
+  return get(reportList, params as Record<string, any>);
+}
diff --git a/src/pages/finance/reports/model/useReportsModel.ts b/src/pages/finance/reports/model/useReportsModel.ts
index 59b4805..1d3630c 100644
--- a/src/pages/finance/reports/model/useReportsModel.ts
+++ b/src/pages/finance/reports/model/useReportsModel.ts
@@ -1,6 +1,9 @@
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 import type { SelectValue } from 'ant-design-vue/es/select';
-import { useState } from '@/hooks';
+import { useRequest } from '@/hooks/useRequest';
+import { useEffect } from '@/hooks/useEffect';
+import { getFinanceReport, type FinanceReportVO } from './services';
+import dayjs from 'dayjs';
 
 export type RangeValue = (typeof RANGE_OPTIONS)[number]['value'];
 
@@ -10,85 +13,44 @@ export type RangeValue = (typeof RANGE_OPTIONS)[number]['value'];
 
 /** 时间范围选项 */
 export const RANGE_OPTIONS = [
-  { value: 'month', label: '本月' },
-  { value: '3m', label: '近 3 个月' },
-  { value: '6m', label: '近 6 个月' },
-  { value: 'year', label: '本年' },
-] as const;
+  { value: 'month' as const, label: '本月' },
+  { value: '3m' as const, label: '近 3 个月' },
+  { value: '6m' as const, label: '近 6 个月' },
+  { value: 'year' as const, label: '本年' },
+];
+
+/** 范围对应的月数 */
+const RANGE_MONTHS: Record<RangeValue, number> = {
+  month: 1,
+  '3m': 3,
+  '6m': 6,
+  year: 12,
+};
 
 function isRangeValue(val: SelectValue): val is RangeValue {
   return typeof val === 'string' && RANGE_OPTIONS.some((item) => item.value === val);
 }
 
-// ============================================================
-// 假数据（数值自洽：总收入 - 总提现 = 平台余额）
-// ============================================================
-
-/** 6 个月图表数据（月份标签 + 订单金额 + 净收入） */
-const CHART_DATA = [
-  { month: '01月', order: 22500, netIncome: 19000, withdraw: 300 },
-  { month: '02月', order: 24500, netIncome: 21500, withdraw: 1850 },
-  { month: '03月', order: 24800, netIncome: 23200, withdraw: 1400 },
-  { month: '04月', order: 26100, netIncome: 24900, withdraw: 1500 },
-  { month: '05月', order: 28900, netIncome: 27400, withdraw: 1800 },
-  { month: '06月', order: 32500, netIncome: 31860, withdraw: 2100 },
-];
-
-/** 月度收支明细（最近 4 个月） */
-const DETAIL_DATA = [
-  {
-    key: '2026-06',
-    month: '2026-06',
-    order: 32500,
-    refund: 640,
-    netIncome: 31860,
-    withdraw: 2100,
-  },
-  {
-    key: '2026-05',
-    month: '2026-05',
-    order: 28900,
-    refund: 1500,
-    netIncome: 27400,
-    withdraw: 1800,
-  },
-  {
-    key: '2026-04',
-    month: '2026-04',
-    order: 26100,
-    refund: 1200,
-    netIncome: 24900,
-    withdraw: 1500,
-  },
-  {
-    key: '2026-03',
-    month: '2026-03',
-    order: 24800,
-    refund: 1600,
-    netIncome: 23200,
-    withdraw: 1400,
-  },
-];
-
-/** 顶部 3 张统计卡数据 */
-const SUMMARY = {
-  totalIncome: 147860, // 总收入（净收入合计）
-  totalWithdraw: 8950, // 总提现
-  totalBalance: 138910, // 平台余额 = 总收入 - 总提现
-};
-
 // ============================================================
 // 工具
 // ============================================================
 
 /** 千分位 + 保留 2 位小数 */
-function formatMoney(n: number): string {
-  return (n || 0).toLocaleString('zh-CN', {
+function formatMoneyStr(value: string): string {
+  const n = parseFloat(value);
+  if (isNaN(n)) return '0.00';
+  return n.toLocaleString('zh-CN', {
     minimumFractionDigits: 2,
     maximumFractionDigits: 2,
   });
 }
 
+/** 字符串金额转数字 */
+function toNumber(value: string): number {
+  const n = parseFloat(value);
+  return isNaN(n) ? 0 : n;
+}
+
 // ============================================================
 // Model
 // ============================================================
@@ -98,22 +60,55 @@ function formatMoney(n: number): string {
  */
 export function useReportsModel() {
   // ===== 时间范围 =====
-  const [range, setRange] = useState<RangeValue>('month');
+  const range = ref<RangeValue>('month');
 
-  /** 切换时间范围（演示用：打日志，不改数据） */
-  const handleRangeChange = (val: SelectValue) => {
-    if (!isRangeValue(val)) return;
-    setRange(val);
-    // TODO: 接入 API 时按 range 重新拉取汇总 / 图表 / 明细
+  // ===== 构建 API 参数（根据 range 推算查询起始月份） =====
+  const buildQueryParams = () => {
+    const months = RANGE_MONTHS[range.value];
+    const date = dayjs()
+      .subtract(months - 1, 'month')
+      .format('YYYY-MM');
+    return { date };
   };
 
+  // ===== 请求（range 变化时自动重新请求） =====
+  const {
+    data,
+    loading,
+    run: fetchReport,
+  } = useRequest<FinanceReportVO>(() => getFinanceReport(buildQueryParams()), {
+    refreshDeps: [range],
+    formatResult: (res) => (res.code == 200 ? res.data : null),
+  });
+
+  // ===== 根据范围过滤后的月列表 =====
+  const filteredMonthList = computed(() => {
+    const list = data.value?.monthList || [];
+    const count = RANGE_MONTHS[range.value];
+    return list.slice(-count);
+  });
+
   // ===== 汇总 =====
-  const summary = ref({ ...SUMMARY });
+  const summary = computed(() => ({
+    totalIncome: data.value?.totalIncome || '0.00',
+    totalIncomeTendency: data.value?.totalIncomeTendency || '0',
+    totalWithdraw: data.value?.totalWithdrawIncome || '0.00',
+    totalWithdrawTendency: data.value?.totalWithdrawIncomeTendency || '0',
+    totalBalance: data.value?.totalBalanceAmount || '0.00',
+  }));
 
-  // ===== 图表 =====
-  const chartData = ref([...CHART_DATA]);
+  // ===== 图表数据 =====
+  const chartData = computed(() =>
+    filteredMonthList.value.map((item) => ({
+      month: dayjs(item.month).format('MM月'),
+      order: toNumber(item.orderAmount),
+      refund: toNumber(item.refundAmount),
+      netIncome: toNumber(item.netIncome),
+      withdraw: toNumber(item.withdrawAmount),
+    })),
+  );
 
-  // ===== 明细表 =====
+  // ===== 明细表列 =====
   const detailColumns = [
     {
       title: '月份',
@@ -156,10 +151,39 @@ export function useReportsModel() {
       customCell: (_record: any) => ({ style: { color: '#fa8c16' } }),
     },
   ];
-  const detailData = ref([...DETAIL_DATA]);
+
+  // ===== 明细表数据 =====
+  const detailData = computed(() =>
+    filteredMonthList.value.map((item) => ({
+      key: item.month,
+      month: item.month,
+      order: toNumber(item.orderAmount),
+      refund: toNumber(item.refundAmount),
+      netIncome: toNumber(item.netIncome),
+      withdraw: toNumber(item.withdrawAmount),
+    })),
+  );
+
+  // ===== 切换时间范围 =====
+  const handleRangeChange = (val: SelectValue) => {
+    if (!isRangeValue(val)) return;
+    range.value = val;
+  };
+
+  // ===== 范围变化时刷新图表（通过 page 中的 useEffect 监听 range） =====
+
+  /** 千分位格式金额（页面渲染用） */
+  function formatMoney(val: string | number): string {
+    if (typeof val === 'string') return formatMoneyStr(val);
+    return val.toLocaleString('zh-CN', {
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2,
+    });
+  }
 
   return {
     range,
+    loading,
     handleRangeChange,
     summary,
     chartData,
diff --git a/src/pages/finance/withdraw/components/WithdrawDetailModal.module.less b/src/pages/finance/withdraw/components/WithdrawDetailModal.module.less
index a114085..adee022 100644
--- a/src/pages/finance/withdraw/components/WithdrawDetailModal.module.less
+++ b/src/pages/finance/withdraw/components/WithdrawDetailModal.module.less
@@ -135,6 +135,11 @@
     padding-top: 6px;
   }
 
+  .required {
+    color: #ff4d4f;
+    margin-right: 2px;
+  }
+
   .footer {
     display: flex;
     justify-content: flex-end;
diff --git a/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx b/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
index 8cd54f8..221dbc9 100644
--- a/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
+++ b/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
@@ -1,11 +1,16 @@
-import { defineComponent, reactive, ref, watch } from 'vue';
+import { defineComponent, reactive, ref } from 'vue';
+import { useEffect } from '@/hooks';
 import { Modal, Radio, Input, Button, Upload, Image, Spin, message } from 'ant-design-vue';
+import type { UploadFile } from 'ant-design-vue';
 import { PlusOutlined } from '@ant-design/icons-vue';
+import { uploadFile, OssUploadType } from '@/utils/oss';
 import { getWithdrawInfo, postWithdrawAudit, type WithdrawInfoVO } from '../model/services';
 import { getAuditStatusText, getPayStatusText } from '../model/useWithdrawModel';
 import styles from './WithdrawDetailModal.module.less';
 
 const { TextArea } = Input;
+const MAX_IMAGE_COUNT = 3;
+const MAX_IMAGE_SIZE = 5 * 1024 * 1024;
 
 interface WithdrawDetailModalProps {
   visible: boolean;
@@ -30,7 +35,7 @@ export default defineComponent({
     const detailLoading = ref(false);
 
     const auditForm = reactive({ pass: true, remark: '' });
-    const imageList = ref<any[]>([]);
+    const imageList = ref<UploadFile[]>([]);
     const submitting = ref(false);
 
     // ===== 拉取详情 =====
@@ -47,44 +52,91 @@ export default defineComponent({
       }
     };
 
-    watch(
-      () => props.visible,
-      async (val) => {
-        if (val && props.record?.id) {
-          auditForm.pass = true;
-          auditForm.remark = '';
-          imageList.value = [];
-          submitting.value = false;
-          await fetchDetail(props.record.id);
-        }
-      },
-      { immediate: true },
-    );
+    // ===== 弹窗打开时拉取详情 =====
+    useEffect(() => {
+      if (props.visible && props.record?.id) {
+        auditForm.pass = true;
+        auditForm.remark = '';
+        imageList.value = [];
+        submitting.value = false;
+        fetchDetail(props.record.id);
+      }
+    }, [() => props.visible]);
 
-    // ===== 上传 =====
-    const beforeUpload = (file: any) => {
-      if (file.size / 1024 / 1024 >= 5) {
+    // ===== 图片上传（OSS） =====
+    const beforeUpload = async (file: UploadFile) => {
+      const rawFile = file as unknown as File;
+
+      if (imageList.value.length >= MAX_IMAGE_COUNT) {
+        message.warning(`最多上传 ${MAX_IMAGE_COUNT} 张图片`);
+        return false;
+      }
+      if (!/^image\//.test(rawFile.type)) {
+        message.error('请选择图片文件');
+        return false;
+      }
+      if (rawFile.size >= MAX_IMAGE_SIZE) {
         message.error('图片大小不能超过 5MB');
         return false;
       }
-      imageList.value = [...imageList.value, file];
+
+      const uid = file.uid || `${Date.now()}-${Math.random()}`;
+      const uploadingItem: UploadFile = {
+        uid,
+        name: rawFile.name,
+        status: 'uploading',
+      };
+      imageList.value = [...imageList.value, uploadingItem];
+
+      try {
+        const result = await uploadFile(rawFile, OssUploadType.WithdrawAudit);
+        imageList.value = imageList.value.map((item) =>
+          item.uid === uid
+            ? {
+                ...item,
+                status: 'done',
+                url: result.url,
+                thumbUrl: result.url,
+              }
+            : item,
+        );
+      } catch (err: any) {
+        imageList.value = imageList.value.filter((item) => item.uid !== uid);
+        message.error(err?.message || '图片上传失败');
+      }
+
       return false;
     };
-    const handleRemove = (file: any) => {
-      imageList.value = imageList.value.filter((f) => f.uid !== file.uid);
+
+    const handleRemove = (file: UploadFile) => {
+      imageList.value = imageList.value.filter((item) => item.uid !== file.uid);
     };
 
     // ===== 提交审核 =====
     const handleSubmit = async () => {
-      if (!auditForm.remark.trim()) {
-        message.warning('请输入审核内容');
+      // 驳回：审核内容必填
+      if (!auditForm.pass && !auditForm.remark.trim()) {
+        message.warning('驳回时请填写审核内容');
         return;
       }
+      // 通过：必须上传图片
+      if (auditForm.pass) {
+        const hasDoneImage = imageList.value.some((item) => item.status === 'done' && item.url);
+        if (!hasDoneImage) {
+          message.warning('审核通过时必须上传审核图片');
+          return;
+        }
+      }
+      if (imageList.value.some((item) => item.status === 'uploading')) {
+        message.warning('图片仍在上传中，请稍候');
+        return;
+      }
+
       submitting.value = true;
       try {
         const checkImg = imageList.value
-          .map((f) => f.name || f.url || '')
-          .filter(Boolean)
+          .filter((item) => item.status === 'done' && item.url)
+          .map((item) => item.url as string)
           .join(',');
         const res = await postWithdrawAudit({
           id: String(props.record.id),
@@ -117,7 +169,7 @@ export default defineComponent({
     const renderContent = () => {
       const d = detail.value!;
       const bankCardTypeLabel = d.bankCardType === 1 ? '个人' : d.bankCardType || '-';
-      const isPending = d.auditStatus === 0;
+      const isPending = d.auditStatus == 0;
 
       return (
         <>
@@ -177,9 +229,12 @@ export default defineComponent({
                   </Radio.Group>
                 </div>
                 <div class={styles.formRow}>
-                  <span class={[styles.formLabel, styles.formLabelTop]}>审核内容</span>
+                  <span class={[styles.formLabel, styles.formLabelTop]}>
+                    {!auditForm.pass && <span class={styles.required}>*</span>}
+                    审核内容
+                  </span>
                   <TextArea
-                    v-model={auditForm.remark}
+                    v-model:value={auditForm.remark}
                     placeholder="请输入审核内容"
                     rows={4}
                     maxlength={500}
@@ -188,7 +243,10 @@ export default defineComponent({
                   />
                 </div>
                 <div class={styles.formRow}>
-                  <span class={[styles.formLabel, styles.formLabelTop]}>审核图片</span>
+                  <span class={[styles.formLabel, styles.formLabelTop]}>
+                    {auditForm.pass && <span class={styles.required}>*</span>}
+                    审核图片
+                  </span>
                   <Upload
                     listType="picture-card"
                     fileList={imageList.value}
@@ -197,10 +255,10 @@ export default defineComponent({
                     accept="image/*"
                     class={styles.uploader}
                   >
-                    {imageList.value.length >= 3 ? null : (
+                    {imageList.value.length >= MAX_IMAGE_COUNT ? null : (
                       <div class={styles.uploadTrigger}>
                         <PlusOutlined />
-                        <div class={styles.uploadText}>粘贴图片到此处</div>
+                        <div class={styles.uploadText}>请选择图片</div>
                       </div>
                     )}
                   </Upload>
diff --git a/src/pages/finance/withdraw/index.tsx b/src/pages/finance/withdraw/index.tsx
index c21552c..1907995 100644
--- a/src/pages/finance/withdraw/index.tsx
+++ b/src/pages/finance/withdraw/index.tsx
@@ -81,7 +81,7 @@ export default defineComponent({
       {
         title: '操作',
         key: 'action',
-        width: 100,
+        width: 140,
         fixed: 'right' as const,
         align: 'center' as const,
       },
diff --git a/src/utils/oss.ts b/src/utils/oss.ts
index 3ceaa4a..99d58e5 100644
--- a/src/utils/oss.ts
+++ b/src/utils/oss.ts
@@ -3,7 +3,7 @@ import { fetchOssSign } from '@/api/upload';
 
 /**
  * OSS 上传类型
- * 1=证件照 2=赛事封面 3=头像 4=富文本 5=Banner
+ * 1=证件照 2=赛事封面 3=头像 4=富文本 5=Banner 6=提现审核
  */
 export const OssUploadType = {
   IdCard: '1',
@@ -11,6 +11,7 @@ export const OssUploadType = {
   Avatar: '3',
   RichText: '4',
   Banner: '5',
+  WithdrawAudit: '6',
 } as const;
 
 export type OssUploadTypeValue = (typeof OssUploadType)[keyof typeof OssUploadType];
-- 
2.52.0


From b496fb60e2c58f24f8a35a0b2e7fff2f197df918 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Wed, 5 Aug 2026 17:56:05 +0800
Subject: [PATCH 14/25] =?UTF-8?q?fix:=20=E6=8A=A5=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/finance/reports/index.tsx           |  79 ++++----------
 .../finance/reports/model/useReportsModel.ts  | 103 ++++++------------
 .../wallet/components/WalletDetailModal.tsx   |  30 +++--
 .../system/roles/components/RoleFormModal.tsx |  23 ++--
 4 files changed, 79 insertions(+), 156 deletions(-)

diff --git a/src/pages/finance/reports/index.tsx b/src/pages/finance/reports/index.tsx
index c367fa9..b50e5c2 100644
--- a/src/pages/finance/reports/index.tsx
+++ b/src/pages/finance/reports/index.tsx
@@ -1,34 +1,29 @@
 import { defineComponent, ref, nextTick } from 'vue';
-import { Select, Table } from 'ant-design-vue';
+import { DatePicker, Table } from 'ant-design-vue';
 import * as echarts from 'echarts';
 import { useReportsModel } from './model/useReportsModel';
 import { useEffect, useContainerSize } from '@/hooks';
 import styles from './index.module.less';
 
+const { RangePicker } = DatePicker;
+
 /**
  * 账务报表
- *
- * 页面结构：
- *   1. 顶部标题 + 时间范围选择
- *   2. 三张统计卡（总收入 / 总提现 / 平台余额）
- *   3. 月度收支趋势（echarts 柱状 + 折线组合图）
- *   4. 月度收支明细（表格）
  */
 export default defineComponent({
   name: 'FinanceReports',
   setup() {
     const {
-      range,
-      handleRangeChange,
+      dateRange,
+      handleDateRangeChange,
       summary,
       chartData,
       detailColumns,
       detailData,
       formatMoney,
-      RANGE_OPTIONS,
     } = useReportsModel();
 
-    // ===== 组合图（柱状 + 折线，echarts） =====
+    // ===== echarts 组合图 =====
     const chartRef = ref<HTMLElement>();
     let chartInstance: any = null;
 
@@ -109,11 +104,7 @@ export default defineComponent({
             symbol: 'circle',
             symbolSize: 8,
             lineStyle: { width: 3, color: '#52c41a' },
-            itemStyle: {
-              color: '#52c41a',
-              borderWidth: 2,
-              borderColor: '#fff',
-            },
+            itemStyle: { color: '#52c41a', borderWidth: 2, borderColor: '#fff' },
             areaStyle: {
               color: {
                 type: 'linear',
@@ -136,17 +127,13 @@ export default defineComponent({
 
     const renderChart = () => {
       if (!chartRef.value) return;
-      if (!chartInstance) {
-        chartInstance = echarts.init(chartRef.value);
-      }
+      if (!chartInstance) chartInstance = echarts.init(chartRef.value);
       chartInstance.setOption(getChartOption());
     };
 
-    const handleResize = () => {
-      chartInstance?.resize();
-    };
+    const handleResize = () => chartInstance?.resize();
 
-    // ECharts 挂载/销毁 + 窗口 resize 监听
+    // ECharts 挂载/销毁
     useEffect(() => {
       const el = chartRef.value;
       if (!el) return;
@@ -170,24 +157,9 @@ export default defineComponent({
     });
 
     return () => {
-      /** 根据增长率构建箭头 + 颜色 */
-      const changeDesc = (rateStr: string | undefined, fallbackRate: number | null) => {
-        if (rateStr === undefined && fallbackRate !== null) rateStr = String(fallbackRate);
-        if (rateStr == null || rateStr === '' || isNaN(parseFloat(rateStr)))
-          return { desc: '= 总收入 - 提现金额', descColor: 'rgba(0, 0, 0, 0.55)' };
-        const rate = parseFloat(rateStr);
-        const arrow = rate > 0 ? '↑' : rate < 0 ? '↓' : '';
-        const sign = rate > 0 ? '+' : '';
-        const absRate = Math.abs(rate).toFixed(2);
-        return {
-          desc: rate === 0 ? `→ 与上月持平` : `${arrow} 较上月 ${sign}${absRate}%`,
-          descColor: rate > 0 ? '#52c41a' : rate < 0 ? '#ff4d4f' : 'rgba(0, 0, 0, 0.55)',
-        };
-      };
-
       const s = summary.value;
 
-      /** 顶部 3 张统计卡配置 */
+      /** 顶部 3 张统计卡 */
       const statCards = [
         {
           key: 'totalIncome',
@@ -195,7 +167,6 @@ export default defineComponent({
           value: s.totalIncome,
           bgColor: '#f6ffed',
           accentColor: '#52c41a',
-          ...changeDesc(s.totalIncomeTendency, null),
         },
         {
           key: 'totalWithdraw',
@@ -203,7 +174,6 @@ export default defineComponent({
           value: s.totalWithdraw,
           bgColor: '#fffbe6',
           accentColor: '#faad14',
-          ...changeDesc(s.totalWithdrawTendency, null),
         },
         {
           key: 'totalBalance',
@@ -211,13 +181,12 @@ export default defineComponent({
           value: s.totalBalance,
           bgColor: '#e6f4ff',
           accentColor: '#1677ff',
-          ...changeDesc(undefined, null),
         },
       ];
 
       return (
         <div class={styles.reportsMain}>
-          {/* ===== 顶部标题 + 时间范围 ===== */}
+          {/* ===== 顶部标题 + 时间段选择 ===== */}
           <div class={styles.reportHeader}>
             <div class={styles.headerLeft}>
               <div class={styles.reportTitle}>财务报表</div>
@@ -225,11 +194,12 @@ export default defineComponent({
                 平台资金流水概览，包括收入、退款、提现、用户余额等核心财务指标
               </div>
             </div>
-            <Select
-              value={range.value}
-              onUpdate:value={handleRangeChange}
-              options={[...RANGE_OPTIONS]}
-              style={{ width: '120px' }}
+            <RangePicker
+              picker="month"
+              format="YYYY-MM"
+              value={dateRange.value}
+              onUpdate:value={handleDateRangeChange}
+              style={{ width: '240px' }}
             />
           </div>
 
@@ -241,18 +211,18 @@ export default defineComponent({
                 <div class={styles.statValue} style={{ color: item.accentColor }}>
                   ¥{formatMoney(item.value)}
                 </div>
-                <div class={styles.statDesc} style={{ color: item.descColor }}>
-                  {item.desc}
+                <div class={styles.statDesc} style="visibility: hidden;">
+                  -
                 </div>
               </div>
             ))}
           </div>
 
-          {/* ===== 组合图卡（echarts） ===== */}
+          {/* ===== 组合图卡 ===== */}
           <div class={styles.chartCard}>
             <div class={styles.cardTitle}>
               <span class={styles.cardTitleIcon}>📊</span>
-              月度收支趋势（近 {chartData.value.length} 个月）
+              月度收支趋势（{chartData.value.length} 个月）
             </div>
             <div
               ref={(el: any) => {
@@ -273,10 +243,7 @@ export default defineComponent({
                 size="middle"
                 bordered={false}
                 rowKey="key"
-                scroll={{
-                  y: detailTableHeight.value,
-                  x: 'max-content',
-                }}
+                scroll={{ y: detailTableHeight.value, x: 'max-content' }}
               />
             </div>
           </div>
diff --git a/src/pages/finance/reports/model/useReportsModel.ts b/src/pages/finance/reports/model/useReportsModel.ts
index 1d3630c..141405b 100644
--- a/src/pages/finance/reports/model/useReportsModel.ts
+++ b/src/pages/finance/reports/model/useReportsModel.ts
@@ -1,35 +1,7 @@
 import { computed, ref } from 'vue';
-import type { SelectValue } from 'ant-design-vue/es/select';
 import { useRequest } from '@/hooks/useRequest';
-import { useEffect } from '@/hooks/useEffect';
 import { getFinanceReport, type FinanceReportVO } from './services';
-import dayjs from 'dayjs';
-
-export type RangeValue = (typeof RANGE_OPTIONS)[number]['value'];
-
-// ============================================================
-// 常量
-// ============================================================
-
-/** 时间范围选项 */
-export const RANGE_OPTIONS = [
-  { value: 'month' as const, label: '本月' },
-  { value: '3m' as const, label: '近 3 个月' },
-  { value: '6m' as const, label: '近 6 个月' },
-  { value: 'year' as const, label: '本年' },
-];
-
-/** 范围对应的月数 */
-const RANGE_MONTHS: Record<RangeValue, number> = {
-  month: 1,
-  '3m': 3,
-  '6m': 6,
-  year: 12,
-};
-
-function isRangeValue(val: SelectValue): val is RangeValue {
-  return typeof val === 'string' && RANGE_OPTIONS.some((item) => item.value === val);
-}
+import dayjs, { type Dayjs } from 'dayjs';
 
 // ============================================================
 // 工具
@@ -59,34 +31,26 @@ function toNumber(value: string): number {
  * 账务报表数据模型
  */
 export function useReportsModel() {
-  // ===== 时间范围 =====
-  const range = ref<RangeValue>('month');
+  // ===== 时间范围（年月区间选择器） =====
+  const dateRange = ref<[Dayjs, Dayjs]>([dayjs().startOf('month'), dayjs().startOf('month')]);
 
-  // ===== 构建 API 参数（根据 range 推算查询起始月份） =====
+  // ===== 构建 API 参数 =====
   const buildQueryParams = () => {
-    const months = RANGE_MONTHS[range.value];
-    const date = dayjs()
-      .subtract(months - 1, 'month')
-      .format('YYYY-MM');
-    return { date };
+    const [start, end] = dateRange.value;
+    return {
+      beginDate: start.format('YYYY-MM'),
+      endDate: end.format('YYYY-MM'),
+    };
   };
 
-  // ===== 请求（range 变化时自动重新请求） =====
-  const {
-    data,
-    loading,
-    run: fetchReport,
-  } = useRequest<FinanceReportVO>(() => getFinanceReport(buildQueryParams()), {
-    refreshDeps: [range],
-    formatResult: (res) => (res.code == 200 ? res.data : null),
-  });
-
-  // ===== 根据范围过滤后的月列表 =====
-  const filteredMonthList = computed(() => {
-    const list = data.value?.monthList || [];
-    const count = RANGE_MONTHS[range.value];
-    return list.slice(-count);
-  });
+  // ===== 请求（dateRange 变化时自动重新请求） =====
+  const { data, loading } = useRequest<FinanceReportVO>(
+    () => getFinanceReport(buildQueryParams()),
+    {
+      refreshDeps: [dateRange],
+      formatResult: (res) => (res.code == 200 ? res.data : null),
+    },
+  );
 
   // ===== 汇总 =====
   const summary = computed(() => ({
@@ -98,15 +62,16 @@ export function useReportsModel() {
   }));
 
   // ===== 图表数据 =====
-  const chartData = computed(() =>
-    filteredMonthList.value.map((item) => ({
+  const chartData = computed(() => {
+    const list = data.value?.monthList || [];
+    return list.map((item) => ({
       month: dayjs(item.month).format('MM月'),
       order: toNumber(item.orderAmount),
       refund: toNumber(item.refundAmount),
       netIncome: toNumber(item.netIncome),
       withdraw: toNumber(item.withdrawAmount),
-    })),
-  );
+    }));
+  });
 
   // ===== 明细表列 =====
   const detailColumns = [
@@ -153,25 +118,24 @@ export function useReportsModel() {
   ];
 
   // ===== 明细表数据 =====
-  const detailData = computed(() =>
-    filteredMonthList.value.map((item) => ({
+  const detailData = computed(() => {
+    const list = data.value?.monthList || [];
+    return list.map((item) => ({
       key: item.month,
       month: item.month,
       order: toNumber(item.orderAmount),
       refund: toNumber(item.refundAmount),
       netIncome: toNumber(item.netIncome),
       withdraw: toNumber(item.withdrawAmount),
-    })),
-  );
+    }));
+  });
 
-  // ===== 切换时间范围 =====
-  const handleRangeChange = (val: SelectValue) => {
-    if (!isRangeValue(val)) return;
-    range.value = val;
+  // ===== 时间范围变更 =====
+  const handleDateRangeChange = (val: any) => {
+    if (!val || val.length < 2) return;
+    dateRange.value = [dayjs(val[0]), dayjs(val[1])];
   };
 
-  // ===== 范围变化时刷新图表（通过 page 中的 useEffect 监听 range） =====
-
   /** 千分位格式金额（页面渲染用） */
   function formatMoney(val: string | number): string {
     if (typeof val === 'string') return formatMoneyStr(val);
@@ -182,14 +146,13 @@ export function useReportsModel() {
   }
 
   return {
-    range,
+    dateRange,
     loading,
-    handleRangeChange,
+    handleDateRangeChange,
     summary,
     chartData,
     detailColumns,
     detailData,
     formatMoney,
-    RANGE_OPTIONS: RANGE_OPTIONS as any,
   };
 }
diff --git a/src/pages/finance/wallet/components/WalletDetailModal.tsx b/src/pages/finance/wallet/components/WalletDetailModal.tsx
index a1002c6..c03ecad 100644
--- a/src/pages/finance/wallet/components/WalletDetailModal.tsx
+++ b/src/pages/finance/wallet/components/WalletDetailModal.tsx
@@ -1,4 +1,5 @@
-import { defineComponent, reactive, ref, watch } from 'vue';
+import { defineComponent, reactive, ref } from 'vue';
+import { useEffect } from '@/hooks';
 import { Modal, Table, Button, Select, Form, Space, DatePicker, Pagination } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import {
@@ -92,21 +93,18 @@ export default defineComponent({
       handleSearch();
     };
 
-    // ===== 弹窗打开 → 首次加载 =====
-    watch(
-      () => props.visible,
-      (val) => {
-        if (val) {
-          filterForm.timeRange = null;
-          filterForm.type = '';
-          filterForm.status = '';
-          pagination.current = 1;
-          pagination.pageSize = 10;
-          dataSource.value = [];
-          handleSearch();
-        }
-      },
-    );
+    // ===== 弹窗打开 → 重置并加载 =====
+    useEffect(() => {
+      if (props.visible) {
+        filterForm.timeRange = null;
+        filterForm.type = '';
+        filterForm.status = '';
+        pagination.current = 1;
+        pagination.pageSize = 10;
+        dataSource.value = [];
+        handleSearch();
+      }
+    }, [() => props.visible]);
 
     // ===== 表格列（dataIndex 对齐 API） =====
     const columns = [
diff --git a/src/pages/system/roles/components/RoleFormModal.tsx b/src/pages/system/roles/components/RoleFormModal.tsx
index 84fbd86..297e4f1 100644
--- a/src/pages/system/roles/components/RoleFormModal.tsx
+++ b/src/pages/system/roles/components/RoleFormModal.tsx
@@ -1,4 +1,5 @@
-import { defineComponent, ref, reactive, watch } from 'vue';
+import { defineComponent, ref, reactive } from 'vue';
+import { useEffect } from '@/hooks';
 import { Modal, Form, Input, Tree, Button, Spin, message } from 'ant-design-vue';
 import type { TreeProps } from 'ant-design-vue';
 import { getPermissionTree, type PermissionTreeNode } from '../model/services';
@@ -77,19 +78,13 @@ export default defineComponent({
       await loadPermissionTree(record.roleId);
     };
 
-    // 监听 visible 变化，弹窗打开时重新初始化
-    // immediate: true 是因为父组件用 v-if 控制显隐，
-    // 组件挂载时 visible 就已经是 true，不会触发 watch 变更回调
-    watch(
-      () => props.visible,
-      async (visible) => {
-        if (visible) {
-          await initFormFromRecord(props.record);
-          setTimeout(() => formRef.value?.clearValidate(), 0);
-        }
-      },
-      { immediate: true },
-    );
+    // 弹窗打开时重新初始化（useEffect 内置 immediate 行为）
+    useEffect(() => {
+      if (props.visible) {
+        initFormFromRecord(props.record);
+        setTimeout(() => formRef.value?.clearValidate(), 0);
+      }
+    }, [() => props.visible]);
 
     /** Tree 勾选回调（受控） */
     const handleCheck: TreeProps['onCheck'] = (checkedKeys, info) => {
-- 
2.52.0


From e542d7bdf3301b4d7929240dd435719bf46345de Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Wed, 5 Aug 2026 18:19:34 +0800
Subject: [PATCH 15/25] =?UTF-8?q?fix:=20=E8=B4=A6=E5=8A=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reports/types.ts                      |  6 +-
 src/pages/finance/reports/index.module.less   |  6 ++
 src/pages/finance/reports/index.tsx           | 33 +++++---
 .../finance/reports/model/useReportsModel.ts  | 76 ++++++++++++++++++-
 4 files changed, 106 insertions(+), 15 deletions(-)

diff --git a/src/api/reports/types.ts b/src/api/reports/types.ts
index 6a813fe..150473a 100644
--- a/src/api/reports/types.ts
+++ b/src/api/reports/types.ts
@@ -35,8 +35,10 @@ export interface FinanceReportVO {
 
 /** 财务报表查询参数 */
 export interface ReportQueryParams {
-  /** 查询日期 yyyy-MM */
-  date: string;
+  /** 起始月份 yyyy-MM */
+  beginDate: string;
+  /** 结束月份 yyyy-MM */
+  endDate: string;
 }
 
 export interface ApiResult<T> {
diff --git a/src/pages/finance/reports/index.module.less b/src/pages/finance/reports/index.module.less
index c7590e9..b84d36d 100644
--- a/src/pages/finance/reports/index.module.less
+++ b/src/pages/finance/reports/index.module.less
@@ -22,6 +22,12 @@
     gap: 6px;
   }
 
+  .dateRangeSelector {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+  }
+
   .reportTitle {
     font-size: 20px;
     font-weight: 600;
diff --git a/src/pages/finance/reports/index.tsx b/src/pages/finance/reports/index.tsx
index b50e5c2..9cbd18c 100644
--- a/src/pages/finance/reports/index.tsx
+++ b/src/pages/finance/reports/index.tsx
@@ -1,5 +1,5 @@
 import { defineComponent, ref, nextTick } from 'vue';
-import { DatePicker, Table } from 'ant-design-vue';
+import { DatePicker, Select, Table } from 'ant-design-vue';
 import * as echarts from 'echarts';
 import { useReportsModel } from './model/useReportsModel';
 import { useEffect, useContainerSize } from '@/hooks';
@@ -15,12 +15,15 @@ export default defineComponent({
   setup() {
     const {
       dateRange,
+      preset,
       handleDateRangeChange,
+      handlePresetChange,
       summary,
       chartData,
       detailColumns,
       detailData,
       formatMoney,
+      PRESET_OPTIONS,
     } = useReportsModel();
 
     // ===== echarts 组合图 =====
@@ -194,13 +197,23 @@ export default defineComponent({
                 平台资金流水概览，包括收入、退款、提现、用户余额等核心财务指标
               </div>
             </div>
-            <RangePicker
-              picker="month"
-              format="YYYY-MM"
-              value={dateRange.value}
-              onUpdate:value={handleDateRangeChange}
-              style={{ width: '240px' }}
-            />
+            <div class={styles.dateRangeSelector}>
+              <RangePicker
+                picker="month"
+                format="YYYY-MM"
+                value={dateRange.value}
+                onUpdate:value={handleDateRangeChange}
+                style={{ width: '240px' }}
+              />
+              <Select
+                value={preset.value}
+                onUpdate:value={handlePresetChange}
+                options={[...PRESET_OPTIONS]}
+                placeholder="请选择"
+                allowClear
+                style={{ width: '120px' }}
+              />
+            </div>
           </div>
 
           {/* ===== 统计卡 ===== */}
@@ -211,9 +224,7 @@ export default defineComponent({
                 <div class={styles.statValue} style={{ color: item.accentColor }}>
                   ¥{formatMoney(item.value)}
                 </div>
-                <div class={styles.statDesc} style="visibility: hidden;">
-                  -
-                </div>
+                {/* 趋势文字暂时隐藏 */}
               </div>
             ))}
           </div>
diff --git a/src/pages/finance/reports/model/useReportsModel.ts b/src/pages/finance/reports/model/useReportsModel.ts
index 141405b..4916a81 100644
--- a/src/pages/finance/reports/model/useReportsModel.ts
+++ b/src/pages/finance/reports/model/useReportsModel.ts
@@ -1,8 +1,58 @@
 import { computed, ref } from 'vue';
+import { message } from 'ant-design-vue';
 import { useRequest } from '@/hooks/useRequest';
 import { getFinanceReport, type FinanceReportVO } from './services';
 import dayjs, { type Dayjs } from 'dayjs';
 
+// ============================================================
+// 常量
+// ============================================================
+
+/** 快捷时间段选项 */
+export const PRESET_OPTIONS = [
+  { value: 'thisMonth' as const, label: '本月' },
+  { value: 'lastMonth' as const, label: '上月' },
+  { value: 'thisQuarter' as const, label: '本季度' },
+  { value: 'thisYear' as const, label: '本年' },
+];
+
+type PresetValue = (typeof PRESET_OPTIONS)[number]['value'];
+
+/** 根据快捷选项获取日期范围 */
+function getPresetRange(preset: PresetValue): [Dayjs, Dayjs] {
+  switch (preset) {
+    case 'thisMonth':
+      return [dayjs().startOf('month'), dayjs().endOf('month')];
+    case 'lastMonth':
+      return [
+        dayjs().subtract(1, 'month').startOf('month'),
+        dayjs().subtract(1, 'month').endOf('month'),
+      ];
+    case 'thisQuarter': {
+      const m = dayjs().month();
+      const start = dayjs()
+        .month(Math.floor(m / 3) * 3)
+        .startOf('month');
+      return [start, start.add(2, 'month').endOf('month')];
+    }
+    case 'thisYear':
+      return [dayjs().startOf('year'), dayjs().endOf('year')];
+  }
+}
+
+/** 判断时间范围是否匹配某个快捷选项 */
+function matchPreset(range: [Dayjs, Dayjs]): PresetValue | undefined {
+  const a = range[0].format('YYYY-MM');
+  const b = range[1].format('YYYY-MM');
+  for (const opt of PRESET_OPTIONS) {
+    const [ps, pe] = getPresetRange(opt.value);
+    if (ps.format('YYYY-MM') === a && pe.format('YYYY-MM') === b) {
+      return opt.value;
+    }
+  }
+  return undefined;
+}
+
 // ============================================================
 // 工具
 // ============================================================
@@ -34,6 +84,18 @@ export function useReportsModel() {
   // ===== 时间范围（年月区间选择器） =====
   const dateRange = ref<[Dayjs, Dayjs]>([dayjs().startOf('month'), dayjs().startOf('month')]);
 
+  // ===== 快捷时间段下拉 =====
+  const preset = ref<PresetValue | undefined>('thisMonth');
+
+  const handlePresetChange = (val: any) => {
+    if (!val || !PRESET_OPTIONS.some((o) => o.value === val)) {
+      preset.value = undefined;
+      return;
+    }
+    preset.value = val;
+    dateRange.value = getPresetRange(val);
+  };
+
   // ===== 构建 API 参数 =====
   const buildQueryParams = () => {
     const [start, end] = dateRange.value;
@@ -130,10 +192,17 @@ export function useReportsModel() {
     }));
   });
 
-  // ===== 时间范围变更 =====
+  // ===== 时间范围变更（限制最大跨度 1 年，同步快捷选项） =====
   const handleDateRangeChange = (val: any) => {
     if (!val || val.length < 2) return;
-    dateRange.value = [dayjs(val[0]), dayjs(val[1])];
+    const [s, e] = [dayjs(val[0]), dayjs(val[1])];
+    if (Math.abs(e.diff(s, 'month')) > 11) {
+      message.warning('时间跨度不能超过 1 年');
+      return;
+    }
+    dateRange.value = [s, e];
+    // 同步快捷下拉：匹配到预设则选中，否则清空
+    preset.value = matchPreset([s, e]);
   };
 
   /** 千分位格式金额（页面渲染用） */
@@ -147,12 +216,15 @@ export function useReportsModel() {
 
   return {
     dateRange,
+    preset,
     loading,
     handleDateRangeChange,
+    handlePresetChange,
     summary,
     chartData,
     detailColumns,
     detailData,
     formatMoney,
+    PRESET_OPTIONS: PRESET_OPTIONS as any,
   };
 }
-- 
2.52.0


From e3bd35e1547e3b457dbe6f5e61e7844750d4e503 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 09:02:49 +0800
Subject: [PATCH 16/25] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E5=AE=9E=E7=8E=B0=E8=BF=87=E4=BA=86=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E5=81=87=E6=95=B0=E6=8D=AE=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/banner/index.ts                      |   8 -
 src/api/logs/index.ts                        |  19 --
 src/api/orders/index.ts                      |  37 ---
 src/api/payments/index.ts                    |  10 -
 src/api/roles/index.ts                       |  23 --
 src/api/users/index.ts                       |  12 -
 src/api/wallet/index.ts                      |  17 --
 src/api/withdraw/index.ts                    |  19 --
 src/config/mock/bannerList.ts                | 169 ------------
 src/config/mock/operationLogs.ts             | 182 -------------
 src/config/mock/orderDetail.ts               |  41 ---
 src/config/mock/orderList.ts                 | 256 -------------------
 src/config/mock/orderPlayerList.ts           | 104 --------
 src/config/mock/paymentFlow.ts               | 164 ------------
 src/config/mock/permissionTree.ts            | 213 ---------------
 src/config/mock/roleList.ts                  |  31 ---
 src/config/mock/roleUsageUser.ts             |  33 ---
 src/config/mock/userList.ts                  | 134 ----------
 src/config/mock/walletList.ts                | 143 -----------
 src/config/mock/walletTransactions.ts        | 187 --------------
 src/config/mock/withdrawInfo.ts              | 150 -----------
 src/config/mock/withdrawList.ts              | 194 --------------
 src/pages/events/banner/model/services.ts    |   8 -
 src/pages/events/orders/model/services.ts    |  34 ---
 src/pages/events/users/model/services.ts     |   5 -
 src/pages/finance/payments/model/services.ts |  10 -
 src/pages/finance/wallet/model/services.ts   |  17 --
 src/pages/finance/withdraw/model/services.ts |  19 --
 src/pages/system/logs/model/services.ts      |  19 --
 29 files changed, 2258 deletions(-)
 delete mode 100644 src/config/mock/bannerList.ts
 delete mode 100644 src/config/mock/operationLogs.ts
 delete mode 100644 src/config/mock/orderDetail.ts
 delete mode 100644 src/config/mock/orderList.ts
 delete mode 100644 src/config/mock/orderPlayerList.ts
 delete mode 100644 src/config/mock/paymentFlow.ts
 delete mode 100644 src/config/mock/permissionTree.ts
 delete mode 100644 src/config/mock/roleList.ts
 delete mode 100644 src/config/mock/roleUsageUser.ts
 delete mode 100644 src/config/mock/userList.ts
 delete mode 100644 src/config/mock/walletList.ts
 delete mode 100644 src/config/mock/walletTransactions.ts
 delete mode 100644 src/config/mock/withdrawInfo.ts
 delete mode 100644 src/config/mock/withdrawList.ts

diff --git a/src/api/banner/index.ts b/src/api/banner/index.ts
index ffbdef1..61c7918 100644
--- a/src/api/banner/index.ts
+++ b/src/api/banner/index.ts
@@ -2,8 +2,6 @@
  * Banner 管理 API
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { MOCK_BANNER_LIST } from '@/config/mock/bannerList';
 import type {
   BannerListQueryParams,
   BannerSaveParams,
@@ -22,16 +20,10 @@ export type {
   ApiResult,
 } from './types';
 
-const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
-
 /** GET /manager/banner/list — Banner 列表 */
 export async function getBannerList(
   params: BannerListQueryParams,
 ): Promise<ApiResult<TournamentAdminBannerListVO[]>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    return { code: 200, msg: 'success', data: MOCK_BANNER_LIST };
-  }
   return get('/manager/banner/list', params as Record<string, any>);
 }
 
diff --git a/src/api/logs/index.ts b/src/api/logs/index.ts
index 9fe9ce6..9b02c83 100644
--- a/src/api/logs/index.ts
+++ b/src/api/logs/index.ts
@@ -2,8 +2,6 @@
  * 操作日志 API
  */
 import { get } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockOperationLogPage } from '@/config/mock/operationLogs';
 import type {
   OperationLogQueryParams,
   SysOperationLogVO,
@@ -20,27 +18,10 @@ export type {
   ApiResult,
 } from './types';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
-function pickFilters(params: OperationLogQueryParams): OperationLogQueryParams {
-  const { page: _page, limit: _limit, ...filters } = params;
-  return filters;
-}
-
 /** GET /admin/sys/operation/page — 系统操作日志分页 */
 export async function getOperationLogList(
   params: OperationLogQueryParams,
 ): Promise<ApiResult<PageData<SysOperationLogVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return {
-      code: 200,
-      msg: 'success',
-      data: buildMockOperationLogPage(page, limit, pickFilters(params)),
-    };
-  }
   return get('/sys/operation/page', params as Record<string, any>);
 }
 
diff --git a/src/api/orders/index.ts b/src/api/orders/index.ts
index 4a38ef5..9bc3953 100644
--- a/src/api/orders/index.ts
+++ b/src/api/orders/index.ts
@@ -3,13 +3,6 @@
  * 注意：/admin 前缀已通过 VITE_API_BASE_URL 统一注入（见 .env.*），此文件中只写业务路径。
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockOrderListPage } from '@/config/mock/orderList';
-import { MOCK_ORDER_DETAIL } from '@/config/mock/orderDetail';
-import {
-  MOCK_ORDER_PLAYER_LIST,
-  buildMockOrderPlayerListPage,
-} from '@/config/mock/orderPlayerList';
 import type {
   OrderListQueryParams,
   OrderDetailQueryParams,
@@ -35,8 +28,6 @@ export type {
   ApiResult,
 } from './types';
 
-const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
-
 /**
  * 订单管理 - 订单分页
  * GET /admin/manager/order/page → /manager/order/page
@@ -44,16 +35,6 @@ const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve,
 export async function getOrderList(
   params: OrderListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminOrderPageVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return {
-      code: 200,
-      msg: 'success',
-      data: buildMockOrderListPage(page, limit),
-    };
-  }
   return get('/manager/order/page', params as Record<string, any>);
 }
 
@@ -64,14 +45,6 @@ export async function getOrderList(
 export async function getOrderDetail(
   params: OrderDetailQueryParams,
 ): Promise<ApiResult<TournamentAdminOrderInfoVO>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    return {
-      code: 200,
-      msg: 'success',
-      data: { ...MOCK_ORDER_DETAIL },
-    };
-  }
   return get('/manager/order/info', params as Record<string, any>);
 }
 
@@ -82,16 +55,6 @@ export async function getOrderDetail(
 export async function getOrderPlayerList(
   params: OrderPlayerListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminOrderInfoPageVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return {
-      code: 200,
-      msg: 'success',
-      data: buildMockOrderPlayerListPage(page, limit),
-    };
-  }
   return get('/manager/order/info/page', params as Record<string, any>);
 }
 
diff --git a/src/api/payments/index.ts b/src/api/payments/index.ts
index 95d3bb1..ba0c61d 100644
--- a/src/api/payments/index.ts
+++ b/src/api/payments/index.ts
@@ -3,8 +3,6 @@
  * 对应 OpenAPI: GET /admin/finance/paymentFlow/page
  */
 import { get } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockPaymentFlowPage } from '@/config/mock/paymentFlow';
 import type {
   PaymentFlowQueryParams,
   PaymentFlowVO,
@@ -20,17 +18,9 @@ export type {
   ApiResult,
 } from './types';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 /** GET /admin/finance/paymentFlow/page — 支付流水分页 */
 export async function getPaymentFlowList(
   params: PaymentFlowQueryParams,
 ): Promise<ApiResult<PaymentFlowPageData>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockPaymentFlowPage(page, limit, params) };
-  }
   return get('/finance/paymentFlow/page', params as Record<string, any>);
 }
diff --git a/src/api/roles/index.ts b/src/api/roles/index.ts
index 4a0628d..cf092e5 100644
--- a/src/api/roles/index.ts
+++ b/src/api/roles/index.ts
@@ -2,10 +2,6 @@
  * 角色管理 API
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockRoleListPage } from '@/config/mock/roleList';
-import { buildMockRoleUsageUserPage } from '@/config/mock/roleUsageUser';
-import { buildMockPermissionTree } from '@/config/mock/permissionTree';
 import type {
   RoleListQueryParams,
   RoleUsageUserQueryParams,
@@ -26,18 +22,10 @@ export type {
   ApiResult,
 } from './types';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 /** GET /sys/role/page — 角色列表分页 */
 export async function getRoleList(
   params: RoleListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminRolePageVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockRoleListPage(page, limit) };
-  }
   return get('/admin/sys/role/page', params as Record<string, any>);
 }
 
@@ -45,12 +33,6 @@ export async function getRoleList(
 export async function getRoleUsageUserList(
   params: RoleUsageUserQueryParams,
 ): Promise<ApiResult<PageData<RoleUsageUserVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockRoleUsageUserPage(page, limit) };
-  }
   return get('/sys/role/usageUserPage', params as Record<string, any>);
 }
 
@@ -58,11 +40,6 @@ export async function getRoleUsageUserList(
 export async function getPermissionTree(
   roleId: number | string,
 ): Promise<ApiResult<PermissionTreeNode[]>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const id = Number(roleId) || 0;
-    return { code: 200, msg: 'success', data: buildMockPermissionTree(id) };
-  }
   return get('/sys/role/permissionList', { roleId: String(roleId) });
 }
 
diff --git a/src/api/users/index.ts b/src/api/users/index.ts
index 8d5b318..73efc60 100644
--- a/src/api/users/index.ts
+++ b/src/api/users/index.ts
@@ -2,8 +2,6 @@
  * 用户管理 API
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockUserListPage } from '@/config/mock/userList';
 import type {
   UserListQueryParams,
   UserSaveParams,
@@ -26,30 +24,20 @@ export type {
   ApiResult,
 } from './types';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 /** GET /admin/sys/user/page — 用户分页 */
 export async function getUserList(
   params: UserListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminUserVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockUserListPage(page, limit) };
-  }
   return get('/admin/sys/user/page', params as Record<string, any>);
 }
 
 /** POST /admin/sys/user/save — 新增用户 */
 export function saveUser(params: UserSaveParams): Promise<ApiResult<Record<string, never>>> {
-  if (USE_MOCK) return delay(MOCK_DELAY).then(() => ({ code: 200, msg: 'success', data: {} }));
   return post('/admin/sys/user/save', params);
 }
 
 /** POST /admin/sys/user/update — 更新用户 */
 export function updateUser(params: UserUpdateParams): Promise<ApiResult<Record<string, never>>> {
-  if (USE_MOCK) return delay(MOCK_DELAY).then(() => ({ code: 200, msg: 'success', data: {} }));
   return post('/admin/sys/user/update', params);
 }
 
diff --git a/src/api/wallet/index.ts b/src/api/wallet/index.ts
index 4714102..9b323b3 100644
--- a/src/api/wallet/index.ts
+++ b/src/api/wallet/index.ts
@@ -3,9 +3,6 @@
  * OpenAPI: GET /admin/finance/wallet/summary, GET /admin/finance/wallet/page
  */
 import { get } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockWalletPage } from '@/config/mock/walletList';
-import { buildMockWalletTransactionPage } from '@/config/mock/walletTransactions';
 import type {
   WalletQueryParams,
   WalletSummaryVO,
@@ -26,18 +23,10 @@ export type {
   ApiResult,
 } from './types';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 /** GET /admin/finance/wallet/summary — 钱包列表分页 */
 export async function getWalletList(
   params: WalletQueryParams,
 ): Promise<ApiResult<WalletSummaryPageData>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockWalletPage(page, limit, params) };
-  }
   return get('/finance/wallet/summary', params as Record<string, any>);
 }
 
@@ -45,11 +34,5 @@ export async function getWalletList(
 export async function getWalletTransactionList(
   params: WalletTransactionQueryParams,
 ): Promise<ApiResult<PageData<WalletTransactionVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockWalletTransactionPage(page, limit, params) };
-  }
   return get('/finance/wallet/page', params as Record<string, any>);
 }
diff --git a/src/api/withdraw/index.ts b/src/api/withdraw/index.ts
index 39dd0ab..13f7d54 100644
--- a/src/api/withdraw/index.ts
+++ b/src/api/withdraw/index.ts
@@ -3,38 +3,19 @@
  * 对应 OpenAPI: GET /admin/finance/withdraw/page, GET /admin/finance/withdraw/info
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockWithdrawPage } from '@/config/mock/withdrawList';
-import { buildMockWithdrawInfo } from '@/config/mock/withdrawInfo';
 import type { WithdrawQueryParams, WithdrawVO, WithdrawInfoVO, PageData, ApiResult } from './types';
 
 export type { WithdrawVO, WithdrawInfoVO, WithdrawQueryParams, PageData, ApiResult } from './types';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 /** GET /admin/finance/withdraw/page — 提现列表分页 */
 export async function getWithdrawList(
   params: WithdrawQueryParams,
 ): Promise<ApiResult<PageData<WithdrawVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return {
-      code: 200,
-      msg: 'success',
-      data: buildMockWithdrawPage(page, limit, params),
-    };
-  }
   return get('/admin/finance/withdraw/page', params as Record<string, any>);
 }
 
 /** GET /admin/finance/withdraw/info?id=xxx — 提现详情 */
 export async function getWithdrawInfo(id: number): Promise<ApiResult<WithdrawInfoVO>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    return { code: 200, msg: 'success', data: buildMockWithdrawInfo(id) };
-  }
   return get('/admin/finance/withdraw/info', { id: String(id) });
 }
 
diff --git a/src/config/mock/bannerList.ts b/src/config/mock/bannerList.ts
deleted file mode 100644
index cca6e42..0000000
--- a/src/config/mock/bannerList.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Banner 列表页假数据
- *
- * 使用页面：`src/pages/events/banner/index.tsx`
- * 对应接口：`GET /manager/banner/list`
- * 类型：`TournamentAdminBannerListVO[]`
- *
- * 注意：类型内联定义，避免循环引用。
- */
-
-export interface MockBannerVO {
-  id: string;
-  img: string;
-  title: string;
-  type: string;
-  params: string;
-  area: string;
-  showTimeBegin: string;
-  showTimeEnd: string;
-  status: string;
-  createDate: string;
-}
-
-export const MOCK_BANNER_LIST: MockBannerVO[] = [
-  {
-    id: '1',
-    img: 'https://picsum.photos/seed/banner1/80/44',
-    title: '2026全国青少年羽毛球锦标赛火热报名中',
-    type: '1',
-    params: 'EV20260701001',
-    area: '深圳市',
-    showTimeBegin: '2026-08-01 00:00',
-    showTimeEnd: '2026-08-31 23:59',
-    status: '1',
-    createDate: '2026-07-20 08:00:00',
-  },
-  {
-    id: '2',
-    img: 'https://picsum.photos/seed/banner2/80/44',
-    title: '马拉松城市联赛限时优惠',
-    type: '2',
-    params: 'https://example.com/marathon',
-    area: '杭州市',
-    showTimeBegin: '2026-08-15 00:00',
-    showTimeEnd: '2026-09-15 23:59',
-    status: '1',
-    createDate: '2026-07-19 11:30:00',
-  },
-  {
-    id: '3',
-    img: 'https://picsum.photos/seed/banner3/80/44',
-    title: '健身运动会专属福利',
-    type: '1',
-    params: 'EV20260701003',
-    area: '北京市',
-    showTimeBegin: '2026-07-01 00:00',
-    showTimeEnd: '2026-07-30 23:59',
-    status: '1',
-    createDate: '2026-07-18 14:20:00',
-  },
-  {
-    id: '4',
-    img: 'https://picsum.photos/seed/banner4/80/44',
-    title: '平台品牌宣传活动',
-    type: '2',
-    params: 'https://example.com/promo',
-    area: '上海市',
-    showTimeBegin: '2026-06-01 00:00',
-    showTimeEnd: '2026-06-30 23:59',
-    status: '0',
-    createDate: '2026-07-17 18:05:00',
-  },
-  {
-    id: '5',
-    img: 'https://picsum.photos/seed/banner5/80/44',
-    title: '2026全国青少年羽毛球锦标赛火热报名中',
-    type: '1',
-    params: 'EV20260701005',
-    area: '深圳市',
-    showTimeBegin: '2026-09-01 00:00',
-    showTimeEnd: '2026-09-30 23:59',
-    status: '1',
-    createDate: '2026-07-16 21:15:00',
-  },
-  {
-    id: '6',
-    img: 'https://picsum.photos/seed/banner6/80/44',
-    title: '马拉松城市联赛限时优惠',
-    type: '3',
-    params: '/pages/activity/detail',
-    area: '杭州市',
-    showTimeBegin: '2026-10-01 00:00',
-    showTimeEnd: '2026-10-31 23:59',
-    status: '1',
-    createDate: '2026-07-15 00:30:00',
-  },
-  {
-    id: '7',
-    img: 'https://picsum.photos/seed/banner7/80/44',
-    title: '全民健身日特别活动',
-    type: '1',
-    params: 'EV20260701007',
-    area: '北京市',
-    showTimeBegin: '2026-08-08 00:00',
-    showTimeEnd: '2026-08-08 23:59',
-    status: '1',
-    createDate: '2026-07-14 03:50:00',
-  },
-  {
-    id: '8',
-    img: 'https://picsum.photos/seed/banner8/80/44',
-    title: '新春运动季大促销',
-    type: '2',
-    params: 'https://example.com/spring',
-    area: '上海市',
-    showTimeBegin: '2026-01-15 00:00',
-    showTimeEnd: '2026-02-15 23:59',
-    status: '0',
-    createDate: '2026-07-13 07:05:00',
-  },
-  {
-    id: '9',
-    img: 'https://picsum.photos/seed/banner9/80/44',
-    title: '2026全国青少年羽毛球锦标赛火热报名中',
-    type: '0',
-    params: '',
-    area: '全国',
-    showTimeBegin: '2026-08-01 00:00',
-    showTimeEnd: '2026-08-31 23:59',
-    status: '1',
-    createDate: '2026-07-12 10:25:00',
-  },
-  {
-    id: '10',
-    img: 'https://picsum.photos/seed/banner10/80/44',
-    title: '平台品牌宣传活动',
-    type: '2',
-    params: 'https://example.com/brand',
-    area: '杭州市',
-    showTimeBegin: '2026-11-01 00:00',
-    showTimeEnd: '2026-11-30 23:59',
-    status: '1',
-    createDate: '2026-07-11 13:40:00',
-  },
-  {
-    id: '11',
-    img: 'https://picsum.photos/seed/banner11/80/44',
-    title: '秋季健身挑战赛',
-    type: '1',
-    params: 'EV20260701011',
-    area: '北京市',
-    showTimeBegin: '2026-09-01 00:00',
-    showTimeEnd: '2026-09-30 23:59',
-    status: '1',
-    createDate: '2026-07-10 17:00:00',
-  },
-  {
-    id: '12',
-    img: 'https://picsum.photos/seed/banner12/80/44',
-    title: '双十一运动装备大促',
-    type: '2',
-    params: 'https://example.com/double11',
-    area: '上海市',
-    showTimeBegin: '2026-11-01 00:00',
-    showTimeEnd: '2026-11-11 23:59',
-    status: '1',
-    createDate: '2026-07-09 20:15:00',
-  },
-];
diff --git a/src/config/mock/operationLogs.ts b/src/config/mock/operationLogs.ts
deleted file mode 100644
index 397132f..0000000
--- a/src/config/mock/operationLogs.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * 操作日志假数据
- * 对应接口：GET /admin/sys/operation/page
- *
- * 类型内联，避免与 @/api/logs 循环引用。
- */
-interface MockSysOperationLogVO {
-  type: number;
-  nickname: string;
-  createDate: string;
-  content: string;
-}
-
-interface MockOperationLogQueryParams {
-  type?: string;
-  nickname?: string;
-  dateBegin?: string;
-  dateEnd?: string;
-}
-
-interface MockPageData<T> {
-  total: number;
-  list: T[];
-}
-
-const MOCK_LOGS: MockSysOperationLogVO[] = [
-  {
-    type: 1,
-    nickname: '张三',
-    createDate: '2026-07-30 08:00:00',
-    content: '下架赛事"第二十一届贝格林羽毛球大赛"',
-  },
-  {
-    type: 2,
-    nickname: '张三',
-    createDate: '2026-07-30 09:30:00',
-    content: '上架赛事"第二十一届贝格林羽毛球大赛"',
-  },
-  {
-    type: 3,
-    nickname: '李四',
-    createDate: '2026-07-29 10:12:00',
-    content: '禁用用户"王五（1003）"',
-  },
-  {
-    type: 4,
-    nickname: '李四',
-    createDate: '2026-07-29 10:20:00',
-    content: '启用用户"王五（1003）"',
-  },
-  {
-    type: 1,
-    nickname: '赵六',
-    createDate: '2026-07-28 14:00:00',
-    content: '下架赛事"春季马拉松大赛"',
-  },
-  {
-    type: 2,
-    nickname: '赵六',
-    createDate: '2026-07-28 15:00:00',
-    content: '上架赛事"春季马拉松大赛"',
-  },
-  {
-    type: 3,
-    nickname: '张三',
-    createDate: '2026-07-27 09:00:00',
-    content: '禁用用户"钱七（1005）"',
-  },
-  {
-    type: 4,
-    nickname: '张三',
-    createDate: '2026-07-27 09:15:00',
-    content: '启用用户"钱七（1005）"',
-  },
-  {
-    type: 1,
-    nickname: '孙八',
-    createDate: '2026-07-26 16:30:00',
-    content: '下架赛事"夏季游泳锦标赛"',
-  },
-  {
-    type: 2,
-    nickname: '孙八',
-    createDate: '2026-07-26 17:00:00',
-    content: '上架赛事"夏季游泳锦标赛"',
-  },
-  {
-    type: 1,
-    nickname: '李四',
-    createDate: '2026-07-25 11:00:00',
-    content: '下架赛事"秋季篮球邀请赛"',
-  },
-  {
-    type: 2,
-    nickname: '李四',
-    createDate: '2026-07-25 12:00:00',
-    content: '上架赛事"秋季篮球邀请赛"',
-  },
-  {
-    type: 3,
-    nickname: '周九',
-    createDate: '2026-07-24 08:30:00',
-    content: '禁用用户"吴十（1008）"',
-  },
-  {
-    type: 4,
-    nickname: '周九',
-    createDate: '2026-07-24 08:45:00',
-    content: '启用用户"吴十（1008）"',
-  },
-  {
-    type: 1,
-    nickname: '张三',
-    createDate: '2026-07-23 13:00:00',
-    content: '下架赛事"冬季滑雪挑战赛"',
-  },
-  {
-    type: 2,
-    nickname: '张三',
-    createDate: '2026-07-23 14:00:00',
-    content: '上架赛事"冬季滑雪挑战赛"',
-  },
-  {
-    type: 3,
-    nickname: '郑十一',
-    createDate: '2026-07-22 10:00:00',
-    content: '禁用用户"冯十二（1012）"',
-  },
-  {
-    type: 4,
-    nickname: '郑十一',
-    createDate: '2026-07-22 10:10:00',
-    content: '启用用户"冯十二（1012）"',
-  },
-  {
-    type: 1,
-    nickname: '孙八',
-    createDate: '2026-07-21 15:30:00',
-    content: '下架赛事"元旦全民健身跑"',
-  },
-  {
-    type: 2,
-    nickname: '孙八',
-    createDate: '2026-07-21 16:00:00',
-    content: '上架赛事"元旦全民健身跑"',
-  },
-];
-
-/** 按日期范围过滤（dateBegin / dateEnd 格式 yyyy-MM-dd） */
-function inDateRange(dateStr: string, begin?: string, end?: string): boolean {
-  if (!begin && !end) return true;
-  const d = dateStr.slice(0, 10);
-  if (begin && d < begin) return false;
-  if (end && d > end) return false;
-  return true;
-}
-
-export function buildMockOperationLogPage(
-  page: number,
-  limit: number,
-  params: MockOperationLogQueryParams,
-): MockPageData<MockSysOperationLogVO> {
-  let filtered = [...MOCK_LOGS];
-
-  if (params.type) {
-    filtered = filtered.filter((item) => item.type === Number(params.type));
-  }
-
-  if (params.nickname) {
-    filtered = filtered.filter((item) => item.nickname.includes(params.nickname!));
-  }
-
-  filtered = filtered.filter((item) =>
-    inDateRange(item.createDate, params.dateBegin, params.dateEnd),
-  );
-
-  const total = filtered.length;
-  const start = (page - 1) * limit;
-  const list = filtered.slice(start, start + limit);
-
-  return { total, list };
-}
diff --git a/src/config/mock/orderDetail.ts b/src/config/mock/orderDetail.ts
deleted file mode 100644
index 24dae23..0000000
--- a/src/config/mock/orderDetail.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 订单详情弹窗假数据
- *
- * 使用页面：`src/pages/events/orders/components/OrderDetailModal.tsx`
- * 对应接口：`GET /manager/order/info`
- * 类型：`TournamentAdminOrderInfoVO`
- */
-import type { TournamentAdminOrderInfoVO } from '@/api/orders/types';
-
-export const MOCK_ORDER_DETAIL: TournamentAdminOrderInfoVO = {
-  tournamentName: '2026全国青少年羽毛球锦标赛暨体育文化交流大会',
-  orderNumber: 'ORD20260700001',
-  orderTime: '2026.07.12 08:11:07',
-  payTime: '2026.07.12 08:12:30',
-  orderAmount: '188.00',
-  discountAmount: '20.00',
-  payAmount: '168.00',
-  refundAmount: '50.00',
-  refundInfoList: [
-    {
-      refundedAmount: '30.00',
-      totalRefundCount: '2',
-      refundAmount: '30.00',
-      isFullRefund: '0',
-      refundMethod: '原路退回（微信支付）',
-      refundApplyTime: '2026.07.15 09:30:00',
-      refundOutTradeNo: '5030000789202607150930000123',
-      refundTime: '2026.07.15 09:35:00',
-    },
-    {
-      refundedAmount: '20.00',
-      totalRefundCount: '2',
-      refundAmount: '20.00',
-      isFullRefund: '1',
-      refundMethod: '原路退回（微信支付）',
-      refundApplyTime: '2026.07.16 14:00:00',
-      refundOutTradeNo: '5030000789202607161400000456',
-      refundTime: '',
-    },
-  ],
-};
diff --git a/src/config/mock/orderList.ts b/src/config/mock/orderList.ts
deleted file mode 100644
index 8e66a44..0000000
--- a/src/config/mock/orderList.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * 订单列表页假数据
- *
- * 使用页面：`src/pages/events/orders/index.tsx`
- * 对应接口：`GET /manager/order/page`
- * 类型：`TournamentAdminOrderPageVO[]`
- */
-import type { TournamentAdminOrderPageVO, PageData } from '@/api/orders/types';
-
-export const MOCK_ORDER_LIST: TournamentAdminOrderPageVO[] = [
-  {
-    orderNo: 'ORD20260700001',
-    uniqueId: 101,
-    name: '2026全国青少年羽毛球锦标赛暨体育文化交流大会',
-    realName: '张选手',
-    phone: '13800138001',
-    categoryName: '男子青年组',
-    creatorName: '张报名',
-    creatorPhone: '13800138001',
-    creatorSignupCount: 2,
-    creatorSignupFee: '188.00',
-    creatorSignupFeeDiscount: '20.00',
-    creatorSignupFeeActual: '168.00',
-    creatorSignupFeeRefund: '0.00',
-    orderTime: '2026.07.12 08:11:07',
-    payTime: '2026.07.12 08:12:30',
-    orderStatus: 1,
-    refundStatus: 1,
-  },
-  {
-    orderNo: 'ORD20260700002',
-    uniqueId: 102,
-    name: '国际马拉松城市联赛',
-    realName: '李选手',
-    phone: '13900139002',
-    categoryName: '女子青年组',
-    creatorName: '李报名',
-    creatorPhone: '13900139002',
-    creatorSignupCount: 1,
-    creatorSignupFee: '256.50',
-    creatorSignupFeeDiscount: '10.00',
-    creatorSignupFeeActual: '246.50',
-    creatorSignupFeeRefund: '50.00',
-    orderTime: '2026.07.11 11:28:20',
-    payTime: '2026.07.11 11:30:05',
-    orderStatus: 2,
-    refundStatus: 2,
-  },
-  {
-    orderNo: 'ORD20260700003',
-    uniqueId: 103,
-    name: '全民健身运动会',
-    realName: '王选手',
-    phone: '13700137003',
-    categoryName: '男子中年组',
-    creatorName: '王报名',
-    creatorPhone: '13700137003',
-    creatorSignupCount: 1,
-    creatorSignupFee: '399.00',
-    creatorSignupFeeDiscount: '0.00',
-    creatorSignupFeeActual: '399.00',
-    creatorSignupFeeRefund: '399.00',
-    orderTime: '2026.07.10 14:45:33',
-    payTime: '2026.07.10 14:46:10',
-    orderStatus: 3,
-    refundStatus: 2,
-  },
-  {
-    orderNo: 'ORD20260700004',
-    uniqueId: 104,
-    name: '2026全国青少年羽毛球锦标赛暨体育文化交流大会',
-    realName: '赵选手',
-    phone: '13600136004',
-    categoryName: '女子中年组',
-    creatorName: '赵报名',
-    creatorPhone: '13600136004',
-    creatorSignupCount: 3,
-    creatorSignupFee: '128.00',
-    creatorSignupFeeDiscount: '20.00',
-    creatorSignupFeeActual: '108.00',
-    creatorSignupFeeRefund: '0.00',
-    orderTime: '2026.07.09 18:02:46',
-    payTime: '2026.07.09 18:03:15',
-    orderStatus: 4,
-    refundStatus: 1,
-  },
-  {
-    orderNo: 'ORD20260700005',
-    uniqueId: 105,
-    name: '国际马拉松城市联赛',
-    realName: '张选手',
-    phone: '13800138001',
-    categoryName: '男子青年组',
-    creatorName: '张报名',
-    creatorPhone: '13800138001',
-    creatorSignupCount: 2,
-    creatorSignupFee: '520.00',
-    creatorSignupFeeDiscount: '10.00',
-    creatorSignupFeeActual: '510.00',
-    creatorSignupFeeRefund: '0.00',
-    orderTime: '2026.07.08 21:19:59',
-    payTime: '2026.07.08 21:21:20',
-    orderStatus: 1,
-    refundStatus: 1,
-  },
-  {
-    orderNo: 'ORD20260700006',
-    uniqueId: 106,
-    name: '全民健身运动会',
-    realName: '李选手',
-    phone: '13900139002',
-    categoryName: '女子青年组',
-    creatorName: '李报名',
-    creatorPhone: '13900139002',
-    creatorSignupCount: 1,
-    creatorSignupFee: '188.00',
-    creatorSignupFeeDiscount: '0.00',
-    creatorSignupFeeActual: '188.00',
-    creatorSignupFeeRefund: '0.00',
-    orderTime: '2026.07.07 00:36:12',
-    payTime: '2026.07.07 00:37:00',
-    orderStatus: 1,
-    refundStatus: 1,
-  },
-  {
-    orderNo: 'ORD20260700007',
-    uniqueId: 107,
-    name: '2026全国青少年羽毛球锦标赛暨体育文化交流大会',
-    realName: '王选手',
-    phone: '13700137003',
-    categoryName: '男子中年组',
-    creatorName: '王报名',
-    creatorPhone: '13700137003',
-    creatorSignupCount: 1,
-    creatorSignupFee: '256.50',
-    creatorSignupFeeDiscount: '20.00',
-    creatorSignupFeeActual: '236.50',
-    creatorSignupFeeRefund: '236.50',
-    orderTime: '2026.07.06 03:53:25',
-    payTime: '2026.07.06 03:54:00',
-    orderStatus: 3,
-    refundStatus: 3,
-  },
-  {
-    orderNo: 'ORD20260700008',
-    uniqueId: 108,
-    name: '国际马拉松城市联赛',
-    realName: '赵选手',
-    phone: '13600136004',
-    categoryName: '女子中年组',
-    creatorName: '赵报名',
-    creatorPhone: '13600136004',
-    creatorSignupCount: 3,
-    creatorSignupFee: '399.00',
-    creatorSignupFeeDiscount: '10.00',
-    creatorSignupFeeActual: '389.00',
-    creatorSignupFeeRefund: '30.00',
-    orderTime: '2026.07.05 07:10:38',
-    payTime: '2026.07.05 07:11:00',
-    orderStatus: 2,
-    refundStatus: 2,
-  },
-  {
-    orderNo: 'ORD20260700009',
-    uniqueId: 109,
-    name: '全民健身运动会',
-    realName: '张选手',
-    phone: '13800138001',
-    categoryName: '男子青年组',
-    creatorName: '张报名',
-    creatorPhone: '13800138001',
-    creatorSignupCount: 2,
-    creatorSignupFee: '128.00',
-    creatorSignupFeeDiscount: '0.00',
-    creatorSignupFeeActual: '128.00',
-    creatorSignupFeeRefund: '0.00',
-    orderTime: '2026.07.04 10:27:51',
-    payTime: '2026.07.04 10:28:30',
-    orderStatus: 4,
-    refundStatus: 1,
-  },
-  {
-    orderNo: 'ORD20260700010',
-    uniqueId: 110,
-    name: '2026全国青少年羽毛球锦标赛暨体育文化交流大会',
-    realName: '李选手',
-    phone: '13900139002',
-    categoryName: '女子青年组',
-    creatorName: '李报名',
-    creatorPhone: '13900139002',
-    creatorSignupCount: 1,
-    creatorSignupFee: '520.00',
-    creatorSignupFeeDiscount: '20.00',
-    creatorSignupFeeActual: '500.00',
-    creatorSignupFeeRefund: '0.00',
-    orderTime: '2026.07.03 13:44:04',
-    payTime: '2026.07.03 13:45:00',
-    orderStatus: 1,
-    refundStatus: 1,
-  },
-  {
-    orderNo: 'ORD20260700011',
-    uniqueId: 111,
-    name: '国际马拉松城市联赛',
-    realName: '王选手',
-    phone: '13700137003',
-    categoryName: '男子中年组',
-    creatorName: '王报名',
-    creatorPhone: '13700137003',
-    creatorSignupCount: 1,
-    creatorSignupFee: '188.00',
-    creatorSignupFeeDiscount: '10.00',
-    creatorSignupFeeActual: '178.00',
-    creatorSignupFeeRefund: '50.00',
-    orderTime: '2026.07.02 17:01:17',
-    payTime: '2026.07.02 17:02:00',
-    orderStatus: 2,
-    refundStatus: 3,
-  },
-  {
-    orderNo: 'ORD20260700012',
-    uniqueId: 112,
-    name: '全民健身运动会',
-    realName: '赵选手',
-    phone: '13600136004',
-    categoryName: '女子中年组',
-    creatorName: '赵报名',
-    creatorPhone: '13600136004',
-    creatorSignupCount: 3,
-    creatorSignupFee: '256.50',
-    creatorSignupFeeDiscount: '0.00',
-    creatorSignupFeeActual: '256.50',
-    creatorSignupFeeRefund: '0.00',
-    orderTime: '2026.07.01 20:18:30',
-    payTime: '2026.07.01 20:19:00',
-    orderStatus: 1,
-    refundStatus: 1,
-  },
-];
-
-/** 金额汇总假数据（汇总接口独立，此为 mock 占位） */
-export const MOCK_ORDER_SUMMARY = {
-  totalOrderAmount: 113255.0,
-  totalPaidAmount: 113255.0,
-  totalRefundAmount: 1255.0,
-};
-
-/** 构建分页响应 */
-export function buildMockOrderListPage(
-  page: number,
-  limit: number,
-): PageData<TournamentAdminOrderPageVO> {
-  const start = (page - 1) * limit;
-  const list = MOCK_ORDER_LIST.slice(start, start + limit);
-  return { total: MOCK_ORDER_LIST.length, list };
-}
diff --git a/src/config/mock/orderPlayerList.ts b/src/config/mock/orderPlayerList.ts
deleted file mode 100644
index 287e20a..0000000
--- a/src/config/mock/orderPlayerList.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 订单详情 — 选手列表假数据
- *
- * 使用页面：`src/pages/events/orders/components/OrderDetailModal.tsx`
- * 对应接口：`GET /manager/order/info/page`
- * 类型：`TournamentAdminOrderInfoPageVO[]`
- */
-import type { TournamentAdminOrderInfoPageVO } from '@/api/orders/types';
-
-export const MOCK_ORDER_PLAYER_LIST: TournamentAdminOrderInfoPageVO[] = [
-  {
-    realName: '张三',
-    gender: '1',
-    phone: '13800138001',
-    idCard: '110101199001011234',
-    idCardImg: 'https://picsum.photos/seed/idcard1/96/64',
-    idCardImgList: [
-      'https://picsum.photos/seed/idcard1a/96/64',
-      'https://picsum.photos/seed/idcard1b/96/64',
-    ],
-    categoryName: '男子青年组',
-    orderAmount: '100.00',
-    discountAmount: '10.00',
-    payAmount: '90.00',
-    refundAmount: '0.00',
-  },
-  {
-    realName: '李四',
-    gender: '1',
-    phone: '13900139002',
-    idCard: '110101199002022345',
-    idCardImg: '',
-    idCardImgList: [],
-    categoryName: '男子青年组',
-    orderAmount: '88.00',
-    discountAmount: '10.00',
-    payAmount: '78.00',
-    refundAmount: '50.00',
-  },
-  {
-    realName: '王芳',
-    gender: '2',
-    phone: '13700137003',
-    idCard: '110101199103033456',
-    idCardImg: 'https://picsum.photos/seed/idcard3/96/64',
-    idCardImgList: ['https://picsum.photos/seed/idcard3a/96/64'],
-    categoryName: '女子双打',
-    orderAmount: '0.00',
-    discountAmount: '0.00',
-    payAmount: '0.00',
-    refundAmount: '-',
-  },
-  {
-    realName: '赵六',
-    gender: '1',
-    phone: '13600136004',
-    idCard: '110101199204044567',
-    idCardImg: '',
-    idCardImgList: [],
-    categoryName: '女子双打',
-    orderAmount: '50.00',
-    discountAmount: '0.00',
-    payAmount: '50.00',
-    refundAmount: '-',
-  },
-  {
-    realName: '孙七',
-    gender: '2',
-    phone: '13500135005',
-    idCard: '110101199305055678',
-    idCardImg: 'https://picsum.photos/seed/idcard5/96/64',
-    idCardImgList: [
-      'https://picsum.photos/seed/idcard5a/96/64',
-      'https://picsum.photos/seed/idcard5b/96/64',
-    ],
-    categoryName: '男子青年组',
-    orderAmount: '60.00',
-    discountAmount: '5.00',
-    payAmount: '55.00',
-    refundAmount: '0.00',
-  },
-  {
-    realName: '周八',
-    gender: '1',
-    phone: '13400134006',
-    idCard: '110101199406066789',
-    idCardImg: 'https://picsum.photos/seed/idcard6/96/64',
-    idCardImgList: ['https://picsum.photos/seed/idcard6a/96/64'],
-    categoryName: '男子中年组',
-    orderAmount: '120.00',
-    discountAmount: '20.00',
-    payAmount: '100.00',
-    refundAmount: '-',
-  },
-];
-
-export function buildMockOrderPlayerListPage(
-  page: number,
-  limit: number,
-): { total: number; list: TournamentAdminOrderInfoPageVO[] } {
-  const start = (page - 1) * limit;
-  const list = MOCK_ORDER_PLAYER_LIST.slice(start, start + limit);
-  return { total: MOCK_ORDER_PLAYER_LIST.length, list };
-}
diff --git a/src/config/mock/paymentFlow.ts b/src/config/mock/paymentFlow.ts
deleted file mode 100644
index e48463d..0000000
--- a/src/config/mock/paymentFlow.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * 支付流水假数据
- * 对应接口：GET /admin/finance/paymentFlow/page
- */
-import type { PaymentFlowVO, PaymentFlowQueryParams, PaymentFlowPageData } from '@/api/payments';
-
-const MOCK_LIST: PaymentFlowVO[] = [
-  {
-    serialNo: 'FL20260730001',
-    orderNo: 'OD20260730001',
-    type: 1,
-    nickname: '张三',
-    phone: '12345678997',
-    amount: '99.00',
-    createDate: '2026-07-30 08:00:00',
-  },
-  {
-    serialNo: '',
-    orderNo: '',
-    type: 2,
-    nickname: '李四',
-    phone: '12345678998',
-    amount: '100.00',
-    createDate: '2026-07-30 07:00:00',
-  },
-  {
-    serialNo: 'FL20260729002',
-    orderNo: 'OD20260729002',
-    type: 1,
-    nickname: '王五',
-    phone: '12345678998',
-    amount: '199.00',
-    createDate: '2026-07-29 16:00:00',
-  },
-  {
-    serialNo: '',
-    orderNo: '',
-    type: 2,
-    nickname: '赵六',
-    phone: '13800138000',
-    amount: '50.00',
-    createDate: '2026-07-29 15:20:00',
-  },
-  {
-    serialNo: 'FL20260728003',
-    orderNo: 'OD20260728003',
-    type: 1,
-    nickname: '钱七',
-    phone: '13900139001',
-    amount: '350.00',
-    createDate: '2026-07-28 14:00:00',
-  },
-  {
-    serialNo: '',
-    orderNo: '',
-    type: 2,
-    nickname: '孙八',
-    phone: '18600186001',
-    amount: '120.00',
-    createDate: '2026-07-28 10:30:00',
-  },
-  {
-    serialNo: 'FL20260727004',
-    orderNo: 'OD20260727004',
-    type: 1,
-    nickname: '周九',
-    phone: '15200152000',
-    amount: '88.00',
-    createDate: '2026-07-27 09:00:00',
-  },
-  {
-    serialNo: 'FL20260727005',
-    orderNo: 'OD20260727005',
-    type: 1,
-    nickname: '吴十',
-    phone: '17000170001',
-    amount: '520.00',
-    createDate: '2026-07-27 08:00:00',
-  },
-  {
-    serialNo: '',
-    orderNo: '',
-    type: 2,
-    nickname: '李四',
-    phone: '12345678998',
-    amount: '200.00',
-    createDate: '2026-07-26 17:00:00',
-  },
-  {
-    serialNo: 'FL20260726006',
-    orderNo: 'OD20260726006',
-    type: 1,
-    nickname: '张三',
-    phone: '12345678997',
-    amount: '128.00',
-    createDate: '2026-07-26 11:00:00',
-  },
-  {
-    serialNo: '',
-    orderNo: '',
-    type: 2,
-    nickname: '王五',
-    phone: '12345678998',
-    amount: '80.00',
-    createDate: '2026-07-25 13:00:00',
-  },
-  {
-    serialNo: 'FL20260725007',
-    orderNo: 'OD20260725007',
-    type: 1,
-    nickname: '赵六',
-    phone: '13800138000',
-    amount: '680.00',
-    createDate: '2026-07-25 10:00:00',
-  },
-];
-
-function inDateRange(date: string, begin?: string, end?: string): boolean {
-  if (!begin && !end) return true;
-  const d = date.slice(0, 10);
-  if (begin && d < begin) return false;
-  if (end && d > end) return false;
-  return true;
-}
-
-export function buildMockPaymentFlowPage(
-  page: number,
-  limit: number,
-  params: PaymentFlowQueryParams,
-): PaymentFlowPageData {
-  let filtered = [...MOCK_LIST];
-
-  if (params.nickname) {
-    filtered = filtered.filter((item) => item.nickname.includes(params.nickname!));
-  }
-  if (params.phone) {
-    filtered = filtered.filter((item) => item.phone.includes(params.phone!));
-  }
-  if (params.type) {
-    filtered = filtered.filter((item) => item.type === Number(params.type));
-  }
-  filtered = filtered.filter((item) =>
-    inDateRange(item.createDate, params.createDateBegin, params.createDateEnd),
-  );
-
-  let totalAmount = 0;
-  let totalRefundAmount = 0;
-  for (const item of filtered) {
-    const amt = Number(item.amount) || 0;
-    if (item.type === 1) totalAmount += amt;
-    else if (item.type === 2) totalRefundAmount += amt;
-  }
-
-  const total = filtered.length;
-  const start = (page - 1) * limit;
-  return {
-    total,
-    list: filtered.slice(start, start + limit),
-    exData: {
-      totalAmount: totalAmount.toFixed(2),
-      totalRefundAmount: totalRefundAmount.toFixed(2),
-    },
-  };
-}
diff --git a/src/config/mock/permissionTree.ts b/src/config/mock/permissionTree.ts
deleted file mode 100644
index d26d7b4..0000000
--- a/src/config/mock/permissionTree.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * 角色权限树假数据
- * 对应接口：GET /admin/sys/role/permissionList?roleId=xxx
- *
- * - 传 roleId=0 时返回全量未选中树（新增角色用）
- * - 传已有角色ID时返回带 selected 的树，模拟后端已有权限
- *
- * 结构对齐 PermissionTreeNode: { id, pid, name, selected, children }
- * selected 仅叶节点有值（true/false），父节点为 null
- */
-
-import type { PermissionTreeNode } from '@/api/roles';
-
-/**
- * 全量权限树（所有节点的 selected=null，叶节点 selected=false）
- * 作为未授权角色的默认返回
- */
-const FULL_UNSELECTED: PermissionTreeNode[] = [
-  {
-    id: 1,
-    pid: 0,
-    name: '赛事管理',
-    selected: null,
-    children: [
-      {
-        id: 11,
-        pid: 1,
-        name: '赛事列表',
-        selected: null,
-        children: [
-          { id: 101, pid: 11, name: '赛事列表-查看', selected: false },
-          { id: 102, pid: 11, name: '赛事列表-上架', selected: false },
-          { id: 103, pid: 11, name: '赛事列表-下架', selected: false },
-        ],
-      },
-      {
-        id: 12,
-        pid: 1,
-        name: '赛事规程',
-        selected: null,
-        children: [
-          { id: 104, pid: 12, name: '赛事规程-查看', selected: false },
-          { id: 105, pid: 12, name: '赛事规程-编辑', selected: false },
-        ],
-      },
-      {
-        id: 13,
-        pid: 1,
-        name: '订单管理',
-        selected: null,
-        children: [
-          { id: 106, pid: 13, name: '订单管理-查看', selected: false },
-          { id: 107, pid: 13, name: '订单管理-退款', selected: false },
-        ],
-      },
-      {
-        id: 14,
-        pid: 1,
-        name: '用户列表',
-        selected: null,
-        children: [{ id: 108, pid: 14, name: '用户列表-查看', selected: false }],
-      },
-      {
-        id: 15,
-        pid: 1,
-        name: 'Banner管理',
-        selected: null,
-        children: [
-          { id: 109, pid: 15, name: 'Banner-查看', selected: false },
-          { id: 110, pid: 15, name: 'Banner-新增', selected: false },
-          { id: 111, pid: 15, name: 'Banner-编辑', selected: false },
-          { id: 112, pid: 15, name: 'Banner-删除', selected: false },
-        ],
-      },
-      {
-        id: 16,
-        pid: 1,
-        name: '赛事审核',
-        selected: null,
-        children: [
-          { id: 113, pid: 16, name: '赛事审核-查看', selected: false },
-          { id: 114, pid: 16, name: '赛事审核-通过', selected: false },
-          { id: 115, pid: 16, name: '赛事审核-驳回', selected: false },
-        ],
-      },
-    ],
-  },
-  {
-    id: 2,
-    pid: 0,
-    name: '账务管理',
-    selected: null,
-    children: [
-      {
-        id: 21,
-        pid: 2,
-        name: '财务报表',
-        selected: null,
-        children: [{ id: 201, pid: 21, name: '财务报表-查看', selected: false }],
-      },
-      {
-        id: 22,
-        pid: 2,
-        name: '提现管理',
-        selected: null,
-        children: [
-          { id: 202, pid: 22, name: '提现管理-查看', selected: false },
-          { id: 203, pid: 22, name: '提现管理-审核', selected: false },
-        ],
-      },
-      {
-        id: 23,
-        pid: 2,
-        name: '支付流水',
-        selected: null,
-        children: [{ id: 204, pid: 23, name: '支付流水-查看', selected: false }],
-      },
-      {
-        id: 24,
-        pid: 2,
-        name: '钱包管理',
-        selected: null,
-        children: [{ id: 205, pid: 24, name: '钱包管理-查看', selected: false }],
-      },
-    ],
-  },
-  {
-    id: 3,
-    pid: 0,
-    name: '系统管理',
-    selected: null,
-    children: [
-      {
-        id: 31,
-        pid: 3,
-        name: '用户管理',
-        selected: null,
-        children: [
-          { id: 301, pid: 31, name: '用户管理-查看', selected: false },
-          { id: 302, pid: 31, name: '用户管理-新增', selected: false },
-          { id: 303, pid: 31, name: '用户管理-编辑', selected: false },
-          { id: 304, pid: 31, name: '用户管理-启用/禁用', selected: false },
-          { id: 305, pid: 31, name: '用户管理-重置密码', selected: false },
-        ],
-      },
-      {
-        id: 32,
-        pid: 3,
-        name: '角色权限',
-        selected: null,
-        children: [
-          { id: 306, pid: 32, name: '角色权限-查看', selected: false },
-          { id: 307, pid: 32, name: '角色权限-新增', selected: false },
-          { id: 308, pid: 32, name: '角色权限-编辑', selected: false },
-          { id: 309, pid: 32, name: '角色权限-删除', selected: false },
-        ],
-      },
-      {
-        id: 33,
-        pid: 3,
-        name: '操作日志',
-        selected: null,
-        children: [{ id: 310, pid: 33, name: '操作日志-查看', selected: false }],
-      },
-    ],
-  },
-];
-
-/**
- * 根据角色已有权限ID集合，深拷贝全量树并标记叶节点 selected
- */
-function applySelected(tree: PermissionTreeNode[], selectedIds: Set<number>): PermissionTreeNode[] {
-  return tree.map((node) => {
-    const isLeaf = !node.children || node.children.length === 0;
-    if (isLeaf) {
-      return { ...node, selected: selectedIds.has(node.id) };
-    }
-    // 父节点：递归处理子节点，自身 selected 保持 null
-    return {
-      ...node,
-      selected: null,
-      children: applySelected(node.children!, selectedIds),
-    };
-  });
-}
-
-/**
- * 构建权限树假数据
- * @param roleId 角色ID，0 表示新增（返回全量未选中），其他值模拟该角色已有权限
- */
-export function buildMockPermissionTree(roleId: number): PermissionTreeNode[] {
-  // roleId=0 → 新增角色，全量未选中
-  if (roleId === 0) {
-    return JSON.parse(JSON.stringify(FULL_UNSELECTED));
-  }
-
-  // 模拟不同角色拥有不同权限子集
-  const rolePermissions: Record<number, number[]> = {
-    // 超级管理员：全选（所有叶节点）
-    1: [
-      101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 201, 202, 203, 204,
-      205, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
-    ],
-    // 赛事管理员：只有赛事管理模块
-    2: [101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112],
-    // 财务：只有账务管理模块
-    4: [201, 202, 203, 204, 205],
-    // 其他角色默认仅查看权限
-  };
-
-  const selectedIds = new Set<number>(rolePermissions[roleId] || [101, 201, 301, 306, 310]);
-  return applySelected(FULL_UNSELECTED, selectedIds);
-}
diff --git a/src/config/mock/roleList.ts b/src/config/mock/roleList.ts
deleted file mode 100644
index 1a1ff28..0000000
--- a/src/config/mock/roleList.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * 角色列表页假数据（类型内联，避免循环引用）
- * 对应接口：GET /sys/role/page
- */
-
-interface MockRoleVO {
-  roleId: number;
-  roleName: string;
-  userCount: number;
-  createTime: string;
-}
-interface MockPageData<T> {
-  total: number;
-  list: T[];
-}
-
-const MOCK_ROLES: MockRoleVO[] = [
-  { roleId: 1, roleName: '超级管理员', userCount: 2, createTime: '2025-06-01 09:00:00' },
-  { roleId: 2, roleName: '赛事管理员', userCount: 5, createTime: '2025-08-15 14:30:00' },
-  { roleId: 3, roleName: '裁判', userCount: 8, createTime: '2025-10-10 10:15:00' },
-  { roleId: 4, roleName: '财务', userCount: 3, createTime: '2026-01-20 16:00:00' },
-  { roleId: 5, roleName: '运营管理员', userCount: 4, createTime: '2026-03-05 11:00:00' },
-  { roleId: 6, roleName: '客服', userCount: 6, createTime: '2026-04-10 08:30:00' },
-  { roleId: 7, roleName: '审核员', userCount: 3, createTime: '2026-05-18 13:45:00' },
-  { roleId: 8, roleName: '内容编辑', userCount: 2, createTime: '2026-06-22 09:20:00' },
-];
-
-export function buildMockRoleListPage(page: number, limit: number): MockPageData<MockRoleVO> {
-  const start = (page - 1) * limit;
-  return { total: MOCK_ROLES.length, list: MOCK_ROLES.slice(start, start + limit) };
-}
diff --git a/src/config/mock/roleUsageUser.ts b/src/config/mock/roleUsageUser.ts
deleted file mode 100644
index b7e0299..0000000
--- a/src/config/mock/roleUsageUser.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 角色下用户列表假数据
- * 对应接口：GET /sys/role/usageUserPage
- */
-
-interface MockUserVO {
-  realName: string;
-  phone: string;
-  createTime: string;
-  status: number;
-}
-interface MockPageData<T> {
-  total: number;
-  list: T[];
-}
-
-const MOCK_USERS: MockUserVO[] = [
-  { realName: '张超管', phone: '13900000001', createTime: '2025-06-01 09:00:00', status: 1 },
-  { realName: '李运营', phone: '15900000002', createTime: '2026-01-10 16:00:00', status: 0 },
-  { realName: '王运营', phone: '15900000001', createTime: '2025-10-20 10:00:00', status: 1 },
-  { realName: '张运营', phone: '13900000002', createTime: '2025-08-15 14:30:00', status: 1 },
-  { realName: '赵裁判', phone: '13800000005', createTime: '2025-10-10 10:15:00', status: 1 },
-  { realName: '钱裁判', phone: '13800000006', createTime: '2025-10-12 11:00:00', status: 1 },
-  { realName: '孙财务', phone: '13700000007', createTime: '2026-01-20 16:00:00', status: 1 },
-  { realName: '周客服', phone: '13700000008', createTime: '2026-01-21 09:30:00', status: 1 },
-  { realName: '吴客服', phone: '13700000009', createTime: '2026-01-22 10:00:00', status: 0 },
-  { realName: '郑客服', phone: '13700000010', createTime: '2026-01-23 14:00:00', status: 1 },
-];
-
-export function buildMockRoleUsageUserPage(page: number, limit: number): MockPageData<MockUserVO> {
-  const start = (page - 1) * limit;
-  return { total: MOCK_USERS.length, list: MOCK_USERS.slice(start, start + limit) };
-}
diff --git a/src/config/mock/userList.ts b/src/config/mock/userList.ts
deleted file mode 100644
index 57fb63b..0000000
--- a/src/config/mock/userList.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * 用户列表页假数据（类型内联，避免循环引用）
- * 对应接口：GET /sys/user/page
- */
-
-interface MockUserVO {
-  id: string;
-  realName: string;
-  phone: string;
-  roleId: string;
-  roleName: string;
-  status: string;
-  createTime: string;
-}
-interface MockPageData<T> {
-  total: number;
-  list: T[];
-}
-
-const MOCK_USERS: MockUserVO[] = [
-  {
-    id: '1',
-    realName: '张三',
-    phone: '13800138001',
-    roleId: '1',
-    roleName: '超级管理员',
-    status: '1',
-    createTime: '2026-07-20 08:11:07',
-  },
-  {
-    id: '2',
-    realName: '李四',
-    phone: '13900139002',
-    roleId: '2',
-    roleName: '赛事管理员',
-    status: '1',
-    createTime: '2026-07-19 11:28:20',
-  },
-  {
-    id: '3',
-    realName: '王五',
-    phone: '13700137003',
-    roleId: '3',
-    roleName: '裁判',
-    status: '1',
-    createTime: '2026-07-18 14:45:33',
-  },
-  {
-    id: '4',
-    realName: '赵六',
-    phone: '13600136004',
-    roleId: '2',
-    roleName: '赛事管理员',
-    status: '0',
-    createTime: '2026-07-17 18:02:46',
-  },
-  {
-    id: '5',
-    realName: '孙七',
-    phone: '13800138005',
-    roleId: '1',
-    roleName: '超级管理员',
-    status: '1',
-    createTime: '2026-07-16 21:19:59',
-  },
-  {
-    id: '6',
-    realName: '周八',
-    phone: '13900139006',
-    roleId: '3',
-    roleName: '裁判',
-    status: '1',
-    createTime: '2026-07-15 00:36:12',
-  },
-  {
-    id: '7',
-    realName: '吴九',
-    phone: '13700137007',
-    roleId: '2',
-    roleName: '赛事管理员',
-    status: '1',
-    createTime: '2026-07-14 03:53:25',
-  },
-  {
-    id: '8',
-    realName: '郑十',
-    phone: '13600136008',
-    roleId: '4',
-    roleName: '财务',
-    status: '1',
-    createTime: '2026-07-13 07:10:38',
-  },
-  {
-    id: '9',
-    realName: '陈一',
-    phone: '13800138009',
-    roleId: '3',
-    roleName: '裁判',
-    status: '1',
-    createTime: '2026-07-12 10:27:51',
-  },
-  {
-    id: '10',
-    realName: '刘二',
-    phone: '13900139010',
-    roleId: '2',
-    roleName: '赛事管理员',
-    status: '0',
-    createTime: '2026-07-11 13:44:04',
-  },
-  {
-    id: '11',
-    realName: '黄三',
-    phone: '13700137011',
-    roleId: '1',
-    roleName: '超级管理员',
-    status: '1',
-    createTime: '2026-07-10 17:01:17',
-  },
-  {
-    id: '12',
-    realName: '林四',
-    phone: '13600136012',
-    roleId: '4',
-    roleName: '财务',
-    status: '1',
-    createTime: '2026-07-09 20:18:30',
-  },
-];
-
-export function buildMockUserListPage(page: number, limit: number): MockPageData<MockUserVO> {
-  const start = (page - 1) * limit;
-  return { total: MOCK_USERS.length, list: MOCK_USERS.slice(start, start + limit) };
-}
diff --git a/src/config/mock/walletList.ts b/src/config/mock/walletList.ts
deleted file mode 100644
index c7b4a5a..0000000
--- a/src/config/mock/walletList.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * 钱包列表假数据
- * 对应接口：GET /admin/finance/wallet/summary
- */
-import type { WalletSummaryVO, WalletQueryParams, WalletSummaryPageData } from '@/api/wallet';
-
-const MOCK_LIST: WalletSummaryVO[] = [
-  {
-    userId: 1001,
-    userNickname: '张三',
-    phone: '12345678997',
-    amount: '0.00',
-    frozenAmount: '0.00',
-    withdrawalAmount: '0.00',
-  },
-  {
-    userId: 1002,
-    userNickname: '李四',
-    phone: '12345678998',
-    amount: '350.00',
-    frozenAmount: '200.00',
-    withdrawalAmount: '1450.00',
-  },
-  {
-    userId: 1003,
-    userNickname: '王五',
-    phone: '12345678999',
-    amount: '1280.00',
-    frozenAmount: '0.00',
-    withdrawalAmount: '800.00',
-  },
-  {
-    userId: 1004,
-    userNickname: '赵六',
-    phone: '13800138000',
-    amount: '560.00',
-    frozenAmount: '100.00',
-    withdrawalAmount: '200.00',
-  },
-  {
-    userId: 1005,
-    userNickname: '钱七',
-    phone: '13900139001',
-    amount: '4200.00',
-    frozenAmount: '1500.00',
-    withdrawalAmount: '5600.00',
-  },
-  {
-    userId: 1006,
-    userNickname: '孙八',
-    phone: '12345678997',
-    amount: '880.00',
-    frozenAmount: '0.00',
-    withdrawalAmount: '300.00',
-  },
-  {
-    userId: 1007,
-    userNickname: '周九',
-    phone: '17000170001',
-    amount: '2100.00',
-    frozenAmount: '800.00',
-    withdrawalAmount: '3200.00',
-  },
-  {
-    userId: 1008,
-    userNickname: '吴十',
-    phone: '18900189000',
-    amount: '650.00',
-    frozenAmount: '0.00',
-    withdrawalAmount: '450.00',
-  },
-  {
-    userId: 1009,
-    userNickname: '郑十一',
-    phone: '15200152000',
-    amount: '980.00',
-    frozenAmount: '200.00',
-    withdrawalAmount: '1200.00',
-  },
-  {
-    userId: 1010,
-    userNickname: '冯十二',
-    phone: '18600186001',
-    amount: '320.00',
-    frozenAmount: '50.00',
-    withdrawalAmount: '100.00',
-  },
-  {
-    userId: 1011,
-    userNickname: '褚十三',
-    phone: '13500135000',
-    amount: '5800.00',
-    frozenAmount: '0.00',
-    withdrawalAmount: '2000.00',
-  },
-  {
-    userId: 1012,
-    userNickname: '卫十四',
-    phone: '13700137000',
-    amount: '75.00',
-    frozenAmount: '0.00',
-    withdrawalAmount: '75.00',
-  },
-];
-
-function computeExData(list: WalletSummaryVO[]) {
-  const totalAmount = list.reduce((s, i) => s + Number(i.amount || 0), 0).toFixed(2);
-  const totalFrozenAmount = list.reduce((s, i) => s + Number(i.frozenAmount || 0), 0).toFixed(2);
-  const totalWithdrawalAmount = list
-    .reduce((s, i) => s + Number(i.withdrawalAmount || 0), 0)
-    .toFixed(2);
-  return { totalAmount, totalFrozenAmount, totalWithdrawalAmount };
-}
-
-export function buildMockWalletPage(
-  page: number,
-  limit: number,
-  params: WalletQueryParams,
-): WalletSummaryPageData {
-  let filtered = [...MOCK_LIST];
-
-  if (params.nickname) {
-    filtered = filtered.filter((item) => item.userNickname.includes(params.nickname!));
-  }
-  if (params.phone) {
-    filtered = filtered.filter((item) => item.phone.includes(params.phone!));
-  }
-  if (params.amountBegin) {
-    filtered = filtered.filter((item) => Number(item.amount) >= Number(params.amountBegin));
-  }
-  if (params.amountEnd) {
-    filtered = filtered.filter((item) => Number(item.amount) <= Number(params.amountEnd));
-  }
-
-  const total = filtered.length;
-  const start = (page - 1) * limit;
-
-  return {
-    total,
-    list: filtered.slice(start, start + limit),
-    exData: computeExData(filtered),
-  };
-}
diff --git a/src/config/mock/walletTransactions.ts b/src/config/mock/walletTransactions.ts
deleted file mode 100644
index e597b1b..0000000
--- a/src/config/mock/walletTransactions.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * 钱包交易明细假数据
- * 对应接口：GET /admin/finance/wallet/page
- *
- * type: 1=报名入账, 2=提现出账, 3=退款出账
- * status(由 freezeAmount/freezeTime 推导): 1=已解冻, 2=冻结中, 3=正常
- */
-import type { WalletTransactionVO, WalletTransactionQueryParams, PageData } from '@/api/wallet';
-
-const MOCK_TRANSACTIONS: (WalletTransactionVO & { status: number })[] = [
-  {
-    type: 1,
-    amount: '+100.00',
-    afterAmount: '600.00',
-    withdrawAmount: '500.00',
-    freezeAmount: '100.00',
-    status: 1,
-    freezeTime: '2026-06-10 08:00',
-    unfreezeTime: '2026-06-12 08:00',
-    orderNo: 'SN20260610001',
-    createDate: '2026-06-10 08:00',
-  },
-  {
-    type: 2,
-    amount: '-500.00',
-    afterAmount: '1100.00',
-    withdrawAmount: '500.00',
-    freezeAmount: '600.00',
-    status: 2,
-    freezeTime: '2026-06-10 06:00',
-    unfreezeTime: '',
-    orderNo: 'SN20260610002',
-    createDate: '2026-06-10 06:00',
-  },
-  {
-    type: 3,
-    amount: '-100.00',
-    afterAmount: '500.00',
-    withdrawAmount: '500.00',
-    freezeAmount: '0.00',
-    status: 3,
-    freezeTime: '',
-    unfreezeTime: '',
-    orderNo: 'SN20260610003',
-    createDate: '2026-06-10 05:00',
-  },
-  {
-    type: 1,
-    amount: '+350.00',
-    afterAmount: '850.00',
-    withdrawAmount: '750.00',
-    freezeAmount: '100.00',
-    status: 3,
-    freezeTime: '',
-    unfreezeTime: '',
-    orderNo: 'SN20260609001',
-    createDate: '2026-06-09 17:30',
-  },
-  {
-    type: 2,
-    amount: '-250.00',
-    afterAmount: '600.00',
-    withdrawAmount: '500.00',
-    freezeAmount: '100.00',
-    status: 1,
-    freezeTime: '2026-06-08 10:00',
-    unfreezeTime: '2026-06-09 08:00',
-    orderNo: 'SN20260608001',
-    createDate: '2026-06-08 10:00',
-  },
-  {
-    type: 1,
-    amount: '+800.00',
-    afterAmount: '2000.00',
-    withdrawAmount: '1800.00',
-    freezeAmount: '200.00',
-    status: 3,
-    freezeTime: '',
-    unfreezeTime: '',
-    orderNo: 'SN20260607001',
-    createDate: '2026-06-07 14:00',
-  },
-  {
-    type: 2,
-    amount: '-300.00',
-    afterAmount: '1200.00',
-    withdrawAmount: '1000.00',
-    freezeAmount: '200.00',
-    status: 2,
-    freezeTime: '2026-06-06 09:00',
-    unfreezeTime: '',
-    orderNo: 'SN20260606001',
-    createDate: '2026-06-06 09:00',
-  },
-  {
-    type: 3,
-    amount: '-50.00',
-    afterAmount: '1500.00',
-    withdrawAmount: '1300.00',
-    freezeAmount: '200.00',
-    status: 1,
-    freezeTime: '2026-06-05 10:00',
-    unfreezeTime: '2026-06-07 10:00',
-    orderNo: 'SN20260605001',
-    createDate: '2026-06-05 10:00',
-  },
-  {
-    type: 1,
-    amount: '+200.00',
-    afterAmount: '1550.00',
-    withdrawAmount: '1350.00',
-    freezeAmount: '200.00',
-    status: 3,
-    freezeTime: '',
-    unfreezeTime: '',
-    orderNo: 'SN20260604001',
-    createDate: '2026-06-04 08:30',
-  },
-  {
-    type: 2,
-    amount: '-600.00',
-    afterAmount: '950.00',
-    withdrawAmount: '750.00',
-    freezeAmount: '200.00',
-    status: 1,
-    freezeTime: '2026-06-03 16:00',
-    unfreezeTime: '2026-06-05 16:00',
-    orderNo: 'SN20260603001',
-    createDate: '2026-06-03 16:00',
-  },
-  {
-    type: 1,
-    amount: '+450.00',
-    afterAmount: '1050.00',
-    withdrawAmount: '850.00',
-    freezeAmount: '200.00',
-    status: 1,
-    freezeTime: '2026-06-02 11:00',
-    unfreezeTime: '2026-06-04 11:00',
-    orderNo: 'SN20260602001',
-    createDate: '2026-06-02 11:00',
-  },
-  {
-    type: 3,
-    amount: '-120.00',
-    afterAmount: '600.00',
-    withdrawAmount: '400.00',
-    freezeAmount: '200.00',
-    status: 3,
-    freezeTime: '',
-    unfreezeTime: '',
-    orderNo: 'SN20260601001',
-    createDate: '2026-06-01 15:00',
-  },
-];
-
-function inDateRange(date: string, begin?: string, end?: string): boolean {
-  if (!begin && !end) return true;
-  const d = date.slice(0, 10);
-  if (begin && d < begin) return false;
-  if (end && d > end) return false;
-  return true;
-}
-
-export function buildMockWalletTransactionPage(
-  page: number,
-  limit: number,
-  params: WalletTransactionQueryParams,
-): PageData<WalletTransactionVO> {
-  let filtered = [...MOCK_TRANSACTIONS];
-
-  if (params.type) {
-    filtered = filtered.filter((item) => item.type === Number(params.type));
-  }
-  if (params.status) {
-    filtered = filtered.filter((item) => item.status === Number(params.status));
-  }
-  filtered = filtered.filter((item) =>
-    inDateRange(item.createDate, params.createDateBegin, params.createDateEnd),
-  );
-
-  const total = filtered.length;
-  const start = (page - 1) * limit;
-  const list = filtered.slice(start, start + limit).map(({ status, ...rest }) => rest);
-
-  return { total, list };
-}
diff --git a/src/config/mock/withdrawInfo.ts b/src/config/mock/withdrawInfo.ts
deleted file mode 100644
index feb23e4..0000000
--- a/src/config/mock/withdrawInfo.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * 提现详情假数据
- * 对应接口：GET /admin/finance/withdraw/info?id=xxx
- *
- * 字段对齐 TournamentFinanceWithdrawInfoVO。
- */
-import type { WithdrawInfoVO } from '@/api/withdraw';
-
-/** 银行卡类型映射 */
-const BANK_CARD_TYPE_MAP: Record<number, string> = { 1: '个人' };
-
-const MOCK_DETAILS: Record<number, WithdrawInfoVO> = {
-  1: {
-    nickname: '可乐',
-    phone: '17762466262',
-    realName: '可乐',
-    createDate: '2026-07-30 09:53:00',
-    withdrawType: '银行卡',
-    withdrawAmount: '1000.00',
-    feeRate: '0.006',
-    feeAmount: '6.00',
-    receivedAmount: '994.00',
-    auditStatus: 0,
-    payStatus: 0,
-    bankCardType: 1,
-    cardHolderName: '龚',
-    bankCardNumber: '6215581807006475126',
-    bankName: '交通银行',
-    branchName: '交通银行宜昌西坝支行',
-    payTime: '',
-    orderNo: 'WD04111775872421935100',
-    auditDate: '',
-    auditNickname: '',
-    auditImg: '',
-    auditImgList: [],
-  },
-  2: {
-    nickname: '李四',
-    phone: '12345678998',
-    realName: '李四',
-    createDate: '2026-07-29 14:30:00',
-    withdrawType: '银行卡',
-    withdrawAmount: '200.00',
-    feeRate: '0.006',
-    feeAmount: '1.20',
-    receivedAmount: '198.80',
-    auditStatus: 1,
-    payStatus: 1,
-    bankCardType: 1,
-    cardHolderName: '李四',
-    bankCardNumber: '6222021234567890123',
-    bankName: '工商银行',
-    branchName: '工商银行北京中关村支行',
-    payTime: '2026-07-29 14:35:00',
-    orderNo: 'SN20260729001',
-    auditDate: '2026-07-29 14:32:00',
-    auditNickname: '管理员A',
-    auditImg: '',
-    auditImgList: [
-      'https://via.placeholder.com/200x200?text=Audit1',
-      'https://via.placeholder.com/200x200?text=Audit2',
-    ],
-  },
-  3: {
-    nickname: '王五',
-    phone: '13800138000',
-    realName: '王五',
-    createDate: '2026-07-28 11:15:00',
-    withdrawType: '银行卡',
-    withdrawAmount: '500.00',
-    feeRate: '0.006',
-    feeAmount: '3.00',
-    receivedAmount: '497.00',
-    auditStatus: 1,
-    payStatus: 2,
-    bankCardType: 1,
-    cardHolderName: '王五',
-    bankCardNumber: '微信钱包',
-    bankName: '微信支付',
-    branchName: '-',
-    payTime: '',
-    orderNo: 'SN20260728002',
-    auditDate: '2026-07-28 11:20:00',
-    auditNickname: '管理员B',
-    auditImg: '',
-    auditImgList: [],
-  },
-  4: {
-    nickname: '赵六',
-    phone: '13900139001',
-    realName: '赵六',
-    createDate: '2026-07-27 09:45:00',
-    withdrawType: '银行卡',
-    withdrawAmount: '80.00',
-    feeRate: '0.006',
-    feeAmount: '0.48',
-    receivedAmount: '79.52',
-    auditStatus: 2,
-    payStatus: 0,
-    bankCardType: 1,
-    cardHolderName: '赵六',
-    bankCardNumber: '6217858000123456789',
-    bankName: '建设银行',
-    branchName: '建设银行上海陆家嘴支行',
-    payTime: '',
-    orderNo: '',
-    auditDate: '2026-07-27 10:00:00',
-    auditNickname: '管理��A',
-    auditImg: '',
-    auditImgList: ['https://via.placeholder.com/200x200?text=Reject'],
-  },
-  5: {
-    nickname: '孙七',
-    phone: '18600186001',
-    realName: '孙七',
-    createDate: '2026-07-26 16:00:00',
-    withdrawType: '银行卡',
-    withdrawAmount: '3000.00',
-    feeRate: '0.006',
-    feeAmount: '18.00',
-    receivedAmount: '2982.00',
-    auditStatus: 0,
-    payStatus: 0,
-    bankCardType: 1,
-    cardHolderName: '孙七',
-    bankCardNumber: '6228480012345678910',
-    bankName: '农业银行',
-    branchName: '农业银行深圳福田支行',
-    payTime: '',
-    orderNo: 'WD05261775872421935200',
-    auditDate: '',
-    auditNickname: '',
-    auditImg: '',
-    auditImgList: [],
-  },
-};
-
-export function buildMockWithdrawInfo(id: number): WithdrawInfoVO {
-  const detail = MOCK_DETAILS[id];
-  if (detail) return { ...detail };
-
-  // 找不到对应 ID 时返回一个默认详情（基于 ID 4 的结构）
-  return {
-    ...MOCK_DETAILS[4],
-    nickname: `用户${id}`,
-    phone: `1380000${String(id).padStart(4, '0')}`,
-    realName: `用户${id}`,
-    createDate: '2026-07-27 09:45:00',
-  };
-}
diff --git a/src/config/mock/withdrawList.ts b/src/config/mock/withdrawList.ts
deleted file mode 100644
index aa1c268..0000000
--- a/src/config/mock/withdrawList.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * 提现列表假数据
- * 对应接口：GET /admin/finance/withdraw/page
- *
- * 前端筛选 + 分页，模拟后端行为。
- */
-import type { WithdrawVO, WithdrawQueryParams, PageData } from '@/api/withdraw';
-
-const MOCK_LIST: WithdrawVO[] = [
-  {
-    id: 1,
-    nickname: '可乐',
-    phone: '17762466262',
-    realName: '可乐',
-    withdrawType: '银行卡',
-    withdrawAmount: '1000.00',
-    receivedAmount: '994.00',
-    auditStatus: 0,
-    payStatus: 0,
-    serialNumber: '',
-    createDate: '2026-07-30 09:53:00',
-  },
-  {
-    id: 2,
-    nickname: '李四',
-    phone: '12345678998',
-    realName: '李四',
-    withdrawType: '银行卡',
-    withdrawAmount: '200.00',
-    receivedAmount: '198.80',
-    auditStatus: 1,
-    payStatus: 1,
-    serialNumber: 'SN20260729001',
-    createDate: '2026-07-29 14:30:00',
-  },
-  {
-    id: 3,
-    nickname: '王五',
-    phone: '13800138000',
-    realName: '王五',
-    withdrawType: '银行卡',
-    withdrawAmount: '500.00',
-    receivedAmount: '497.00',
-    auditStatus: 1,
-    payStatus: 2,
-    serialNumber: 'SN20260728002',
-    createDate: '2026-07-28 11:15:00',
-  },
-  {
-    id: 4,
-    nickname: '赵六',
-    phone: '13900139001',
-    realName: '赵六',
-    withdrawType: '银行卡',
-    withdrawAmount: '80.00',
-    receivedAmount: '79.52',
-    auditStatus: 2,
-    payStatus: 0,
-    serialNumber: '',
-    createDate: '2026-07-27 09:45:00',
-  },
-  {
-    id: 5,
-    nickname: '孙七',
-    phone: '18600186001',
-    realName: '孙七',
-    withdrawType: '银行卡',
-    withdrawAmount: '3000.00',
-    receivedAmount: '2982.00',
-    auditStatus: 0,
-    payStatus: 0,
-    serialNumber: '',
-    createDate: '2026-07-26 16:00:00',
-  },
-  {
-    id: 6,
-    nickname: '周八',
-    phone: '15200152000',
-    realName: '周八',
-    withdrawType: '银行卡',
-    withdrawAmount: '150.00',
-    receivedAmount: '149.10',
-    auditStatus: 1,
-    payStatus: 1,
-    serialNumber: 'SN20260725003',
-    createDate: '2026-07-25 10:20:00',
-  },
-  {
-    id: 7,
-    nickname: '吴九',
-    phone: '17000170001',
-    realName: '吴九',
-    withdrawType: '银行卡',
-    withdrawAmount: '600.00',
-    receivedAmount: '596.40',
-    auditStatus: 2,
-    payStatus: 0,
-    serialNumber: '',
-    createDate: '2026-07-24 08:30:00',
-  },
-  {
-    id: 8,
-    nickname: '郑十',
-    phone: '18900189000',
-    realName: '郑十',
-    withdrawType: '银行卡',
-    withdrawAmount: '2200.00',
-    receivedAmount: '2186.80',
-    auditStatus: 0,
-    payStatus: 0,
-    serialNumber: '',
-    createDate: '2026-07-23 13:10:00',
-  },
-  {
-    id: 9,
-    nickname: '可乐',
-    phone: '17762466262',
-    realName: '可乐',
-    withdrawType: '银行卡',
-    withdrawAmount: '450.00',
-    receivedAmount: '447.30',
-    auditStatus: 1,
-    payStatus: 2,
-    serialNumber: 'SN20260722004',
-    createDate: '2026-07-22 15:45:00',
-  },
-  {
-    id: 10,
-    nickname: '李四',
-    phone: '12345678998',
-    realName: '李四',
-    withdrawType: '银行卡',
-    withdrawAmount: '1800.00',
-    receivedAmount: '1789.20',
-    auditStatus: 0,
-    payStatus: 0,
-    serialNumber: '',
-    createDate: '2026-07-21 09:00:00',
-  },
-  {
-    id: 11,
-    nickname: '王五',
-    phone: '13800138000',
-    realName: '王五',
-    withdrawType: '银行卡',
-    withdrawAmount: '320.00',
-    receivedAmount: '318.08',
-    auditStatus: 1,
-    payStatus: 1,
-    serialNumber: 'SN20260720005',
-    createDate: '2026-07-20 17:30:00',
-  },
-  {
-    id: 12,
-    nickname: '孙七',
-    phone: '18600186001',
-    realName: '孙七',
-    withdrawType: '银行卡',
-    withdrawAmount: '750.00',
-    receivedAmount: '745.50',
-    auditStatus: 2,
-    payStatus: 0,
-    serialNumber: '',
-    createDate: '2026-07-19 11:00:00',
-  },
-];
-
-export function buildMockWithdrawPage(
-  page: number,
-  limit: number,
-  params: WithdrawQueryParams,
-): PageData<WithdrawVO> {
-  let filtered = [...MOCK_LIST];
-
-  if (params.nickname) {
-    filtered = filtered.filter((item) => item.nickname.includes(params.nickname!));
-  }
-  if (params.phone) {
-    filtered = filtered.filter((item) => item.phone.includes(params.phone!));
-  }
-  if (params.realName) {
-    filtered = filtered.filter((item) => item.realName.includes(params.realName!));
-  }
-  if (params.auditStatus) {
-    filtered = filtered.filter((item) => item.auditStatus === Number(params.auditStatus));
-  }
-  if (params.payStatus) {
-    filtered = filtered.filter((item) => item.payStatus === Number(params.payStatus));
-  }
-
-  const total = filtered.length;
-  const start = (page - 1) * limit;
-  return { total, list: filtered.slice(start, start + limit) };
-}
diff --git a/src/pages/events/banner/model/services.ts b/src/pages/events/banner/model/services.ts
index e496ef6..0c3f54d 100644
--- a/src/pages/events/banner/model/services.ts
+++ b/src/pages/events/banner/model/services.ts
@@ -3,8 +3,6 @@
  * 该页面使用的所有接口集中管理
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { MOCK_BANNER_LIST } from '@/config/mock/bannerList';
 import type {
   BannerListQueryParams,
   BannerSaveParams,
@@ -32,8 +30,6 @@ const bannerSave = '/admin/manager/banner/save';
 const bannerUpdate = '/admin/manager/banner/update';
 const bannerActive = '/admin/manager/banner/active';
 
-const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
-
 // ============================================================
 // API 函数
 // ============================================================
@@ -42,10 +38,6 @@ const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve,
 export async function getBannerList(
   params: BannerListQueryParams,
 ): Promise<ApiResult<TournamentAdminBannerListVO[]>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    return { code: 200, msg: 'success', data: MOCK_BANNER_LIST };
-  }
   return get(bannerList, params as Record<string, any>);
 }
 
diff --git a/src/pages/events/orders/model/services.ts b/src/pages/events/orders/model/services.ts
index 1f341b2..8ec7837 100644
--- a/src/pages/events/orders/model/services.ts
+++ b/src/pages/events/orders/model/services.ts
@@ -3,10 +3,6 @@
  * 该页面使用的所有接口集中管理
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockOrderListPage } from '@/config/mock/orderList';
-import { MOCK_ORDER_DETAIL } from '@/config/mock/orderDetail';
-import { buildMockOrderPlayerListPage } from '@/config/mock/orderPlayerList';
 import type {
   OrderListQueryParams,
   OrderDetailQueryParams,
@@ -40,8 +36,6 @@ const orderDetail = '/admin/manager/order/info';
 const orderPlayerList = '/admin/manager/order/info/userPage';
 const retryRefund = '/admin/manager/order/retryRefund';
 
-const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
-
 // ============================================================
 // API 函数
 // ============================================================
@@ -50,16 +44,6 @@ const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve,
 export async function getOrderList(
   params: OrderListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminOrderPageVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return {
-      code: 200,
-      msg: 'success',
-      data: buildMockOrderListPage(page, limit),
-    };
-  }
   return get(orderList, params as Record<string, any>);
 }
 
@@ -67,14 +51,6 @@ export async function getOrderList(
 export async function getOrderDetail(
   params: OrderDetailQueryParams,
 ): Promise<ApiResult<TournamentAdminOrderInfoVO>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    return {
-      code: 200,
-      msg: 'success',
-      data: { ...MOCK_ORDER_DETAIL },
-    };
-  }
   return get(orderDetail, params as Record<string, any>);
 }
 
@@ -82,16 +58,6 @@ export async function getOrderDetail(
 export async function getOrderPlayerList(
   params: OrderPlayerListQueryParams,
 ): Promise<ApiResult<PageData<TournamentAdminOrderInfoPageVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return {
-      code: 200,
-      msg: 'success',
-      data: buildMockOrderPlayerListPage(page, limit),
-    };
-  }
   return get(orderPlayerList, params as Record<string, any>);
 }
 
diff --git a/src/pages/events/users/model/services.ts b/src/pages/events/users/model/services.ts
index 366864b..838c4ba 100644
--- a/src/pages/events/users/model/services.ts
+++ b/src/pages/events/users/model/services.ts
@@ -3,7 +3,6 @@
  * 接口文档: GET /admin/manager/user/page
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
 import type {
   UserSaveParams,
   UserUpdateParams,
@@ -61,8 +60,6 @@ const userUpdate = '/admin/sys/user/update';
 const userActive = '/admin/manager/user/active';
 const userUpdatePwd = '/admin/sys/user/updatepwd';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 // ============================================================
 // API 函数
 // ============================================================
@@ -76,13 +73,11 @@ export function getUserList(
 
 /** 新增用户 */
 export function saveUser(params: UserSaveParams): Promise<ApiResult<Record<string, never>>> {
-  if (USE_MOCK) return delay(MOCK_DELAY).then(() => ({ code: 200, msg: 'success', data: {} }));
   return post(userSave, params);
 }
 
 /** 更新用户 */
 export function updateUser(params: UserUpdateParams): Promise<ApiResult<Record<string, never>>> {
-  if (USE_MOCK) return delay(MOCK_DELAY).then(() => ({ code: 200, msg: 'success', data: {} }));
   return post(userUpdate, params);
 }
 
diff --git a/src/pages/finance/payments/model/services.ts b/src/pages/finance/payments/model/services.ts
index 905aae6..1469b8e 100644
--- a/src/pages/finance/payments/model/services.ts
+++ b/src/pages/finance/payments/model/services.ts
@@ -3,8 +3,6 @@
  * 该页面使用的所有接口集中管理
  */
 import { get } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockPaymentFlowPage } from '@/config/mock/paymentFlow';
 import type {
   PaymentFlowQueryParams,
   PaymentFlowVO,
@@ -25,8 +23,6 @@ export type {
 // ============================================================
 const paymentFlowList = '/admin/finance/paymentFlow/page';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 // ============================================================
 // API 函数
 // ============================================================
@@ -35,11 +31,5 @@ const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 export async function getPaymentFlowList(
   params: PaymentFlowQueryParams,
 ): Promise<ApiResult<PaymentFlowPageData>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockPaymentFlowPage(page, limit, params) };
-  }
   return get(paymentFlowList, params as Record<string, any>);
 }
diff --git a/src/pages/finance/wallet/model/services.ts b/src/pages/finance/wallet/model/services.ts
index 13d90bd..47551ba 100644
--- a/src/pages/finance/wallet/model/services.ts
+++ b/src/pages/finance/wallet/model/services.ts
@@ -3,9 +3,6 @@
  * 该页面使用的所有接口集中管理
  */
 import { get } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockWalletPage } from '@/config/mock/walletList';
-import { buildMockWalletTransactionPage } from '@/config/mock/walletTransactions';
 import type {
   WalletQueryParams,
   WalletSummaryVO,
@@ -32,8 +29,6 @@ export type {
 const walletList = '/admin/finance/wallet/summary';
 const walletTransaction = '/admin/finance/wallet/page';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 // ============================================================
 // API 函数
 // ============================================================
@@ -42,12 +37,6 @@ const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 export async function getWalletList(
   params: WalletQueryParams,
 ): Promise<ApiResult<WalletSummaryPageData>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockWalletPage(page, limit, params) };
-  }
   return get(walletList, params as Record<string, any>);
 }
 
@@ -55,11 +44,5 @@ export async function getWalletList(
 export async function getWalletTransactionList(
   params: WalletTransactionQueryParams,
 ): Promise<ApiResult<PageData<WalletTransactionVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return { code: 200, msg: 'success', data: buildMockWalletTransactionPage(page, limit, params) };
-  }
   return get(walletTransaction, params as Record<string, any>);
 }
diff --git a/src/pages/finance/withdraw/model/services.ts b/src/pages/finance/withdraw/model/services.ts
index d09f3c5..bb2d6d7 100644
--- a/src/pages/finance/withdraw/model/services.ts
+++ b/src/pages/finance/withdraw/model/services.ts
@@ -3,9 +3,6 @@
  * 该页面使用的所有接口集中管理
  */
 import { get, post } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockWithdrawPage } from '@/config/mock/withdrawList';
-import { buildMockWithdrawInfo } from '@/config/mock/withdrawInfo';
 import type {
   WithdrawQueryParams,
   WithdrawVO,
@@ -29,8 +26,6 @@ const withdrawList = '/admin/finance/withdraw/page';
 const withdrawInfo = '/admin/finance/withdraw/info';
 const withdrawAudit = '/admin/finance/withdraw/audit';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 // ============================================================
 // API 函数
 // ============================================================
@@ -39,25 +34,11 @@ const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 export async function getWithdrawList(
   params: WithdrawQueryParams,
 ): Promise<ApiResult<PageData<WithdrawVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return {
-      code: 200,
-      msg: 'success',
-      data: buildMockWithdrawPage(page, limit, params),
-    };
-  }
   return get(withdrawList, params as Record<string, any>);
 }
 
 /** 提现详情 */
 export async function getWithdrawInfo(id: number): Promise<ApiResult<WithdrawInfoVO>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    return { code: 200, msg: 'success', data: buildMockWithdrawInfo(id) };
-  }
   return get(withdrawInfo, { id: String(id) });
 }
 
diff --git a/src/pages/system/logs/model/services.ts b/src/pages/system/logs/model/services.ts
index bcdf9d3..d343d63 100644
--- a/src/pages/system/logs/model/services.ts
+++ b/src/pages/system/logs/model/services.ts
@@ -3,8 +3,6 @@
  * 该页面使用的所有接口集中管理
  */
 import { get } from '@/utils/request';
-import { USE_MOCK, MOCK_DELAY } from '@/config/mock';
-import { buildMockOperationLogPage } from '@/config/mock/operationLogs';
 import type {
   OperationLogQueryParams,
   SysOperationLogVO,
@@ -24,30 +22,13 @@ export type {
 // ============================================================
 const operationLogList = '/admin/sys/operation/page';
 
-const delay = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
-
 // ============================================================
 // API 函数
 // ============================================================
 
-function pickFilters(params: OperationLogQueryParams): OperationLogQueryParams {
-  const { page: _page, limit: _limit, ...filters } = params;
-  return filters;
-}
-
 /** 系统操作日志分页 */
 export async function getOperationLogList(
   params: OperationLogQueryParams,
 ): Promise<ApiResult<PageData<SysOperationLogVO>>> {
-  if (USE_MOCK) {
-    await delay(MOCK_DELAY);
-    const page = Number(params.page) || 1;
-    const limit = Number(params.limit) || 10;
-    return {
-      code: 200,
-      msg: 'success',
-      data: buildMockOperationLogPage(page, limit, pickFilters(params)),
-    };
-  }
   return get(operationLogList, params as Record<string, any>);
 }
-- 
2.52.0


From 8c7e8f807cff79b21dce9309fe1f85ba7a9e8be6 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 09:23:18 +0800
Subject: [PATCH 17/25] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../banner/components/BannerFormModal.tsx     | 113 +++++------------
 src/pages/events/banner/model/form.ts         | 114 ++++++++++++++++++
 .../list/components/EventAuditModal.tsx       |  15 ++-
 src/pages/events/list/model/form.ts           |  32 +++++
 src/pages/events/logs/model/useLogColumns.ts  |  22 ++--
 .../components/WithdrawDetailModal.tsx        |  46 +++----
 src/pages/finance/withdraw/model/form.ts      |  84 +++++++++++++
 src/pages/login/index.tsx                     |   8 +-
 src/pages/login/model/form.ts                 |  16 +++
 src/utils/form.ts                             |  11 ++
 10 files changed, 326 insertions(+), 135 deletions(-)
 create mode 100644 src/pages/events/banner/model/form.ts
 create mode 100644 src/pages/events/list/model/form.ts
 create mode 100644 src/pages/finance/withdraw/model/form.ts
 create mode 100644 src/pages/login/model/form.ts

diff --git a/src/pages/events/banner/components/BannerFormModal.tsx b/src/pages/events/banner/components/BannerFormModal.tsx
index c4806c8..a52ca84 100644
--- a/src/pages/events/banner/components/BannerFormModal.tsx
+++ b/src/pages/events/banner/components/BannerFormModal.tsx
@@ -13,10 +13,25 @@ import {
   Spin,
 } from 'ant-design-vue';
 import { JUMP_TYPE_OPTIONS } from '../model/useBannerModel';
+import {
+  TITLE_MAX,
+  PATH_MAX,
+  URL_MAX,
+  titleRules,
+  imageUrlRules,
+  typeRules,
+  linkUrlRules,
+  miniProgramPathRules,
+  areaRules,
+  startTimeRules,
+  endTimeRules,
+  sortRules,
+} from '../model/form';
 import { getProvinceCityCascaderOptions, cityNameToCascaderPath } from '@/utils/areaData';
 import { ImageCropper } from '@yp-component/root';
 import { FileImageOutlined } from '@ant-design/icons-vue';
 import { uploadFile, OssUploadType } from '@/utils/oss';
+import { isImageFile } from '@/utils/form';
 import { getEventList, getEventDetail, type TournamentAdminVO } from '../../list/model/services';
 import dayjs from 'dayjs';
 import styles from './BannerFormModal.module.less';
@@ -40,11 +55,6 @@ const getDefaultForm = () => ({
   sort: 1,
 });
 
-/** 表单字段最大长度限制 */
-const TITLE_MAX = 50;
-const PATH_MAX = 200;
-const URL_MAX = 500;
-
 /** 图片上传限制：最大 10MB */
 const IMAGE_MAX_SIZE = 10 * 1024 * 1024;
 
@@ -351,7 +361,7 @@ export default defineComponent({
       target.value = '';
 
       if (!file) return;
-      if (!/^image\//.test(file.type)) {
+      if (!isImageFile(file)) {
         message.error('请选择图片文件');
         return;
       }
@@ -468,14 +478,7 @@ export default defineComponent({
                 requiredMark
               >
                 {/* ===== Banner 标题 ===== */}
-                <Form.Item
-                  label="Banner标题"
-                  name="title"
-                  rules={[
-                    { required: true, message: '请输入' },
-                    { max: TITLE_MAX, message: `标题最多 ${TITLE_MAX} 个字符` },
-                  ]}
-                >
+                <Form.Item label="Banner标题" name="title" rules={titleRules}>
                   <Input
                     placeholder="请输入标题"
                     maxlength={TITLE_MAX}
@@ -488,23 +491,10 @@ export default defineComponent({
                 <Form.Item
                   label="上传图片"
                   name="imageUrl"
-                  rules={[
-                    { required: true, message: '请上传 Banner 图片' },
-                    {
-                      validator: async () => {
-                        if (formData.imageStatus === 'uploading') {
-                          return Promise.reject(new Error('图片仍在上传中，请稍候'));
-                        }
-                        if (
-                          formData.imageUrl?.startsWith('blob:') ||
-                          formData.imageUrl?.startsWith('data:')
-                        ) {
-                          return Promise.reject(new Error('请等待图片上传完成'));
-                        }
-                        return Promise.resolve();
-                      },
-                    },
-                  ]}
+                  rules={imageUrlRules(
+                    () => formData.imageStatus,
+                    () => formData.imageUrl,
+                  )}
                 >
                   <div class={styles.uploader}>
                     <input
@@ -549,11 +539,7 @@ export default defineComponent({
                 </Form.Item>
 
                 {/* ===== 跳转类型 ===== */}
-                <Form.Item
-                  label="跳转类型"
-                  name="type"
-                  rules={[{ required: true, message: '请选择跳转类型' }]}
-                >
+                <Form.Item label="跳转类型" name="type" rules={typeRules}>
                   <Select
                     options={JUMP_TYPE_OPTIONS as any}
                     placeholder="请选择"
@@ -584,14 +570,7 @@ export default defineComponent({
 
                 {/* ===== 联动字段：自定义链接 ===== */}
                 {formData.type === '2' && (
-                  <Form.Item
-                    label="跳转地址"
-                    name="linkUrl"
-                    rules={[
-                      { required: true, message: '请输入跳转地址' },
-                      { max: URL_MAX, message: `链接最多 ${URL_MAX} 个字符` },
-                    ]}
-                  >
+                  <Form.Item label="跳转地址" name="linkUrl" rules={linkUrlRules}>
                     <Input
                       placeholder="https://xxx"
                       maxlength={URL_MAX}
@@ -603,14 +582,7 @@ export default defineComponent({
 
                 {/* ===== 联动字段：小程序页面 ===== */}
                 {formData.type === '3' && (
-                  <Form.Item
-                    label="小程序路径"
-                    name="linkUrl"
-                    rules={[
-                      { required: true, message: '请输入小程序页面路径' },
-                      { max: PATH_MAX, message: `路径最多 ${PATH_MAX} 个字符` },
-                    ]}
-                  >
+                  <Form.Item label="小程序路径" name="linkUrl" rules={miniProgramPathRules}>
                     <Input
                       placeholder="/pages/index/index"
                       maxlength={PATH_MAX}
@@ -621,11 +593,7 @@ export default defineComponent({
                 )}
 
                 {/* ===== 所属区域（省市树种选择 + 全国） ===== */}
-                <Form.Item
-                  label="所属区域"
-                  name="area"
-                  rules={[{ required: true, message: '请选择所属区域' }]}
-                >
+                <Form.Item label="所属区域" name="area" rules={areaRules}>
                   <Cascader
                     v-model:value={areaPath.value}
                     options={areaCascaderOptions}
@@ -641,16 +609,7 @@ export default defineComponent({
                     label="开始时间"
                     name="displayStartTime"
                     class={styles.timeItem}
-                    rules={[
-                      {
-                        validator: async () => {
-                          if (!formData.displayTimeRange?.[0]) {
-                            return Promise.reject(new Error('请选择开始时间'));
-                          }
-                          return Promise.resolve();
-                        },
-                      },
-                    ]}
+                    rules={startTimeRules(() => formData.displayTimeRange)}
                   >
                     <DatePicker
                       showTime
@@ -679,16 +638,7 @@ export default defineComponent({
                     label="结束时间"
                     name="displayEndTime"
                     class={styles.timeItem}
-                    rules={[
-                      {
-                        validator: async () => {
-                          if (!formData.displayTimeRange?.[1]) {
-                            return Promise.reject(new Error('请选择结束时间'));
-                          }
-                          return Promise.resolve();
-                        },
-                      },
-                    ]}
+                    rules={endTimeRules(() => formData.displayTimeRange)}
                   >
                     <DatePicker
                       showTime
@@ -715,14 +665,7 @@ export default defineComponent({
                 </div>
 
                 {/* ===== 排序 ===== */}
-                <Form.Item
-                  label="排序"
-                  name="sort"
-                  rules={[
-                    { required: true, message: '请输入排序' },
-                    { type: 'number', min: 1, max: 999, message: '排序范围 1-999' },
-                  ]}
-                >
+                <Form.Item label="排序" name="sort" rules={sortRules}>
                   <InputNumber
                     placeholder="数字越小越靠前"
                     min={1}
diff --git a/src/pages/events/banner/model/form.ts b/src/pages/events/banner/model/form.ts
new file mode 100644
index 0000000..49b808e
--- /dev/null
+++ b/src/pages/events/banner/model/form.ts
@@ -0,0 +1,114 @@
+/**
+ * Banner 表单域控制器
+ *
+ * 集中管理 Banner 新增/编辑弹窗的所有表单规则校验与常量。
+ * 各规则数组 / 工厂函数可直接传给 antd Form.Item 的 rules prop。
+ */
+import type { Rule } from 'ant-design-vue/es/form';
+
+// ============================================================
+// 常量
+// ============================================================
+
+/** 标题最大长度 */
+export const TITLE_MAX = 50;
+/** 小程序路径最大长度 */
+export const PATH_MAX = 200;
+/** 跳转链接最大长度 */
+export const URL_MAX = 500;
+
+// ============================================================
+// 表单规则
+// ============================================================
+
+/** Banner 标题：必填 + 50 字符上限 */
+export const titleRules: Rule[] = [
+  { required: true, message: '请输入' },
+  { max: TITLE_MAX, message: `标题最多 ${TITLE_MAX} 个字符` },
+];
+
+/**
+ * Banner 图片：必填 + 上传状态校验
+ *
+ * @param getImageStatus 获取当前上传状态的 getter
+ * @param getImageUrl    获取当前图片 URL 的 getter
+ */
+export function imageUrlRules(getImageStatus: () => string, getImageUrl: () => string): Rule[] {
+  return [
+    { required: true, message: '请上传 Banner 图片' },
+    {
+      validator: async () => {
+        if (getImageStatus() === 'uploading') {
+          return Promise.reject(new Error('图片仍在上传中，请稍候'));
+        }
+        const url = getImageUrl();
+        if (url.startsWith('blob:') || url.startsWith('data:')) {
+          return Promise.reject(new Error('请等待图片上传完成'));
+        }
+        return Promise.resolve();
+      },
+    },
+  ];
+}
+
+/** 跳转类型：必选 */
+export const typeRules: Rule[] = [{ required: true, message: '请选择跳转类型' }];
+
+/** 跳转地址（自定义链接 scene=2）：必填 + 最大长度 */
+export const linkUrlRules: Rule[] = [
+  { required: true, message: '请输入跳转地址' },
+  { max: URL_MAX, message: `链接最多 ${URL_MAX} 个字符` },
+];
+
+/** 小程序页面路径（scene=3）：必填 + 最大长度 */
+export const miniProgramPathRules: Rule[] = [
+  { required: true, message: '请输入小程序页面路径' },
+  { max: PATH_MAX, message: `路径最多 ${PATH_MAX} 个字符` },
+];
+
+/** 所属区域：必选 */
+export const areaRules: Rule[] = [{ required: true, message: '请选择所属区域' }];
+
+/** 排序：必填 + 1-999 整数 */
+export const sortRules: Rule[] = [
+  { required: true, message: '请输入排序' },
+  { type: 'number', min: 1, max: 999, message: '排序范围 1-999' },
+];
+
+/**
+ * 展示开始时间规则：校验 displayTimeRange[0] 非空
+ *
+ * @param getDisplayTimeRange 获取展示时间范围的 getter
+ */
+export function startTimeRules(getDisplayTimeRange: () => [string, string] | null): Rule[] {
+  return [
+    {
+      validator: async () => {
+        const range = getDisplayTimeRange();
+        if (!range?.[0]) {
+          return Promise.reject(new Error('请选择开始时间'));
+        }
+        return Promise.resolve();
+      },
+    },
+  ];
+}
+
+/**
+ * 展示结束时间规则：校验 displayTimeRange[1] 非空
+ *
+ * @param getDisplayTimeRange 获取展示时间范围的 getter
+ */
+export function endTimeRules(getDisplayTimeRange: () => [string, string] | null): Rule[] {
+  return [
+    {
+      validator: async () => {
+        const range = getDisplayTimeRange();
+        if (!range?.[1]) {
+          return Promise.reject(new Error('请选择结束时间'));
+        }
+        return Promise.resolve();
+      },
+    },
+  ];
+}
diff --git a/src/pages/events/list/components/EventAuditModal.tsx b/src/pages/events/list/components/EventAuditModal.tsx
index 0803e0e..4670538 100644
--- a/src/pages/events/list/components/EventAuditModal.tsx
+++ b/src/pages/events/list/components/EventAuditModal.tsx
@@ -1,5 +1,6 @@
 import { defineComponent, reactive } from 'vue';
-import { Modal, Descriptions, Image, Radio, Input, Form } from 'ant-design-vue';
+import { Modal, Descriptions, Image, Radio, Input, Form, message } from 'ant-design-vue';
+import { validateEventAuditSubmit } from '../model/form';
 import styles from './EventAuditModal.module.less';
 
 const { TextArea } = Input;
@@ -58,11 +59,13 @@ export default defineComponent({
     });
 
     const handleOk = () => {
-      if (!auditForm.comment.trim()) {
-        // 不通过时强制要求填写审核内容
-        if (!auditForm.approved) {
-          // 这里交给校验,简化版本不做强制校验
-        }
+      const check = validateEventAuditSubmit({
+        approved: auditForm.approved,
+        comment: auditForm.comment,
+      });
+      if (!check.valid) {
+        message.warning(check.error!);
+        return;
       }
       if (props.onSubmit) {
         props.onSubmit({ approved: auditForm.approved, comment: auditForm.comment });
diff --git a/src/pages/events/list/model/form.ts b/src/pages/events/list/model/form.ts
new file mode 100644
index 0000000..a6933d6
--- /dev/null
+++ b/src/pages/events/list/model/form.ts
@@ -0,0 +1,32 @@
+/**
+ * 赛事审核 - 表单域控制器
+ *
+ * 集中管理赛事审核弹窗的提交校验逻辑。
+ */
+
+// ============================================================
+// 提交校验
+// ============================================================
+
+export interface EventAuditForm {
+  approved: boolean;
+  comment: string;
+}
+
+export interface EventAuditSubmitCheckResult {
+  valid: boolean;
+  error?: string;
+}
+
+/**
+ * 校验赛事审核提交数据
+ *
+ * @param form 审核表单 { approved, comment }
+ */
+export function validateEventAuditSubmit(form: EventAuditForm): EventAuditSubmitCheckResult {
+  // 不通过时强制要求填写审核内容
+  if (!form.approved && !form.comment.trim()) {
+    return { valid: false, error: '审核不通过时请填写审核内容' };
+  }
+  return { valid: true };
+}
diff --git a/src/pages/events/logs/model/useLogColumns.ts b/src/pages/events/logs/model/useLogColumns.ts
index 2c033e3..c0a982d 100644
--- a/src/pages/events/logs/model/useLogColumns.ts
+++ b/src/pages/events/logs/model/useLogColumns.ts
@@ -50,24 +50,24 @@ export function useLogColumns() {
       width: 200,
       align: 'center' as const,
     },
-    {
-      title: '操作对象',
-      dataIndex: 'obj',
-      key: 'obj',
-      width: 240,
-      align: 'center' as const,
-    },
+    // {
+    //   title: '操作对象',
+    //   dataIndex: 'obj',
+    //   key: 'obj',
+    //   width: 240,
+    //   align: 'center' as const,
+    // },
     {
       title: '操作内容',
-      dataIndex: 'content',
-      key: 'content',
+      dataIndex: 'obj',
+      key: 'obj',
       width: 360,
       align: 'center' as const,
     },
     {
       title: '操作时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
+      dataIndex: 'createTime',
+      key: 'createTime',
       width: 170,
       align: 'center' as const,
     },
diff --git a/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx b/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
index 221dbc9..7565a18 100644
--- a/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
+++ b/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
@@ -6,11 +6,15 @@ import { PlusOutlined } from '@ant-design/icons-vue';
 import { uploadFile, OssUploadType } from '@/utils/oss';
 import { getWithdrawInfo, postWithdrawAudit, type WithdrawInfoVO } from '../model/services';
 import { getAuditStatusText, getPayStatusText } from '../model/useWithdrawModel';
+import {
+  MAX_IMAGE_COUNT,
+  MAX_IMAGE_SIZE,
+  validateImageFile,
+  validateWithdrawAuditSubmit,
+} from '../model/form';
 import styles from './WithdrawDetailModal.module.less';
 
 const { TextArea } = Input;
-const MAX_IMAGE_COUNT = 3;
-const MAX_IMAGE_SIZE = 5 * 1024 * 1024;
 
 interface WithdrawDetailModalProps {
   visible: boolean;
@@ -67,16 +71,9 @@ export default defineComponent({
     const beforeUpload = async (file: UploadFile) => {
       const rawFile = file as unknown as File;
 
-      if (imageList.value.length >= MAX_IMAGE_COUNT) {
-        message.warning(`最多上传 ${MAX_IMAGE_COUNT} 张图片`);
-        return false;
-      }
-      if (!/^image\//.test(rawFile.type)) {
-        message.error('请选择图片文件');
-        return false;
-      }
-      if (rawFile.size >= MAX_IMAGE_SIZE) {
-        message.error('图片大小不能超过 5MB');
+      const check = validateImageFile(rawFile, imageList.value.length);
+      if (!check.valid) {
+        message.error(check.error!);
         return false;
       }
 
@@ -114,21 +111,16 @@ export default defineComponent({
 
     // ===== 提交审核 =====
     const handleSubmit = async () => {
-      // 驳回：审核内容必填
-      if (!auditForm.pass && !auditForm.remark.trim()) {
-        message.warning('驳回时请填写审核内容');
-        return;
-      }
-      // 通过：必须上传图片
-      if (auditForm.pass) {
-        const hasDoneImage = imageList.value.some((item) => item.status === 'done' && item.url);
-        if (!hasDoneImage) {
-          message.warning('审核通过时必须上传审核图片');
-          return;
-        }
-      }
-      if (imageList.value.some((item) => item.status === 'uploading')) {
-        message.warning('图片仍在上传中，请稍候');
+      // 提交前校验
+      const hasDoneImage = imageList.value.some((item) => item.status === 'done' && item.url);
+      const isUploading = imageList.value.some((item) => item.status === 'uploading');
+      const check = validateWithdrawAuditSubmit(
+        { pass: auditForm.pass, remark: auditForm.remark },
+        hasDoneImage,
+        isUploading,
+      );
+      if (!check.valid) {
+        message.warning(check.error!);
         return;
       }
 
diff --git a/src/pages/finance/withdraw/model/form.ts b/src/pages/finance/withdraw/model/form.ts
new file mode 100644
index 0000000..c4217cc
--- /dev/null
+++ b/src/pages/finance/withdraw/model/form.ts
@@ -0,0 +1,84 @@
+/**
+ * 提现审核 - 表单域控制器
+ *
+ * 集中管理提现审核弹窗的图片上传校验、提交校验逻辑与常量。
+ */
+import { isImageFile } from '@/utils/form';
+
+// ============================================================
+// 常量
+// ============================================================
+
+/** 审核图片最大上传张数 */
+export const MAX_IMAGE_COUNT = 3;
+/** 审核图片单张最大体积：5MB */
+export const MAX_IMAGE_SIZE = 5 * 1024 * 1024;
+
+// ============================================================
+// 图片上传校验
+// ============================================================
+
+export interface ImageUploadCheckResult {
+  valid: boolean;
+  error?: string;
+}
+
+/**
+ * 校验待上传的审核图片
+ * @param file       待上传的文件对象
+ * @param currentCount 当前已上传的图片数量
+ * @returns 校验结果
+ */
+export function validateImageFile(file: File, currentCount: number): ImageUploadCheckResult {
+  if (currentCount >= MAX_IMAGE_COUNT) {
+    return { valid: false, error: `最多上传 ${MAX_IMAGE_COUNT} 张图片` };
+  }
+  if (!isImageFile(file)) {
+    return { valid: false, error: '请选择图片文件' };
+  }
+  if (file.size >= MAX_IMAGE_SIZE) {
+    return { valid: false, error: '图片大小不能超过 5MB' };
+  }
+  return { valid: true };
+}
+
+// ============================================================
+// 提交审核校验
+// ============================================================
+
+export interface WithdrawAuditForm {
+  pass: boolean;
+  remark: string;
+}
+
+export interface WithdrawAuditSubmitCheckResult {
+  valid: boolean;
+  error?: string;
+}
+
+/**
+ * 校验提现审核提交数据
+ *
+ * @param form        审核表单 { pass, remark }
+ * @param hasDoneImage 是否有上传成功的图片
+ * @param isUploading 是否有图片仍在上传中
+ */
+export function validateWithdrawAuditSubmit(
+  form: WithdrawAuditForm,
+  hasDoneImage: boolean,
+  isUploading: boolean,
+): WithdrawAuditSubmitCheckResult {
+  // 驳回：审核内容必填
+  if (!form.pass && !form.remark.trim()) {
+    return { valid: false, error: '驳回时请填写审核内容' };
+  }
+  // 通过：必须上传图片
+  if (form.pass && !hasDoneImage) {
+    return { valid: false, error: '审核通过时必须上传审核图片' };
+  }
+  // 图片上传未完成
+  if (isUploading) {
+    return { valid: false, error: '图片仍在上传中，请稍候' };
+  }
+  return { valid: true };
+}
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 8f1059c..dce1405 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -6,6 +6,7 @@ import { auth } from '@/hooks/useAuth';
 import { useEffect, useState } from '@/hooks';
 import { useUserStore } from '@/stores/userStore';
 import { login as loginApi } from '@/api/login';
+import { loginFormRules } from './model/form';
 import styles from './index.module.less';
 
 interface LoginForm {
@@ -40,11 +41,6 @@ export default defineComponent({
       }
     }, []);
 
-    const rules = {
-      username: [{ required: true, message: '请输入用户名' }],
-      password: [{ required: true, message: '请输入密码' }],
-    };
-
     const handleSubmit = async () => {
       if (!form.phone || !form.password) {
         message.warning('请输入用户名和密码');
@@ -214,7 +210,7 @@ export default defineComponent({
             <Form
               class={styles.loginForm}
               model={form}
-              rules={rules}
+              rules={loginFormRules}
               layout="vertical"
               onFinish={handleSubmit}
             >
diff --git a/src/pages/login/model/form.ts b/src/pages/login/model/form.ts
new file mode 100644
index 0000000..56350c3
--- /dev/null
+++ b/src/pages/login/model/form.ts
@@ -0,0 +1,16 @@
+/**
+ * 登录页 - 表单域控制器
+ *
+ * 集中管理登录表单的校验规则。
+ */
+import type { Rule } from 'ant-design-vue/es/form';
+
+// ============================================================
+// 表单规则
+// ============================================================
+
+/** 登录表单的整体规则（form-level rules，key 对应 FormItem 的 name） */
+export const loginFormRules: Record<string, Rule[]> = {
+  phone: [{ required: true, message: '请输入用户名' }],
+  password: [{ required: true, message: '请输入密码' }],
+};
diff --git a/src/utils/form.ts b/src/utils/form.ts
index 27b11ea..e2c0996 100644
--- a/src/utils/form.ts
+++ b/src/utils/form.ts
@@ -27,6 +27,12 @@ export const LOGIN_PASSWORD_REGEX = /^(?=.*[A-Za-z])(?=.*\d)[\w!@#$%^&*()_+\-=]{
  */
 export const REAL_NAME_REGEX = /^[\u4e00-\u9fa5A-Za-z0-9·]{1,8}$/;
 
+/**
+ * 图片 MIME 类型前缀
+ * - 用于上传前校验文件是否为图片
+ */
+export const IMAGE_TYPE_REGEX = /^image\//;
+
 // ============================================================
 // 校验函数
 // ============================================================
@@ -45,3 +51,8 @@ export function isValidPassword(value: unknown): boolean {
 export function isValidRealName(value: unknown): boolean {
   return typeof value === 'string' && value.length > 0 && REAL_NAME_REGEX.test(value);
 }
+
+/** 校验文件是否为图片类型 */
+export function isImageFile(file: { type: string }): boolean {
+  return IMAGE_TYPE_REGEX.test(file.type);
+}
-- 
2.52.0


From 7f16ccdb306da79e960f5f9494c434d792e33394 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 09:54:11 +0800
Subject: [PATCH 18/25] =?UTF-8?q?fix:=20=E8=B5=9B=E4=BA=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/events/types.ts                       |   2 +-
 .../list/components/EventAuditModal.tsx       | 233 ++++++++++--------
 .../components/EventDetailModal.module.less   |  10 +
 .../list/components/EventDetailModal.tsx      |  13 +-
 4 files changed, 158 insertions(+), 100 deletions(-)

diff --git a/src/api/events/types.ts b/src/api/events/types.ts
index b68276b..c2c53a6 100644
--- a/src/api/events/types.ts
+++ b/src/api/events/types.ts
@@ -143,7 +143,7 @@ export interface TournamentAdminInfoVO {
   /** 退赛人数 */
   dropoutCount: string;
   /** 允许报名最大人数 */
-  dtotalLimit: string;
+  totalLimit: string;
   /** 总对阵数 */
   matchTotalCount: string;
   /** 已完成对阵数 */
diff --git a/src/pages/events/list/components/EventAuditModal.tsx b/src/pages/events/list/components/EventAuditModal.tsx
index 4670538..4b3a46a 100644
--- a/src/pages/events/list/components/EventAuditModal.tsx
+++ b/src/pages/events/list/components/EventAuditModal.tsx
@@ -1,5 +1,7 @@
-import { defineComponent, reactive } from 'vue';
-import { Modal, Descriptions, Image, Radio, Input, Form, message } from 'ant-design-vue';
+import { defineComponent, reactive, ref } from 'vue';
+import { Modal, Descriptions, Image, Radio, Input, Form, Spin, message } from 'ant-design-vue';
+import { useEffect, useState } from '@/hooks';
+import { getEventDetail, type TournamentAdminInfoVO } from '../model/services';
 import { validateEventAuditSubmit } from '../model/form';
 import styles from './EventAuditModal.module.less';
 
@@ -12,31 +14,6 @@ interface EventAuditModalProps {
   onSubmit?: (payload: { approved: boolean; comment: string }) => void;
 }
 
-// ===== Mock 数据 =====
-const MOCK_DETAIL = {
-  name: '第二届全国地学羽毛球邀请赛',
-  eventTime: '2026.05.26 08:00 ~ 2026.05.31 22:00',
-  descr:
-    '赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍赛事介绍。',
-  registerTime: '2026.05.24 08:00 ~ 2026.05.26 22:00',
-  cancelDeadline: '2026.05.25 22:00',
-  region: '北京市 北京市 东城区',
-  address: '李宁体育馆',
-  venueNo: '李宁体育馆',
-  publicEvent: '在首页展示赛事',
-  needIdCard: '无需提供',
-  needIdCardImage: '无需提供',
-  createTime: '2026.05.26 08:00',
-  creator: '张三',
-  status: '待审核',
-  enrolledCount: 100,
-  cancelledCount: 1,
-  maxCount: 1000,
-  crossedCount: 50,
-  completedCount: 50,
-  cover: 'https://picsum.photos/seed/eventcover/600/300',
-};
-
 /**
  * 赛事审核弹窗
  * 包含：基础信息 + 封面 + 审核操作（通过/未通过 + 审核内容）
@@ -50,7 +27,8 @@ export default defineComponent({
     onSubmit: { type: Function, default: undefined },
   },
   setup(props: EventAuditModalProps) {
-    const detail = MOCK_DETAIL;
+    const detail = ref<TournamentAdminInfoVO | null>(null);
+    const [loading, setLoading] = useState(false);
 
     // 审核表单
     const auditForm = reactive({
@@ -58,6 +36,33 @@ export default defineComponent({
       comment: '',
     });
 
+    /** 加载赛事详情 */
+    const fetchDetail = async (id: string) => {
+      setLoading(true);
+      detail.value = null;
+      try {
+        const res = await getEventDetail(id);
+        if (res.code == 200) {
+          detail.value = res.data;
+        } else {
+          message.error(res.msg || '获取赛事详情失败');
+        }
+      } catch {
+        // 网络层已统一提示
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    /** 弹窗打开时重新拉取详情 */
+    useEffect(() => {
+      if (props.visible && props.record?.id) {
+        auditForm.approved = true;
+        auditForm.comment = '';
+        fetchDetail(props.record.id);
+      }
+    }, [() => props.visible]);
+
     const handleOk = () => {
       const check = validateEventAuditSubmit({
         approved: auditForm.approved,
@@ -72,6 +77,104 @@ export default defineComponent({
       }
     };
 
+    /** 格式化时间范围 */
+    const formatRange = (start: string, end: string) => {
+      if (!start && !end) return '-';
+      return `${start || '?'} ~ ${end || '?'}`;
+    };
+
+    /** 渲染 0/1 开关文本 */
+    const boolText = (val: string, trueText: string, falseText: string) => {
+      return val === '1' ? trueText : falseText;
+    };
+
+    /** 渲染详情内容 */
+    const renderContent = () => {
+      const d = detail.value!;
+
+      return (
+        <>
+          {/* ===== 基础信息 ===== */}
+          <div class={styles.section}>
+            <div class={styles.sectionTitle}>基础信息</div>
+            <Descriptions size="small" bordered column={3} class={styles.desc}>
+              <Descriptions.Item label="赛事名称">{d.name || '-'}</Descriptions.Item>
+              <Descriptions.Item label="赛事时间" span={2}>
+                {formatRange(d.startTimeBegin, d.startTimeEnd)}
+              </Descriptions.Item>
+
+              <Descriptions.Item label="赛事说明" span={3}>
+                {d.descr || '-'}
+              </Descriptions.Item>
+
+              <Descriptions.Item label="报名起止时间">
+                {formatRange(d.signupTimeBegin, d.signupTimeEnd)}
+              </Descriptions.Item>
+              <Descriptions.Item label="取消报名截止时间" span={2}>
+                {d.signupTimeEnd || '-'}
+              </Descriptions.Item>
+
+              <Descriptions.Item label="省市区">{d.venueArea || '-'}</Descriptions.Item>
+              <Descriptions.Item label="地点">{d.venue || '-'}</Descriptions.Item>
+              <Descriptions.Item label="场地编号">{d.venueNo || '-'}</Descriptions.Item>
+
+              <Descriptions.Item label="公开活动">
+                {boolText(d.isPublic, '在首页展示赛事', '非公开')}
+              </Descriptions.Item>
+              <Descriptions.Item label="证件号">
+                {boolText(d.isRequireIdCardNo, '需要提供', '无需提供')}
+              </Descriptions.Item>
+              <Descriptions.Item label="证件图片">
+                {boolText(d.isRequireIdCardImg, '需要提供', '无需提供')}
+              </Descriptions.Item>
+
+              <Descriptions.Item label="创建时间">{d.createTime || '-'}</Descriptions.Item>
+              <Descriptions.Item label="创建人">{d.createNickname || '-'}</Descriptions.Item>
+              <Descriptions.Item label="状态">待审核</Descriptions.Item>
+              <Descriptions.Item label="报名人数">{d.signupCount || '0'}</Descriptions.Item>
+              <Descriptions.Item label="取消报名人数" span={1}>
+                {d.dropoutCount || '0'}
+              </Descriptions.Item>
+
+              <Descriptions.Item label="最大人数">{d.dtotalLimit || '-'}</Descriptions.Item>
+              <Descriptions.Item label="对岸数量">{d.matchTotalCount || '0'}</Descriptions.Item>
+              <Descriptions.Item label="已完成对岸数量">{d.matchCount || '0'}</Descriptions.Item>
+            </Descriptions>
+          </div>
+
+          {/* ===== 封面 ===== */}
+          <div class={styles.section}>
+            <div class={styles.sectionTitle}>封面</div>
+            {d.img ? <Image src={d.img} /> : <span style={{ color: '#999' }}>暂无封面</span>}
+          </div>
+
+          {/* ===== 审核操作 ===== */}
+          <div class={styles.auditSection}>
+            <div class={styles.auditHeader}>
+              <span class={styles.auditTitle}>审核操作</span>
+            </div>
+            <Form layout="horizontal" class={styles.auditForm}>
+              <Form.Item label="审核状态" class={styles.auditField}>
+                <Radio.Group v-model={auditForm.approved}>
+                  <Radio value={true}>通过</Radio>
+                  <Radio value={false}>未通过</Radio>
+                </Radio.Group>
+              </Form.Item>
+              <Form.Item label="审核内容" class={styles.auditField}>
+                <TextArea
+                  v-model={auditForm.comment}
+                  placeholder="请输入审核内容"
+                  rows={4}
+                  maxlength={500}
+                  showCount
+                />
+              </Form.Item>
+            </Form>
+          </div>
+        </>
+      );
+    };
+
     return () => (
       <Modal
         visible={props.visible}
@@ -85,75 +188,13 @@ export default defineComponent({
         destroyOnClose
         wrapClassName={styles.eventAuditModalMain}
       >
-        {/* ===== 基础信息 ===== */}
-        <div class={styles.section}>
-          <div class={styles.sectionTitle}>基础信息</div>
-          <Descriptions size="small" bordered column={3} class={styles.desc}>
-            <Descriptions.Item label="赛事名称">{detail.name}</Descriptions.Item>
-            <Descriptions.Item label="赛事时间" span={2}>
-              {detail.eventTime}
-            </Descriptions.Item>
-
-            <Descriptions.Item label="赛事说明" span={3}>
-              {detail.descr}
-            </Descriptions.Item>
-
-            <Descriptions.Item label="报名起止时间">{detail.registerTime}</Descriptions.Item>
-            <Descriptions.Item label="取消报名截止时间" span={2}>
-              {detail.cancelDeadline}
-            </Descriptions.Item>
-
-            <Descriptions.Item label="省市区">{detail.region}</Descriptions.Item>
-            <Descriptions.Item label="地点">{detail.address}</Descriptions.Item>
-            <Descriptions.Item label="场地编号">{detail.venueNo}</Descriptions.Item>
-
-            <Descriptions.Item label="公开活动">{detail.publicEvent}</Descriptions.Item>
-            <Descriptions.Item label="证件号">{detail.needIdCard}</Descriptions.Item>
-            <Descriptions.Item label="证件图片">{detail.needIdCardImage}</Descriptions.Item>
-
-            <Descriptions.Item label="创建时间">{detail.createTime}</Descriptions.Item>
-            <Descriptions.Item label="创建人">{detail.creator}</Descriptions.Item>
-            <Descriptions.Item label="状态">{detail.status}</Descriptions.Item>
-            <Descriptions.Item label="报名人数">{detail.enrolledCount}</Descriptions.Item>
-            <Descriptions.Item label="取消报名人数" span={1}>
-              {detail.cancelledCount}
-            </Descriptions.Item>
-
-            <Descriptions.Item label="最大人数">{detail.maxCount}</Descriptions.Item>
-            <Descriptions.Item label="对岸数量">{detail.crossedCount}</Descriptions.Item>
-            <Descriptions.Item label="已完成对岸数量">{detail.completedCount}</Descriptions.Item>
-          </Descriptions>
-        </div>
-
-        {/* ===== 封面 ===== */}
-        <div class={styles.section}>
-          <div class={styles.sectionTitle}>封面</div>
-          <Image src={detail.cover} />
-        </div>
-
-        {/* ===== 审核操作 ===== */}
-        <div class={styles.auditSection}>
-          <div class={styles.auditHeader}>
-            <span class={styles.auditTitle}>审核操作</span>
+        {loading.value ? (
+          <div style={{ textAlign: 'center', padding: '80px 0' }}>
+            <Spin size="large" />
           </div>
-          <Form layout="horizontal" class={styles.auditForm}>
-            <Form.Item label="审核状态" class={styles.auditField}>
-              <Radio.Group v-model={auditForm.approved}>
-                <Radio value={true}>通过</Radio>
-                <Radio value={false}>未通过</Radio>
-              </Radio.Group>
-            </Form.Item>
-            <Form.Item label="审核内容" class={styles.auditField}>
-              <TextArea
-                v-model={auditForm.comment}
-                placeholder="请输入审核内容"
-                rows={4}
-                maxlength={500}
-                showCount
-              />
-            </Form.Item>
-          </Form>
-        </div>
+        ) : detail.value ? (
+          renderContent()
+        ) : null}
       </Modal>
     );
   },
diff --git a/src/pages/events/list/components/EventDetailModal.module.less b/src/pages/events/list/components/EventDetailModal.module.less
index 60753f1..61044c5 100644
--- a/src/pages/events/list/components/EventDetailModal.module.less
+++ b/src/pages/events/list/components/EventDetailModal.module.less
@@ -34,6 +34,16 @@
     }
   }
 
+  // Item 的 class 会同时挂在 label/content 两个同级 td/th 上，不能用后代选择器
+  .statCell:global(.ant-descriptions-item-content) {
+    min-width: 60px;
+  }
+
+  .statCellNoWrap:global(.ant-descriptions-item-label),
+  .statCellNoWrap:global(.ant-descriptions-item-content) {
+    white-space: nowrap;
+  }
+
   .group {
     margin-bottom: 16px;
 
diff --git a/src/pages/events/list/components/EventDetailModal.tsx b/src/pages/events/list/components/EventDetailModal.tsx
index 2b35d24..69f18a2 100644
--- a/src/pages/events/list/components/EventDetailModal.tsx
+++ b/src/pages/events/list/components/EventDetailModal.tsx
@@ -192,7 +192,9 @@ export default defineComponent({
 
                 <Descriptions.Item label="省市区">{detail.value.venueArea}</Descriptions.Item>
                 <Descriptions.Item label="地点">{detail.value.venue}</Descriptions.Item>
-                <Descriptions.Item label="场地编号">{detail.value.venueNo}</Descriptions.Item>
+                <Descriptions.Item label="场地编号" class={styles.statCell}>
+                  {detail.value.venueNo || '-'}
+                </Descriptions.Item>
 
                 <Descriptions.Item label="公开活动">
                   {formatPublic(detail.value.isPublic)}
@@ -200,7 +202,7 @@ export default defineComponent({
                 <Descriptions.Item label="证件号">
                   {formatYN(detail.value.isRequireIdCardNo)}
                 </Descriptions.Item>
-                <Descriptions.Item label="证件图片">
+                <Descriptions.Item label="证件图片" class={styles.statCell}>
                   {formatYN(detail.value.isRequireIdCardImg)}
                 </Descriptions.Item>
 
@@ -211,7 +213,12 @@ export default defineComponent({
 
                 <Descriptions.Item label="报名人数">{detail.value.signupCount}</Descriptions.Item>
                 <Descriptions.Item label="退赛人数">{detail.value.dropoutCount}</Descriptions.Item>
-                <Descriptions.Item label="最大人数">{detail.value.dtotalLimit}</Descriptions.Item>
+                <Descriptions.Item
+                  label="最大人数"
+                  class={[styles.statCell, styles.statCellNoWrap]}
+                >
+                  {detail.value.totalLimit || '-'}
+                </Descriptions.Item>
 
                 <Descriptions.Item label="总对阵数">
                   {detail.value.matchTotalCount}
-- 
2.52.0


From 0a60cc1816a6fe96299fa6f88af8773cffc4f68e Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 10:12:58 +0800
Subject: [PATCH 19/25] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=BF=85=E8=A6=81=E7=9A=84v-model=E3=80=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E5=8F=8C=E5=90=91=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChangePasswordModal/index.tsx  | 12 ++------
 .../banner/components/BannerFormModal.tsx     | 29 +++----------------
 .../list/components/EventAuditModal.tsx       |  2 +-
 src/pages/finance/payments/index.tsx          |  2 --
 src/pages/finance/wallet/index.tsx            |  2 --
 src/pages/finance/withdraw/index.tsx          |  3 --
 src/pages/login/index.tsx                     | 13 +++++++--
 src/pages/system/logs/index.tsx               |  1 -
 .../system/roles/components/RoleFormModal.tsx |  7 +----
 .../system/users/components/UserFormModal.tsx | 23 ++-------------
 10 files changed, 21 insertions(+), 73 deletions(-)

diff --git a/src/components/ChangePasswordModal/index.tsx b/src/components/ChangePasswordModal/index.tsx
index 115a973..e2054b2 100644
--- a/src/components/ChangePasswordModal/index.tsx
+++ b/src/components/ChangePasswordModal/index.tsx
@@ -66,11 +66,7 @@ export default defineComponent({
       >
         <Form ref={formRef} layout="vertical" model={formData} class={styles.form} requiredMark>
           <Form.Item label="新密码" name="newPassword" rules={newPasswordRules}>
-            <Input.Password
-              placeholder="至少8位，含字母+数字"
-              allowClear
-              v-model:value={formData.newPassword}
-            />
+            <Input.Password placeholder="至少8位，含字母+数字" allowClear />
           </Form.Item>
 
           <Form.Item
@@ -78,11 +74,7 @@ export default defineComponent({
             name="confirmPassword"
             rules={confirmNewPasswordRules(() => formData.newPassword)}
           >
-            <Input.Password
-              placeholder="再次输入新密码"
-              allowClear
-              v-model:value={formData.confirmPassword}
-            />
+            <Input.Password placeholder="再次输入新密码" allowClear />
           </Form.Item>
 
           <div class={styles.tip}>{TIPS_TEXT}</div>
diff --git a/src/pages/events/banner/components/BannerFormModal.tsx b/src/pages/events/banner/components/BannerFormModal.tsx
index a52ca84..4197c7b 100644
--- a/src/pages/events/banner/components/BannerFormModal.tsx
+++ b/src/pages/events/banner/components/BannerFormModal.tsx
@@ -479,12 +479,7 @@ export default defineComponent({
               >
                 {/* ===== Banner 标题 ===== */}
                 <Form.Item label="Banner标题" name="title" rules={titleRules}>
-                  <Input
-                    placeholder="请输入标题"
-                    maxlength={TITLE_MAX}
-                    allowClear
-                    v-model:value={formData.title}
-                  />
+                  <Input placeholder="请输入标题" maxlength={TITLE_MAX} allowClear />
                 </Form.Item>
 
                 {/* ===== 上传图片（必填，带裁剪） ===== */}
@@ -540,18 +535,13 @@ export default defineComponent({
 
                 {/* ===== 跳转类型 ===== */}
                 <Form.Item label="跳转类型" name="type" rules={typeRules}>
-                  <Select
-                    options={JUMP_TYPE_OPTIONS as any}
-                    placeholder="请选择"
-                    v-model:value={formData.type}
-                  />
+                  <Select options={JUMP_TYPE_OPTIONS as any} placeholder="请选择" />
                 </Form.Item>
 
                 {/* ===== 联动字段：赛事详情页 → 模糊搜索关联赛事 ===== */}
                 {formData.type === '1' && (
                   <Form.Item label="关联赛事" name="relatedEventId">
                     <Select
-                      v-model:value={formData.relatedEventId}
                       showSearch
                       filterOption={false}
                       allowClear={!eventSearchLoading.value}
@@ -571,24 +561,14 @@ export default defineComponent({
                 {/* ===== 联动字段：自定义链接 ===== */}
                 {formData.type === '2' && (
                   <Form.Item label="跳转地址" name="linkUrl" rules={linkUrlRules}>
-                    <Input
-                      placeholder="https://xxx"
-                      maxlength={URL_MAX}
-                      allowClear
-                      v-model:value={formData.linkUrl}
-                    />
+                    <Input placeholder="https://xxx" maxlength={URL_MAX} allowClear />
                   </Form.Item>
                 )}
 
                 {/* ===== 联动字段：小程序页面 ===== */}
                 {formData.type === '3' && (
                   <Form.Item label="小程序路径" name="linkUrl" rules={miniProgramPathRules}>
-                    <Input
-                      placeholder="/pages/index/index"
-                      maxlength={PATH_MAX}
-                      allowClear
-                      v-model:value={formData.linkUrl}
-                    />
+                    <Input placeholder="/pages/index/index" maxlength={PATH_MAX} allowClear />
                   </Form.Item>
                 )}
 
@@ -672,7 +652,6 @@ export default defineComponent({
                     max={999}
                     precision={0}
                     style={{ width: '200px' }}
-                    v-model:value={formData.sort}
                   />
                 </Form.Item>
               </Form>
diff --git a/src/pages/events/list/components/EventAuditModal.tsx b/src/pages/events/list/components/EventAuditModal.tsx
index 4b3a46a..3a03f9a 100644
--- a/src/pages/events/list/components/EventAuditModal.tsx
+++ b/src/pages/events/list/components/EventAuditModal.tsx
@@ -136,7 +136,7 @@ export default defineComponent({
                 {d.dropoutCount || '0'}
               </Descriptions.Item>
 
-              <Descriptions.Item label="最大人数">{d.dtotalLimit || '-'}</Descriptions.Item>
+              <Descriptions.Item label="最大人数">{d.totalLimit || '-'}</Descriptions.Item>
               <Descriptions.Item label="对岸数量">{d.matchTotalCount || '0'}</Descriptions.Item>
               <Descriptions.Item label="已完成对岸数量">{d.matchCount || '0'}</Descriptions.Item>
             </Descriptions>
diff --git a/src/pages/finance/payments/index.tsx b/src/pages/finance/payments/index.tsx
index a115760..b2318d7 100644
--- a/src/pages/finance/payments/index.tsx
+++ b/src/pages/finance/payments/index.tsx
@@ -38,7 +38,6 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="用户昵称" name="nickname">
               <Input
-                v-model:value={filterForm.nickname}
                 placeholder="请输入"
                 style={{ width: '180px' }}
                 allowClear
@@ -47,7 +46,6 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="手机号" name="phone">
               <Input
-                v-model:value={filterForm.phone}
                 placeholder="请输入"
                 style={{ width: '180px' }}
                 allowClear
diff --git a/src/pages/finance/wallet/index.tsx b/src/pages/finance/wallet/index.tsx
index 2919939..41b6f71 100644
--- a/src/pages/finance/wallet/index.tsx
+++ b/src/pages/finance/wallet/index.tsx
@@ -132,7 +132,6 @@ export default defineComponent({
             <Form style={{ rowGap: '10px' }} layout="inline" model={filterForm}>
               <Form.Item label="用户昵称" name="nickname">
                 <Input
-                  v-model:value={filterForm.nickname}
                   placeholder="请输入"
                   style={{ width: '180px' }}
                   allowClear
@@ -141,7 +140,6 @@ export default defineComponent({
               </Form.Item>
               <Form.Item label="手机号" name="phone">
                 <Input
-                  v-model:value={filterForm.phone}
                   placeholder="请输入"
                   style={{ width: '180px' }}
                   allowClear
diff --git a/src/pages/finance/withdraw/index.tsx b/src/pages/finance/withdraw/index.tsx
index 1907995..18adb32 100644
--- a/src/pages/finance/withdraw/index.tsx
+++ b/src/pages/finance/withdraw/index.tsx
@@ -94,7 +94,6 @@ export default defineComponent({
           <Form style={{ rowGap: '10px' }} layout="inline" model={filterForm}>
             <Form.Item label="申请人昵称" name="nickname">
               <Input
-                v-model:value={filterForm.nickname}
                 placeholder="请输入"
                 style={{ width: '160px' }}
                 allowClear
@@ -103,7 +102,6 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="手机号" name="phone">
               <Input
-                v-model:value={filterForm.phone}
                 placeholder="请输入"
                 style={{ width: '160px' }}
                 allowClear
@@ -112,7 +110,6 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="真实姓名" name="realName">
               <Input
-                v-model:value={filterForm.realName}
                 placeholder="请输入"
                 style={{ width: '160px' }}
                 allowClear
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index dce1405..94d7e4f 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -216,7 +216,8 @@ export default defineComponent({
             >
               <FormItem name="phone">
                 <Input
-                  v-model={[form.phone, 'value']}
+                  value={form.phone}
+                  onUpdate:value={(val: string) => (form.phone = val)}
                   placeholder="请输入用户名"
                   size="large"
                   v-slots={{ prefix: () => <UserOutlined /> }}
@@ -224,7 +225,8 @@ export default defineComponent({
               </FormItem>
               <FormItem name="password">
                 <Input
-                  v-model={[form.password, 'value']}
+                  value={form.password}
+                  onUpdate:value={(val: string) => (form.password = val)}
                   type="password"
                   placeholder="请输入密码"
                   size="large"
@@ -234,7 +236,12 @@ export default defineComponent({
 
               {/* 记住密码 */}
               <div class={styles.rememberRow}>
-                <Checkbox v-model={[rememberMe.value, 'checked']}>记住密码</Checkbox>
+                <Checkbox
+                  checked={rememberMe.value}
+                  onUpdate:checked={(val: boolean) => setRememberMe(val)}
+                >
+                  记住密码
+                </Checkbox>
               </div>
 
               <FormItem>
diff --git a/src/pages/system/logs/index.tsx b/src/pages/system/logs/index.tsx
index 2054920..2c6a8ab 100644
--- a/src/pages/system/logs/index.tsx
+++ b/src/pages/system/logs/index.tsx
@@ -60,7 +60,6 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="操作人" name="searchOperator">
               <Input
-                v-model:value={filterForm.searchOperator}
                 placeholder="请输入"
                 style={{ width: '160px' }}
                 allowClear
diff --git a/src/pages/system/roles/components/RoleFormModal.tsx b/src/pages/system/roles/components/RoleFormModal.tsx
index 297e4f1..21d1858 100644
--- a/src/pages/system/roles/components/RoleFormModal.tsx
+++ b/src/pages/system/roles/components/RoleFormModal.tsx
@@ -141,12 +141,7 @@ export default defineComponent({
           <Form ref={formRef} layout="vertical" model={formData} class={styles.form} requiredMark>
             {/* 角色名称 */}
             <Form.Item label="角色名称" name="roleName" rules={roleNameRules}>
-              <Input
-                placeholder="请输入"
-                maxlength={20}
-                allowClear
-                v-model:value={formData.roleName}
-              />
+              <Input placeholder="请输入" maxlength={20} allowClear />
             </Form.Item>
 
             {/* 菜单权限配置 */}
diff --git a/src/pages/system/users/components/UserFormModal.tsx b/src/pages/system/users/components/UserFormModal.tsx
index e1a2a3d..c3fd45e 100644
--- a/src/pages/system/users/components/UserFormModal.tsx
+++ b/src/pages/system/users/components/UserFormModal.tsx
@@ -234,20 +234,10 @@ export default defineComponent({
             {/* 姓名 / 手机号：同一行 */}
             <div class={styles.row}>
               <Form.Item label="姓名" name="realName" rules={realNameRules} class={styles.col}>
-                <Input
-                  placeholder="真实姓名"
-                  maxlength={8}
-                  allowClear
-                  v-model:value={formData.realName}
-                />
+                <Input placeholder="真实姓名" maxlength={8} allowClear />
               </Form.Item>
               <Form.Item label="手机号" name="phone" rules={phoneRules} class={styles.col}>
-                <Input
-                  placeholder="11位手机号"
-                  maxlength={11}
-                  allowClear
-                  v-model:value={formData.phone}
-                />
+                <Input placeholder="11位手机号" maxlength={11} allowClear />
               </Form.Item>
             </div>
 
@@ -268,7 +258,6 @@ export default defineComponent({
                 </Form.Item>
                 <Form.Item label="角色" name="roleId" rules={roleRules} class={styles.col}>
                   <Select
-                    v-model:value={formData.roleId}
                     showSearch
                     filterOption={false}
                     allowClear={!roleSearchLoading.value}
@@ -297,7 +286,6 @@ export default defineComponent({
                     <Input.Password
                       placeholder={isEdit ? '请输入新密码' : '至少8位，含字母+数字'}
                       allowClear
-                      v-model:value={formData.password}
                     />
                   </Form.Item>
                   <Form.Item
@@ -306,17 +294,12 @@ export default defineComponent({
                     class={styles.col}
                     rules={confirmPasswordRules(() => formData.password)}
                   >
-                    <Input.Password
-                      placeholder="再次输入密码"
-                      allowClear
-                      v-model:value={formData.confirmPassword}
-                    />
+                    <Input.Password placeholder="再次输入密码" allowClear />
                   </Form.Item>
                 </div>
                 {/* 角色：单独一行 */}
                 <Form.Item label="角色" name="roleId" rules={roleRules}>
                   <Select
-                    v-model:value={formData.roleId}
                     showSearch
                     filterOption={false}
                     allowClear={!roleSearchLoading.value}
-- 
2.52.0


From 0a6d751e825aaf6899d700892bd2443ef6cdd2f0 Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 10:24:25 +0800
Subject: [PATCH 20/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.tsx              | 104 ++++------------------
 src/pages/login/model/services.ts      |   4 +
 src/pages/login/model/useLoginModel.ts | 117 +++++++++++++++++++++++++
 3 files changed, 137 insertions(+), 88 deletions(-)
 create mode 100644 src/pages/login/model/services.ts
 create mode 100644 src/pages/login/model/useLoginModel.ts

diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 94d7e4f..629ba99 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -1,90 +1,22 @@
-import { defineComponent, reactive } from 'vue';
-import { useRoute } from 'vue-router';
-import { Button, Checkbox, Form, FormItem, Input, message } from 'ant-design-vue';
+import { defineComponent } from 'vue';
+import { Button, Checkbox, Form, FormItem, Input } from 'ant-design-vue';
 import { UserOutlined, LockOutlined } from '@ant-design/icons-vue';
-import { auth } from '@/hooks/useAuth';
-import { useEffect, useState } from '@/hooks';
-import { useUserStore } from '@/stores/userStore';
-import { login as loginApi } from '@/api/login';
-import { loginFormRules } from './model/form';
+import { useLoginModel } from './model/useLoginModel';
 import styles from './index.module.less';
 
-interface LoginForm {
-  phone: string;
-  password: string;
-}
-
 export default defineComponent({
   name: 'LoginPage',
   setup() {
-    const route = useRoute();
-    const [loading, setLoading] = useState(false);
-    const [rememberMe, setRememberMe] = useState(false);
-    const { setUser } = useUserStore();
-
-    const form = reactive<LoginForm>({
-      phone: '',
-      password: '',
-    });
-
-    useEffect(() => {
-      const saved = localStorage.getItem('cpms_login_remember');
-      if (saved) {
-        try {
-          const data = JSON.parse(saved);
-          form.phone = data.phone || '';
-          form.password = data.password || '';
-          setRememberMe(true);
-        } catch {
-          localStorage.removeItem('cpms_login_remember');
-        }
-      }
-    }, []);
-
-    const handleSubmit = async () => {
-      if (!form.phone || !form.password) {
-        message.warning('请输入用户名和密码');
-        return;
-      }
-
-      setLoading(true);
-
-      try {
-        const res = await loginApi({ phone: form.phone, password: form.password });
-        if (res.code != 200) {
-          message.error(res.msg || '登录失败');
-          return;
-        }
-
-        setUser({
-          phone: res.data.phone || form.phone,
-          nickname: res.data.nickName || '',
-          token: res.data.token,
-        });
-
-        if (rememberMe.value) {
-          localStorage.setItem(
-            'cpms_login_remember',
-            JSON.stringify({
-              phone: form.phone,
-              password: form.password,
-            }),
-          );
-        } else {
-          localStorage.removeItem('cpms_login_remember');
-        }
-
-        const redirect = Array.isArray(route.query.redirect)
-          ? route.query.redirect[0]
-          : route.query.redirect;
-        await auth.login(res.data.token, redirect || undefined);
-        message.success('登录成功');
-      } catch (err) {
-        message.error('登录失败,请重试');
-      } finally {
-        setLoading(false);
-      }
-    };
+    const {
+      form,
+      setPhone,
+      setPassword,
+      rememberMe,
+      setRememberMe,
+      loading,
+      handleSubmit,
+      loginFormRules,
+    } = useLoginModel();
 
     const particles = [
       { top: '8%', left: '15%', delay: '0s', duration: '8s' },
@@ -217,7 +149,7 @@ export default defineComponent({
               <FormItem name="phone">
                 <Input
                   value={form.phone}
-                  onUpdate:value={(val: string) => (form.phone = val)}
+                  onUpdate:value={setPhone}
                   placeholder="请输入用户名"
                   size="large"
                   v-slots={{ prefix: () => <UserOutlined /> }}
@@ -226,7 +158,7 @@ export default defineComponent({
               <FormItem name="password">
                 <Input
                   value={form.password}
-                  onUpdate:value={(val: string) => (form.password = val)}
+                  onUpdate:value={setPassword}
                   type="password"
                   placeholder="请输入密码"
                   size="large"
@@ -234,12 +166,8 @@ export default defineComponent({
                 />
               </FormItem>
 
-              {/* 记住密码 */}
               <div class={styles.rememberRow}>
-                <Checkbox
-                  checked={rememberMe.value}
-                  onUpdate:checked={(val: boolean) => setRememberMe(val)}
-                >
+                <Checkbox checked={rememberMe.value} onUpdate:checked={setRememberMe}>
                   记住密码
                 </Checkbox>
               </div>
diff --git a/src/pages/login/model/services.ts b/src/pages/login/model/services.ts
new file mode 100644
index 0000000..158b3d4
--- /dev/null
+++ b/src/pages/login/model/services.ts
@@ -0,0 +1,4 @@
+/**
+ * 登录页 - 接口服务
+ */
+export { login, type LoginResult } from '@/api/login';
diff --git a/src/pages/login/model/useLoginModel.ts b/src/pages/login/model/useLoginModel.ts
new file mode 100644
index 0000000..880da0a
--- /dev/null
+++ b/src/pages/login/model/useLoginModel.ts
@@ -0,0 +1,117 @@
+import { reactive } from 'vue';
+import { useRoute } from 'vue-router';
+import { message } from 'ant-design-vue';
+import { useEffect, useState } from '@/hooks';
+import { auth } from '@/hooks/useAuth';
+import { useUserStore } from '@/stores/userStore';
+import { login } from './services';
+import { loginFormRules } from './form';
+
+// ============================================================
+// 类型
+// ============================================================
+
+export interface LoginForm {
+  phone: string;
+  password: string;
+}
+
+// ============================================================
+// 常量
+// ============================================================
+
+const REMEMBER_KEY = 'cpms_login_remember';
+
+// ============================================================
+// Model
+// ============================================================
+
+export function useLoginModel() {
+  const route = useRoute();
+  const { setUser } = useUserStore();
+
+  const [loading, setLoading] = useState(false);
+  const [rememberMe, setRememberMe] = useState(false);
+  const form = reactive<LoginForm>({
+    phone: '',
+    password: '',
+  });
+
+  useEffect(() => {
+    const saved = localStorage.getItem(REMEMBER_KEY);
+    if (!saved) return;
+
+    try {
+      const data = JSON.parse(saved);
+      form.phone = data.phone || '';
+      form.password = data.password || '';
+      setRememberMe(true);
+    } catch {
+      localStorage.removeItem(REMEMBER_KEY);
+    }
+  }, []);
+
+  const setPhone = (phone: string) => {
+    form.phone = phone;
+  };
+
+  const setPassword = (password: string) => {
+    form.password = password;
+  };
+
+  const handleSubmit = async () => {
+    if (!form.phone || !form.password) {
+      message.warning('请输入用户名和密码');
+      return;
+    }
+
+    setLoading(true);
+
+    try {
+      const res = await login({ phone: form.phone, password: form.password });
+      if (res.code != 200) {
+        message.error(res.msg || '登录失败');
+        return;
+      }
+
+      setUser({
+        phone: res.data.phone || form.phone,
+        nickname: res.data.nickName || '',
+        token: res.data.token,
+      });
+
+      if (rememberMe.value) {
+        localStorage.setItem(
+          REMEMBER_KEY,
+          JSON.stringify({
+            phone: form.phone,
+            password: form.password,
+          }),
+        );
+      } else {
+        localStorage.removeItem(REMEMBER_KEY);
+      }
+
+      const redirect = Array.isArray(route.query.redirect)
+        ? route.query.redirect[0]
+        : route.query.redirect;
+      await auth.login(res.data.token, redirect || undefined);
+      message.success('登录成功');
+    } catch {
+      message.error('登录失败,请重试');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return {
+    form,
+    setPhone,
+    setPassword,
+    rememberMe,
+    setRememberMe,
+    loading,
+    handleSubmit,
+    loginFormRules,
+  };
+}
-- 
2.52.0


From 8fdbf4ae069d294b0abed9c8d685c0c783d0355e Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 10:38:21 +0800
Subject: [PATCH 21/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E8=A1=A8=E5=8D=95=E6=A3=80=E6=B5=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../banner/components/BannerFormModal.tsx     | 50 ++++++++++---------
 .../events/banner/model/useBannerModel.ts     |  2 +-
 src/pages/login/model/useLoginModel.ts        |  4 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/pages/events/banner/components/BannerFormModal.tsx b/src/pages/events/banner/components/BannerFormModal.tsx
index 4197c7b..76bb223 100644
--- a/src/pages/events/banner/components/BannerFormModal.tsx
+++ b/src/pages/events/banner/components/BannerFormModal.tsx
@@ -319,34 +319,36 @@ export default defineComponent({
 
     // ---- 监听 type 变化，清理联动字段 ----
     useEffect(() => {
-      if (!typeChanged.value) {
-        if (formData.type !== '1') formData.relatedEventId = undefined;
-        if (formData.type !== '2' && formData.type !== '3') formData.linkUrl = '';
-        typeChanged.value = true;
-        return;
-      }
+      const syncTypeFields = async () => {
+        if (!typeChanged.value) {
+          if (formData.type !== '1') formData.relatedEventId = undefined;
+          if (formData.type !== '2' && formData.type !== '3') formData.linkUrl = '';
+          typeChanged.value = true;
+          return;
+        }
 
-      if (formData.type !== '1') {
-        formData.relatedEventId = undefined;
-        formRef.value?.clearValidate('relatedEventId');
-      }
-      if (formData.type !== '2' && formData.type !== '3') {
-        formData.linkUrl = '';
-      }
-      const activeNames: string[] = [];
-      if (formData.type === '1') activeNames.push('relatedEventId');
-      if (formData.type === '2' || formData.type === '3') activeNames.push('linkUrl');
-      formRef.value?.clearValidate(['relatedEventId', 'linkUrl']);
-      if (activeNames.length) {
-        setTimeout(() => formRef.value?.validateFields(activeNames).catch(() => {}), 0);
-      }
+        if (formData.type !== '1') {
+          formData.relatedEventId = undefined;
+          formRef.value?.clearValidate('relatedEventId');
+        }
+        if (formData.type !== '2' && formData.type !== '3') {
+          formData.linkUrl = '';
+        }
+        const activeNames: string[] = [];
+        if (formData.type === '1') activeNames.push('relatedEventId');
+        if (formData.type === '2' || formData.type === '3') activeNames.push('linkUrl');
+        formRef.value?.clearValidate(['relatedEventId', 'linkUrl']);
+        if (activeNames.length) {
+          await formRef.value?.validateFields(activeNames).catch(() => {});
+        }
+      };
+
+      syncTypeFields();
     }, [() => formData.type]);
 
     /** 重新校验 Banner 图片字段，上传完成后清除或更新错误提示 */
-    const revalidateImageUrl = () => {
-      setTimeout(() => {
-        formRef.value?.validateFields(['imageUrl']).catch(() => {});
-      }, 0);
+    const revalidateImageUrl = async () => {
+      await formRef.value?.validateFields(['imageUrl']).catch(() => {});
     };
 
     // ---- 图片上传相关 ----
diff --git a/src/pages/events/banner/model/useBannerModel.ts b/src/pages/events/banner/model/useBannerModel.ts
index 4f96cf1..3954215 100644
--- a/src/pages/events/banner/model/useBannerModel.ts
+++ b/src/pages/events/banner/model/useBannerModel.ts
@@ -135,7 +135,7 @@ export function useBannerModel() {
   const handleSearch = () => fetchList();
 
   /** 重置 */
-  const handleReset = useThrottleFn(() => {
+  const handleReset = useThrottleFn(async () => {
     filterForm.title = '';
     filterForm.status = '';
     pagination.reset();
diff --git a/src/pages/login/model/useLoginModel.ts b/src/pages/login/model/useLoginModel.ts
index 880da0a..3f5346c 100644
--- a/src/pages/login/model/useLoginModel.ts
+++ b/src/pages/login/model/useLoginModel.ts
@@ -97,8 +97,8 @@ export function useLoginModel() {
         : route.query.redirect;
       await auth.login(res.data.token, redirect || undefined);
       message.success('登录成功');
-    } catch {
-      message.error('登录失败,请重试');
+    } catch (error) {
+      console.error(error);
     } finally {
       setLoading(false);
     }
-- 
2.52.0


From eb5299735aebf6e202d11291be6e73d90e62c50b Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 10:47:26 +0800
Subject: [PATCH 22/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E8=8A=82?=
 =?UTF-8?q?=E6=B5=81=E5=86=99=E6=B3=95=E5=86=97=E4=BD=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/events/banner/model/useBannerModel.ts      | 2 +-
 src/pages/events/list/model/useEventListModel.ts     | 4 ++--
 src/pages/events/logs/model/useLogModel.ts           | 4 ++--
 src/pages/events/orders/model/useOrderModel.ts       | 4 ++--
 src/pages/events/users/model/useUserModel.ts         | 4 ++--
 src/pages/finance/payments/model/usePaymentsModel.ts | 4 ++--
 src/pages/finance/wallet/model/useWalletModel.ts     | 4 ++--
 src/pages/finance/withdraw/model/useWithdrawModel.ts | 4 ++--
 src/pages/system/logs/model/useLogModel.ts           | 4 ++--
 src/pages/system/roles/model/useRoleModel.ts         | 4 ++--
 src/pages/system/users/model/useUserModel.ts         | 5 ++---
 11 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/pages/events/banner/model/useBannerModel.ts b/src/pages/events/banner/model/useBannerModel.ts
index 3954215..bc3c47f 100644
--- a/src/pages/events/banner/model/useBannerModel.ts
+++ b/src/pages/events/banner/model/useBannerModel.ts
@@ -139,7 +139,7 @@ export function useBannerModel() {
     filterForm.title = '';
     filterForm.status = '';
     pagination.reset();
-    setTimeout(fetchList, 350);
+    await fetchList();
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/events/list/model/useEventListModel.ts b/src/pages/events/list/model/useEventListModel.ts
index 1e0ceb6..3c07833 100644
--- a/src/pages/events/list/model/useEventListModel.ts
+++ b/src/pages/events/list/model/useEventListModel.ts
@@ -99,10 +99,10 @@ export function useEventListModel() {
 
   const handleSearch = () => fetchList();
 
-  const handleReset = () => {
+  const handleReset = async () => {
     Object.assign(filterForm, FILTER_DEFAULTS);
     pagination.reset();
-    setTimeout(fetchList, 350);
+    await fetchList();
   };
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/events/logs/model/useLogModel.ts b/src/pages/events/logs/model/useLogModel.ts
index 8cc73a5..b71f0c2 100644
--- a/src/pages/events/logs/model/useLogModel.ts
+++ b/src/pages/events/logs/model/useLogModel.ts
@@ -119,7 +119,7 @@ export function useLogModel() {
 
   const handleSearch = () => fetchList();
 
-  const handleReset = () => {
+  const handleReset = async () => {
     filterForm.dateRange = null;
     filterForm.type = '';
     filterForm.source = '';
@@ -127,7 +127,7 @@ export function useLogModel() {
     filterForm.sourcePhone = '';
     filterForm.tournamentName = '';
     pagination.reset();
-    setTimeout(() => fetchList(), 0);
+    await fetchList();
   };
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/events/orders/model/useOrderModel.ts b/src/pages/events/orders/model/useOrderModel.ts
index 99c3ecc..0f78f08 100644
--- a/src/pages/events/orders/model/useOrderModel.ts
+++ b/src/pages/events/orders/model/useOrderModel.ts
@@ -213,10 +213,10 @@ export function useOrderModel() {
 
   const handleSearch = () => fetchList();
 
-  const handleReset = () => {
+  const handleReset = async () => {
     Object.assign(filterForm, FILTER_DEFAULTS);
     pagination.reset();
-    setTimeout(fetchList, 350);
+    await fetchList();
   };
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/events/users/model/useUserModel.ts b/src/pages/events/users/model/useUserModel.ts
index f14fd45..883a746 100644
--- a/src/pages/events/users/model/useUserModel.ts
+++ b/src/pages/events/users/model/useUserModel.ts
@@ -107,12 +107,12 @@ export function useUserModel() {
   // ===== 事件处理 =====
   const handleSearch = () => fetchList();
 
-  const handleReset = () => {
+  const handleReset = async () => {
     filterForm.text = '';
     filterForm.roleId = '';
     filterForm.status = '';
     pagination.reset();
-    setTimeout(() => fetchList(), 0);
+    await fetchList();
   };
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/finance/payments/model/usePaymentsModel.ts b/src/pages/finance/payments/model/usePaymentsModel.ts
index a84e3c9..7e47d99 100644
--- a/src/pages/finance/payments/model/usePaymentsModel.ts
+++ b/src/pages/finance/payments/model/usePaymentsModel.ts
@@ -122,13 +122,13 @@ export function usePaymentsModel() {
 
   const handleSearch = () => fetchList();
 
-  const handleReset = useThrottleFn(() => {
+  const handleReset = useThrottleFn(async () => {
     filterForm.timeRange = null;
     filterForm.nickname = '';
     filterForm.phone = '';
     filterForm.type = '';
     pagination.reset();
-    setTimeout(fetchList, 350);
+    await fetchList();
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/finance/wallet/model/useWalletModel.ts b/src/pages/finance/wallet/model/useWalletModel.ts
index 9a63da1..a309560 100644
--- a/src/pages/finance/wallet/model/useWalletModel.ts
+++ b/src/pages/finance/wallet/model/useWalletModel.ts
@@ -161,13 +161,13 @@ export function useWalletModel() {
 
   const handleSearch = () => fetchList();
 
-  const handleReset = useThrottleFn(() => {
+  const handleReset = useThrottleFn(async () => {
     filterForm.nickname = '';
     filterForm.phone = '';
     filterForm.minBalance = '';
     filterForm.maxBalance = '';
     pagination.reset();
-    setTimeout(fetchList, 350);
+    await fetchList();
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/finance/withdraw/model/useWithdrawModel.ts b/src/pages/finance/withdraw/model/useWithdrawModel.ts
index 7239a2f..badb5c1 100644
--- a/src/pages/finance/withdraw/model/useWithdrawModel.ts
+++ b/src/pages/finance/withdraw/model/useWithdrawModel.ts
@@ -182,14 +182,14 @@ export function useWithdrawModel() {
   const handleSearch = () => fetchList();
 
   /** 重置（重置后自动查询） */
-  const handleReset = useThrottleFn(() => {
+  const handleReset = useThrottleFn(async () => {
     filterForm.nickname = '';
     filterForm.phone = '';
     filterForm.realName = '';
     filterForm.auditStatus = '';
     filterForm.payStatus = '';
     pagination.reset();
-    setTimeout(fetchList, 350);
+    await fetchList();
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/system/logs/model/useLogModel.ts b/src/pages/system/logs/model/useLogModel.ts
index 48c64f4..a8df446 100644
--- a/src/pages/system/logs/model/useLogModel.ts
+++ b/src/pages/system/logs/model/useLogModel.ts
@@ -126,12 +126,12 @@ export function useLogModel() {
   const handleSearch = () => fetchList();
 
   /** 重置（重置后自动查询） */
-  const handleReset = useThrottleFn(() => {
+  const handleReset = useThrottleFn(async () => {
     filterForm.actionTimeRange = null;
     filterForm.actionType = '';
     filterForm.searchOperator = '';
     pagination.reset();
-    setTimeout(fetchList, 350);
+    await fetchList();
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/system/roles/model/useRoleModel.ts b/src/pages/system/roles/model/useRoleModel.ts
index 015db08..706cbf3 100644
--- a/src/pages/system/roles/model/useRoleModel.ts
+++ b/src/pages/system/roles/model/useRoleModel.ts
@@ -97,10 +97,10 @@ export function useRoleModel() {
   const handleSearch = () => fetchList();
 
   /** 重置（重置后自动查询） */
-  const handleReset = useThrottleFn(() => {
+  const handleReset = useThrottleFn(async () => {
     filterForm.name = '';
     pagination.reset();
-    setTimeout(fetchList, 350);
+    await fetchList();
   }, 500);
 
   const handlePageChange = (page: number, pageSize: number) => {
diff --git a/src/pages/system/users/model/useUserModel.ts b/src/pages/system/users/model/useUserModel.ts
index 1e7bf6e..558abe9 100644
--- a/src/pages/system/users/model/useUserModel.ts
+++ b/src/pages/system/users/model/useUserModel.ts
@@ -137,13 +137,12 @@ export function useUserModel() {
   const handleSearch = () => fetchList();
 
   /** 重置（节流 500ms，重置后自动查询） */
-  const handleReset = useThrottleFn(() => {
+  const handleReset = useThrottleFn(async () => {
     filterForm.text = '';
     filterForm.roleId = '';
     filterForm.status = '';
     pagination.reset();
-    // 等待 debounce(300ms) 生效后自动查询
-    setTimeout(fetchList, 350);
+    await fetchList();
   }, 500);
 
   /** 分页变更 */
-- 
2.52.0


From 92a6a06bbc7788bad86fe89683326fcfe59af65e Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 11:04:20 +0800
Subject: [PATCH 23/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=8F=8C=E5=90=91=E7=BB=91=E5=AE=9A=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChangePasswordModal/index.tsx  | 18 ++++++-
 .../banner/components/BannerFormModal.tsx     | 47 +++++++++++++++++--
 src/pages/finance/payments/index.tsx          |  8 ++++
 src/pages/finance/wallet/index.tsx            |  8 ++++
 src/pages/finance/withdraw/index.tsx          | 12 +++++
 src/pages/system/logs/index.tsx               |  4 ++
 .../system/roles/components/RoleFormModal.tsx | 10 +++-
 .../system/users/components/UserFormModal.tsx | 41 ++++++++++++++--
 8 files changed, 138 insertions(+), 10 deletions(-)

diff --git a/src/components/ChangePasswordModal/index.tsx b/src/components/ChangePasswordModal/index.tsx
index e2054b2..7c0f258 100644
--- a/src/components/ChangePasswordModal/index.tsx
+++ b/src/components/ChangePasswordModal/index.tsx
@@ -66,7 +66,14 @@ export default defineComponent({
       >
         <Form ref={formRef} layout="vertical" model={formData} class={styles.form} requiredMark>
           <Form.Item label="新密码" name="newPassword" rules={newPasswordRules}>
-            <Input.Password placeholder="至少8位，含字母+数字" allowClear />
+            <Input.Password
+              value={formData.newPassword}
+              onUpdate:value={(val: any) => {
+                formData.newPassword = val;
+              }}
+              placeholder="至少8位，含字母+数字"
+              allowClear
+            />
           </Form.Item>
 
           <Form.Item
@@ -74,7 +81,14 @@ export default defineComponent({
             name="confirmPassword"
             rules={confirmNewPasswordRules(() => formData.newPassword)}
           >
-            <Input.Password placeholder="再次输入新密码" allowClear />
+            <Input.Password
+              value={formData.confirmPassword}
+              onUpdate:value={(val: any) => {
+                formData.confirmPassword = val;
+              }}
+              placeholder="再次输入新密码"
+              allowClear
+            />
           </Form.Item>
 
           <div class={styles.tip}>{TIPS_TEXT}</div>
diff --git a/src/pages/events/banner/components/BannerFormModal.tsx b/src/pages/events/banner/components/BannerFormModal.tsx
index 76bb223..be5777a 100644
--- a/src/pages/events/banner/components/BannerFormModal.tsx
+++ b/src/pages/events/banner/components/BannerFormModal.tsx
@@ -481,7 +481,15 @@ export default defineComponent({
               >
                 {/* ===== Banner 标题 ===== */}
                 <Form.Item label="Banner标题" name="title" rules={titleRules}>
-                  <Input placeholder="请输入标题" maxlength={TITLE_MAX} allowClear />
+                  <Input
+                    value={formData.title}
+                    onUpdate:value={(val: any) => {
+                      formData.title = val;
+                    }}
+                    placeholder="请输入标题"
+                    maxlength={TITLE_MAX}
+                    allowClear
+                  />
                 </Form.Item>
 
                 {/* ===== 上传图片（必填，带裁剪） ===== */}
@@ -537,13 +545,24 @@ export default defineComponent({
 
                 {/* ===== 跳转类型 ===== */}
                 <Form.Item label="跳转类型" name="type" rules={typeRules}>
-                  <Select options={JUMP_TYPE_OPTIONS as any} placeholder="请选择" />
+                  <Select
+                    value={formData.type}
+                    onUpdate:value={(val: any) => {
+                      formData.type = val;
+                    }}
+                    options={JUMP_TYPE_OPTIONS as any}
+                    placeholder="请选择"
+                  />
                 </Form.Item>
 
                 {/* ===== 联动字段：赛事详情页 → 模糊搜索关联赛事 ===== */}
                 {formData.type === '1' && (
                   <Form.Item label="关联赛事" name="relatedEventId">
                     <Select
+                      value={formData.relatedEventId}
+                      onUpdate:value={(val: any) => {
+                        formData.relatedEventId = val;
+                      }}
                       showSearch
                       filterOption={false}
                       allowClear={!eventSearchLoading.value}
@@ -563,14 +582,30 @@ export default defineComponent({
                 {/* ===== 联动字段：自定义链接 ===== */}
                 {formData.type === '2' && (
                   <Form.Item label="跳转地址" name="linkUrl" rules={linkUrlRules}>
-                    <Input placeholder="https://xxx" maxlength={URL_MAX} allowClear />
+                    <Input
+                      value={formData.linkUrl}
+                      onUpdate:value={(val: any) => {
+                        formData.linkUrl = val;
+                      }}
+                      placeholder="https://xxx"
+                      maxlength={URL_MAX}
+                      allowClear
+                    />
                   </Form.Item>
                 )}
 
                 {/* ===== 联动字段：小程序页面 ===== */}
                 {formData.type === '3' && (
                   <Form.Item label="小程序路径" name="linkUrl" rules={miniProgramPathRules}>
-                    <Input placeholder="/pages/index/index" maxlength={PATH_MAX} allowClear />
+                    <Input
+                      value={formData.linkUrl}
+                      onUpdate:value={(val: any) => {
+                        formData.linkUrl = val;
+                      }}
+                      placeholder="/pages/index/index"
+                      maxlength={PATH_MAX}
+                      allowClear
+                    />
                   </Form.Item>
                 )}
 
@@ -649,6 +684,10 @@ export default defineComponent({
                 {/* ===== 排序 ===== */}
                 <Form.Item label="排序" name="sort" rules={sortRules}>
                   <InputNumber
+                    value={formData.sort}
+                    onUpdate:value={(val: any) => {
+                      formData.sort = val;
+                    }}
                     placeholder="数字越小越靠前"
                     min={1}
                     max={999}
diff --git a/src/pages/finance/payments/index.tsx b/src/pages/finance/payments/index.tsx
index b2318d7..ab4719c 100644
--- a/src/pages/finance/payments/index.tsx
+++ b/src/pages/finance/payments/index.tsx
@@ -38,6 +38,10 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="用户昵称" name="nickname">
               <Input
+                value={filterForm.nickname}
+                onUpdate:value={(val: any) => {
+                  filterForm.nickname = val;
+                }}
                 placeholder="请输入"
                 style={{ width: '180px' }}
                 allowClear
@@ -46,6 +50,10 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="手机号" name="phone">
               <Input
+                value={filterForm.phone}
+                onUpdate:value={(val: any) => {
+                  filterForm.phone = val;
+                }}
                 placeholder="请输入"
                 style={{ width: '180px' }}
                 allowClear
diff --git a/src/pages/finance/wallet/index.tsx b/src/pages/finance/wallet/index.tsx
index 41b6f71..071fbda 100644
--- a/src/pages/finance/wallet/index.tsx
+++ b/src/pages/finance/wallet/index.tsx
@@ -132,6 +132,10 @@ export default defineComponent({
             <Form style={{ rowGap: '10px' }} layout="inline" model={filterForm}>
               <Form.Item label="用户昵称" name="nickname">
                 <Input
+                  value={filterForm.nickname}
+                  onUpdate:value={(val: any) => {
+                    filterForm.nickname = val;
+                  }}
                   placeholder="请输入"
                   style={{ width: '180px' }}
                   allowClear
@@ -140,6 +144,10 @@ export default defineComponent({
               </Form.Item>
               <Form.Item label="手机号" name="phone">
                 <Input
+                  value={filterForm.phone}
+                  onUpdate:value={(val: any) => {
+                    filterForm.phone = val;
+                  }}
                   placeholder="请输入"
                   style={{ width: '180px' }}
                   allowClear
diff --git a/src/pages/finance/withdraw/index.tsx b/src/pages/finance/withdraw/index.tsx
index 18adb32..7801959 100644
--- a/src/pages/finance/withdraw/index.tsx
+++ b/src/pages/finance/withdraw/index.tsx
@@ -94,6 +94,10 @@ export default defineComponent({
           <Form style={{ rowGap: '10px' }} layout="inline" model={filterForm}>
             <Form.Item label="申请人昵称" name="nickname">
               <Input
+                value={filterForm.nickname}
+                onUpdate:value={(val: any) => {
+                  filterForm.nickname = val;
+                }}
                 placeholder="请输入"
                 style={{ width: '160px' }}
                 allowClear
@@ -102,6 +106,10 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="手机号" name="phone">
               <Input
+                value={filterForm.phone}
+                onUpdate:value={(val: any) => {
+                  filterForm.phone = val;
+                }}
                 placeholder="请输入"
                 style={{ width: '160px' }}
                 allowClear
@@ -110,6 +118,10 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="真实姓名" name="realName">
               <Input
+                value={filterForm.realName}
+                onUpdate:value={(val: any) => {
+                  filterForm.realName = val;
+                }}
                 placeholder="请输入"
                 style={{ width: '160px' }}
                 allowClear
diff --git a/src/pages/system/logs/index.tsx b/src/pages/system/logs/index.tsx
index 2c6a8ab..1d64eff 100644
--- a/src/pages/system/logs/index.tsx
+++ b/src/pages/system/logs/index.tsx
@@ -60,6 +60,10 @@ export default defineComponent({
             </Form.Item>
             <Form.Item label="操作人" name="searchOperator">
               <Input
+                value={filterForm.searchOperator}
+                onUpdate:value={(val: any) => {
+                  filterForm.searchOperator = val;
+                }}
                 placeholder="请输入"
                 style={{ width: '160px' }}
                 allowClear
diff --git a/src/pages/system/roles/components/RoleFormModal.tsx b/src/pages/system/roles/components/RoleFormModal.tsx
index 21d1858..c27f4aa 100644
--- a/src/pages/system/roles/components/RoleFormModal.tsx
+++ b/src/pages/system/roles/components/RoleFormModal.tsx
@@ -141,7 +141,15 @@ export default defineComponent({
           <Form ref={formRef} layout="vertical" model={formData} class={styles.form} requiredMark>
             {/* 角色名称 */}
             <Form.Item label="角色名称" name="roleName" rules={roleNameRules}>
-              <Input placeholder="请输入" maxlength={20} allowClear />
+              <Input
+                value={formData.roleName}
+                onUpdate:value={(val: any) => {
+                  formData.roleName = val;
+                }}
+                placeholder="请输入"
+                maxlength={20}
+                allowClear
+              />
             </Form.Item>
 
             {/* 菜单权限配置 */}
diff --git a/src/pages/system/users/components/UserFormModal.tsx b/src/pages/system/users/components/UserFormModal.tsx
index c3fd45e..36c89ad 100644
--- a/src/pages/system/users/components/UserFormModal.tsx
+++ b/src/pages/system/users/components/UserFormModal.tsx
@@ -234,10 +234,26 @@ export default defineComponent({
             {/* 姓名 / 手机号：同一行 */}
             <div class={styles.row}>
               <Form.Item label="姓名" name="realName" rules={realNameRules} class={styles.col}>
-                <Input placeholder="真实姓名" maxlength={8} allowClear />
+                <Input
+                  value={formData.realName}
+                  onUpdate:value={(val: any) => {
+                    formData.realName = val;
+                  }}
+                  placeholder="真实姓名"
+                  maxlength={8}
+                  allowClear
+                />
               </Form.Item>
               <Form.Item label="手机号" name="phone" rules={phoneRules} class={styles.col}>
-                <Input placeholder="11位手机号" maxlength={11} allowClear />
+                <Input
+                  value={formData.phone}
+                  onUpdate:value={(val: any) => {
+                    formData.phone = val;
+                  }}
+                  placeholder="11位手机号"
+                  maxlength={11}
+                  allowClear
+                />
               </Form.Item>
             </div>
 
@@ -258,6 +274,10 @@ export default defineComponent({
                 </Form.Item>
                 <Form.Item label="角色" name="roleId" rules={roleRules} class={styles.col}>
                   <Select
+                    value={formData.roleId}
+                    onUpdate:value={(val: any) => {
+                      formData.roleId = val;
+                    }}
                     showSearch
                     filterOption={false}
                     allowClear={!roleSearchLoading.value}
@@ -284,6 +304,10 @@ export default defineComponent({
                     class={styles.col}
                   >
                     <Input.Password
+                      value={formData.password}
+                      onUpdate:value={(val: any) => {
+                        formData.password = val;
+                      }}
                       placeholder={isEdit ? '请输入新密码' : '至少8位，含字母+数字'}
                       allowClear
                     />
@@ -294,12 +318,23 @@ export default defineComponent({
                     class={styles.col}
                     rules={confirmPasswordRules(() => formData.password)}
                   >
-                    <Input.Password placeholder="再次输入密码" allowClear />
+                    <Input.Password
+                      value={formData.confirmPassword}
+                      onUpdate:value={(val: any) => {
+                        formData.confirmPassword = val;
+                      }}
+                      placeholder="再次输入密码"
+                      allowClear
+                    />
                   </Form.Item>
                 </div>
                 {/* 角色：单独一行 */}
                 <Form.Item label="角色" name="roleId" rules={roleRules}>
                   <Select
+                    value={formData.roleId}
+                    onUpdate:value={(val: any) => {
+                      formData.roleId = val;
+                    }}
                     showSearch
                     filterOption={false}
                     allowClear={!roleSearchLoading.value}
-- 
2.52.0


From 15a6d81851f05bbdab7eca673aab57dbb203b92f Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 11:39:51 +0800
Subject: [PATCH 24/25] =?UTF-8?q?fix:=20=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=81=E5=88=86=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/orders/types.ts                       | 21 ++++--
 src/hooks/usePagination.ts                    | 10 +++
 src/pages/events/banner/index.tsx             |  4 +-
 .../events/banner/model/useBannerModel.ts     |  4 +-
 .../list/components/EventAuditModal.tsx       | 20 +++---
 .../list/components/EventDetailModal.tsx      | 10 +--
 src/pages/events/list/index.tsx               |  2 +-
 .../events/list/model/useEventListModel.ts    |  7 +-
 src/pages/events/logs/index.tsx               |  9 ++-
 src/pages/events/logs/model/useLogColumns.ts  |  4 +-
 src/pages/events/logs/model/useLogModel.ts    | 11 ++--
 .../orders/components/OrderDetailModal.tsx    | 13 ++--
 src/pages/events/orders/index.tsx             | 12 +---
 src/pages/events/orders/model/config.ts       |  6 +-
 src/pages/events/orders/model/services.ts     |  4 +-
 .../events/orders/model/useOrderModel.ts      | 66 ++++++++-----------
 src/pages/events/users/index.tsx              |  2 +-
 .../events/users/model/useUserColumns.ts      |  2 +-
 src/pages/events/users/model/useUserModel.ts  | 11 ++--
 .../payments/model/usePaymentsModel.ts        | 16 +++--
 .../wallet/components/WalletDetailModal.tsx   |  6 +-
 src/pages/finance/wallet/index.tsx            |  2 +-
 .../finance/wallet/model/useWalletModel.ts    |  6 +-
 .../components/WithdrawDetailModal.tsx        |  6 +-
 .../withdraw/model/useWithdrawModel.ts        | 12 ++--
 src/pages/system/logs/index.tsx               |  4 +-
 src/pages/system/logs/model/useLogModel.ts    |  5 +-
 .../system/roles/components/UserListModal.tsx |  5 +-
 src/pages/system/roles/index.tsx              |  2 +-
 src/pages/system/roles/model/useRoleModel.ts  |  5 +-
 src/pages/system/users/index.tsx              |  2 +-
 src/pages/system/users/model/useUserModel.ts  |  7 +-
 32 files changed, 157 insertions(+), 139 deletions(-)

diff --git a/src/api/orders/types.ts b/src/api/orders/types.ts
index 540f3db..5040641 100644
--- a/src/api/orders/types.ts
+++ b/src/api/orders/types.ts
@@ -8,7 +8,7 @@ export interface TournamentAdminOrderPageVO {
   /** 订单编号 */
   orderNo: string;
   /** 选手ID */
-  uniqueId: number;
+  uniqueId: string;
   /** 赛事名称 */
   name: string;
   /** 选手名称 */
@@ -36,9 +36,9 @@ export interface TournamentAdminOrderPageVO {
   /** 支付时间；yyyy.MM.dd HH:mm:ss */
   payTime: string;
   /** 订单状态；1=已支付，2=部分退款，3=全部退款，4=已关闭，-1=其他 */
-  orderStatus: number;
+  orderStatus: string;
   /** 退款状态；1=无退款，2=退款成功，3=退款失败，-1=其他 */
-  refundStatus: number;
+  refundStatus: string;
 }
 
 /** 订单列表查询参数 */
@@ -62,11 +62,24 @@ export interface OrderListQueryParams {
   status?: string;
   /**
    * 退款状态
-   * 不传=全部、0=退款失败，1=退款成功
+   * 不传=全部、2=退款成功，3=退款失败
    */
   refundStatus?: string;
 }
 
+/** 订单分页数据（含列表统计字段） */
+export interface OrderPageData extends PageData<TournamentAdminOrderPageVO> {
+  /** 扩展数据 */
+  exData: {
+    /** 总订单金额（已支付） */
+    totalOrderAmount: string;
+    /** 总实付金额 */
+    totalActualAmount: string;
+    /** 总退款金额 */
+    totalRefundAmount: string;
+  };
+}
+
 /** 分页数据 */
 export interface PageData<T> {
   total: number;
diff --git a/src/hooks/usePagination.ts b/src/hooks/usePagination.ts
index d3a0a13..c44340a 100644
--- a/src/hooks/usePagination.ts
+++ b/src/hooks/usePagination.ts
@@ -180,3 +180,13 @@ export function usePagination(options: UsePaginationOptions = {}): UsePagination
     refresh,
   };
 }
+
+/** 将接口返回的分页 total 同步到 pagination（支持 number / 数字字符串，含 0） */
+export function syncPaginationTotal(
+  pagination: Pick<UsePaginationReturn, 'setTotal'>,
+  total: unknown,
+): void {
+  if (total == null || total === '') return;
+  const n = Number(total);
+  if (Number.isFinite(n)) pagination.setTotal(n);
+}
diff --git a/src/pages/events/banner/index.tsx b/src/pages/events/banner/index.tsx
index fdaa669..1e7f042 100644
--- a/src/pages/events/banner/index.tsx
+++ b/src/pages/events/banner/index.tsx
@@ -79,7 +79,7 @@ function renderBodyCell({
 
   // 跳转地址列
   if (column.dataIndex === 'linkUrl') {
-    return <span>{text || '-'}</span>;
+    return <span>{text || '--'}</span>;
   }
 
   // 展示时间列
@@ -100,7 +100,7 @@ function renderBodyCell({
   if (column.key === 'action') {
     const isEnabled = record.status === '1';
     const { canEdit, canToggleStatus, canDelete } = permissions;
-    if (!canEdit && !canToggleStatus && !canDelete) return <span>-</span>;
+    if (!canEdit && !canToggleStatus && !canDelete) return <span>--</span>;
 
     return (
       <Space>
diff --git a/src/pages/events/banner/model/useBannerModel.ts b/src/pages/events/banner/model/useBannerModel.ts
index bc3c47f..0357a5f 100644
--- a/src/pages/events/banner/model/useBannerModel.ts
+++ b/src/pages/events/banner/model/useBannerModel.ts
@@ -243,12 +243,12 @@ export function useBannerModel() {
 
   // ===== 渲染工具 =====
   const renderJumpType = (type: string) => {
-    const info = JUMP_TYPE_MAP[type] || { label: type || '-', tone: 'default' as const };
+    const info = JUMP_TYPE_MAP[type] || { label: type || '--', tone: 'default' as const };
     return h(StatusTag, { label: info.label, tone: info.tone });
   };
 
   const renderStatus = (status: string) => {
-    const info = STATUS_MAP[status] || { label: status || '-', tone: 'default' as const };
+    const info = STATUS_MAP[status] || { label: status || '--', tone: 'default' as const };
     return h(StatusTag, { label: info.label, tone: info.tone, dimmed: info.dimmed });
   };
 
diff --git a/src/pages/events/list/components/EventAuditModal.tsx b/src/pages/events/list/components/EventAuditModal.tsx
index 3a03f9a..892f4d8 100644
--- a/src/pages/events/list/components/EventAuditModal.tsx
+++ b/src/pages/events/list/components/EventAuditModal.tsx
@@ -79,7 +79,7 @@ export default defineComponent({
 
     /** 格式化时间范围 */
     const formatRange = (start: string, end: string) => {
-      if (!start && !end) return '-';
+      if (!start && !end) return '--';
       return `${start || '?'} ~ ${end || '?'}`;
     };
 
@@ -98,25 +98,25 @@ export default defineComponent({
           <div class={styles.section}>
             <div class={styles.sectionTitle}>基础信息</div>
             <Descriptions size="small" bordered column={3} class={styles.desc}>
-              <Descriptions.Item label="赛事名称">{d.name || '-'}</Descriptions.Item>
+              <Descriptions.Item label="赛事名称">{d.name || '--'}</Descriptions.Item>
               <Descriptions.Item label="赛事时间" span={2}>
                 {formatRange(d.startTimeBegin, d.startTimeEnd)}
               </Descriptions.Item>
 
               <Descriptions.Item label="赛事说明" span={3}>
-                {d.descr || '-'}
+                {d.descr || '--'}
               </Descriptions.Item>
 
               <Descriptions.Item label="报名起止时间">
                 {formatRange(d.signupTimeBegin, d.signupTimeEnd)}
               </Descriptions.Item>
               <Descriptions.Item label="取消报名截止时间" span={2}>
-                {d.signupTimeEnd || '-'}
+                {d.signupTimeEnd || '--'}
               </Descriptions.Item>
 
-              <Descriptions.Item label="省市区">{d.venueArea || '-'}</Descriptions.Item>
-              <Descriptions.Item label="地点">{d.venue || '-'}</Descriptions.Item>
-              <Descriptions.Item label="场地编号">{d.venueNo || '-'}</Descriptions.Item>
+              <Descriptions.Item label="省市区">{d.venueArea || '--'}</Descriptions.Item>
+              <Descriptions.Item label="地点">{d.venue || '--'}</Descriptions.Item>
+              <Descriptions.Item label="场地编号">{d.venueNo || '--'}</Descriptions.Item>
 
               <Descriptions.Item label="公开活动">
                 {boolText(d.isPublic, '在首页展示赛事', '非公开')}
@@ -128,15 +128,15 @@ export default defineComponent({
                 {boolText(d.isRequireIdCardImg, '需要提供', '无需提供')}
               </Descriptions.Item>
 
-              <Descriptions.Item label="创建时间">{d.createTime || '-'}</Descriptions.Item>
-              <Descriptions.Item label="创建人">{d.createNickname || '-'}</Descriptions.Item>
+              <Descriptions.Item label="创建时间">{d.createTime || '--'}</Descriptions.Item>
+              <Descriptions.Item label="创建人">{d.createNickname || '--'}</Descriptions.Item>
               <Descriptions.Item label="状态">待审核</Descriptions.Item>
               <Descriptions.Item label="报名人数">{d.signupCount || '0'}</Descriptions.Item>
               <Descriptions.Item label="取消报名人数" span={1}>
                 {d.dropoutCount || '0'}
               </Descriptions.Item>
 
-              <Descriptions.Item label="最大人数">{d.totalLimit || '-'}</Descriptions.Item>
+              <Descriptions.Item label="最大人数">{d.totalLimit || '--'}</Descriptions.Item>
               <Descriptions.Item label="对岸数量">{d.matchTotalCount || '0'}</Descriptions.Item>
               <Descriptions.Item label="已完成对岸数量">{d.matchCount || '0'}</Descriptions.Item>
             </Descriptions>
diff --git a/src/pages/events/list/components/EventDetailModal.tsx b/src/pages/events/list/components/EventDetailModal.tsx
index 69f18a2..7584bc6 100644
--- a/src/pages/events/list/components/EventDetailModal.tsx
+++ b/src/pages/events/list/components/EventDetailModal.tsx
@@ -32,7 +32,7 @@ const PAGE_SIZE = 10;
 /** 渲染身份证图片（cover 填充，与封面显示方式一致） */
 const renderIdImages = (imgList: string[], singleImg: string) => {
   const urls = imgList.length > 0 ? imgList : singleImg ? [singleImg] : [];
-  if (urls.length === 0) return <span>-</span>;
+  if (urls.length === 0) return <span>--</span>;
   return (
     <Image.PreviewGroup>
       <div class={styles.idImageGrid}>
@@ -63,14 +63,14 @@ const PLAYER_COLUMNS = [
     key: 'idCard',
     width: 180,
     customRender: ({ record }: { record?: TournamentAdminInfoSignupVO }) =>
-      record?.idCard ? record.idCard : <span>-</span>,
+      record?.idCard ? record.idCard : <span>--</span>,
   },
   {
     title: '证件图片',
     key: 'idCardImgs',
     width: 280,
     customRender: ({ record }: { record?: TournamentAdminInfoSignupVO }) =>
-      record ? renderIdImages(record.idCardImgList || [], record.idCardImg || '') : <span>-</span>,
+      record ? renderIdImages(record.idCardImgList || [], record.idCardImg || '') : <span>--</span>,
   },
 ];
 
@@ -193,7 +193,7 @@ export default defineComponent({
                 <Descriptions.Item label="省市区">{detail.value.venueArea}</Descriptions.Item>
                 <Descriptions.Item label="地点">{detail.value.venue}</Descriptions.Item>
                 <Descriptions.Item label="场地编号" class={styles.statCell}>
-                  {detail.value.venueNo || '-'}
+                  {detail.value.venueNo || '--'}
                 </Descriptions.Item>
 
                 <Descriptions.Item label="公开活动">
@@ -217,7 +217,7 @@ export default defineComponent({
                   label="最大人数"
                   class={[styles.statCell, styles.statCellNoWrap]}
                 >
-                  {detail.value.totalLimit || '-'}
+                  {detail.value.totalLimit || '--'}
                 </Descriptions.Item>
 
                 <Descriptions.Item label="总对阵数">
diff --git a/src/pages/events/list/index.tsx b/src/pages/events/list/index.tsx
index eb2a026..f817754 100644
--- a/src/pages/events/list/index.tsx
+++ b/src/pages/events/list/index.tsx
@@ -159,7 +159,7 @@ export default defineComponent({
                 查看
               </a>
             ) : (
-              <span>-</span>
+              <span>--</span>
             )}
           </>
         ),
diff --git a/src/pages/events/list/model/useEventListModel.ts b/src/pages/events/list/model/useEventListModel.ts
index 3c07833..6059011 100644
--- a/src/pages/events/list/model/useEventListModel.ts
+++ b/src/pages/events/list/model/useEventListModel.ts
@@ -3,7 +3,7 @@ import { Modal, message } from 'ant-design-vue';
 import { useState, useDebounce } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
 import { useEffect } from '@/hooks/useEffect';
-import { usePagination } from '@/hooks/usePagination';
+import { usePagination, syncPaginationTotal } from '@/hooks/usePagination';
 import { hasValue, isEmptyValue, safeTransform } from '@/utils';
 import type { TournamentAdminVO, EventListQueryParams, PageData, ApiResult } from './services';
 import { getEventList, toggleEventOnline } from './services';
@@ -78,9 +78,8 @@ export function useEventListModel() {
 
   // 同步分页总条数
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
-  }, [data]);
+    syncPaginationTotal(pagination, listData.value?.total);
+  }, [listData]);
 
   const hasFilter = computed(() => {
     const f = filterForm;
diff --git a/src/pages/events/logs/index.tsx b/src/pages/events/logs/index.tsx
index 431f049..087687c 100644
--- a/src/pages/events/logs/index.tsx
+++ b/src/pages/events/logs/index.tsx
@@ -30,11 +30,10 @@ const LogContentCell = defineComponent({
     };
     let observer: ResizeObserver | null = null;
     useEffect(() => {
-      const el = textRef.value;
-      if (!el) return;
+      if (!textRef.value) return;
       nextTick(checkOverflow);
       observer = new ResizeObserver(checkOverflow);
-      observer.observe(el);
+      observer.observe(textRef.value);
       return () => {
         observer?.disconnect();
         observer = null;
@@ -96,13 +95,13 @@ export default defineComponent({
     }) => {
       if (column.key === 'content') {
         const raw = text || '';
-        return raw ? <LogContentCell text={raw} /> : <span>-</span>;
+        return raw ? <LogContentCell text={raw} /> : <span>--</span>;
       }
       // 有 customRender 的列使用其渲染函数（如操作类型/操作来源的代码→中文映射）
       if (column.customRender) {
         return column.customRender({ text, record, index, column });
       }
-      return <span>{text || '-'}</span>;
+      return <span>{text || '--'}</span>;
     };
 
     return () => (
diff --git a/src/pages/events/logs/model/useLogColumns.ts b/src/pages/events/logs/model/useLogColumns.ts
index c0a982d..14759e1 100644
--- a/src/pages/events/logs/model/useLogColumns.ts
+++ b/src/pages/events/logs/model/useLogColumns.ts
@@ -1,9 +1,9 @@
 import { type VNodeChild } from 'vue';
 import { ACTION_TYPE_MAP, ACTION_SOURCE_MAP } from './config';
 
-const renderType = (text: string): string => ACTION_TYPE_MAP[text] || text || '-';
+const renderType = (text: string): string => ACTION_TYPE_MAP[text] || text || '--';
 
-const renderSource = (text: string): string => ACTION_SOURCE_MAP[text] || text || '-';
+const renderSource = (text: string): string => ACTION_SOURCE_MAP[text] || text || '--';
 
 /**
  * 操作日志页 - 表格列配置（视图层）
diff --git a/src/pages/events/logs/model/useLogModel.ts b/src/pages/events/logs/model/useLogModel.ts
index b71f0c2..adad4fd 100644
--- a/src/pages/events/logs/model/useLogModel.ts
+++ b/src/pages/events/logs/model/useLogModel.ts
@@ -2,7 +2,11 @@ import { computed, reactive, toRef, Ref, type UnwrapRef } from 'vue';
 import { useDebounce } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
 import { useEffect } from '@/hooks/useEffect';
-import { usePagination, type UsePaginationReturn } from '@/hooks/usePagination';
+import {
+  usePagination,
+  syncPaginationTotal,
+  type UsePaginationReturn,
+} from '@/hooks/usePagination';
 import { hasValue, isEmptyValue, safeTransform } from '@/utils';
 import {
   getOperationLogs,
@@ -102,9 +106,8 @@ export function useLogModel() {
 
   // 同步分页总条数
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
-  }, [data]);
+    syncPaginationTotal(pagination, listData.value?.total);
+  }, [listData]);
 
   const hasFilter = computed(() => {
     return (
diff --git a/src/pages/events/orders/components/OrderDetailModal.tsx b/src/pages/events/orders/components/OrderDetailModal.tsx
index 1bb44f4..0447451 100644
--- a/src/pages/events/orders/components/OrderDetailModal.tsx
+++ b/src/pages/events/orders/components/OrderDetailModal.tsx
@@ -24,7 +24,7 @@ const GENDER_MAP: Record<string, string> = { '1': '男', '2': '女' };
 const formatGender = (v: string) => GENDER_MAP[v] ?? v;
 const formatMoney = (v: string) => {
   const n = parseFloat(v);
-  return isNaN(n) ? '-' : `${n.toFixed(2)}`;
+  return isNaN(n) ? '--' : `${n.toFixed(2)}`;
 };
 
 const PLAYER_COLUMNS = [
@@ -55,7 +55,7 @@ const PLAYER_COLUMNS = [
         : record.idCardImg
           ? [record.idCardImg]
           : [];
-      if (!urls.length) return <span>-</span>;
+      if (!urls.length) return <span>--</span>;
       return (
         <Space>
           {urls.map((src) => (
@@ -102,7 +102,8 @@ const PLAYER_COLUMNS = [
     key: 'refundAmount',
     width: 100,
     align: 'right' as const,
-    customRender: ({ text }: { text: string }) => (text === '-' || !text ? '-' : formatMoney(text)),
+    customRender: ({ text }: { text: string }) =>
+      text === '--' || !text ? '--' : formatMoney(text),
   },
 ];
 
@@ -160,7 +161,7 @@ export default defineComponent({
       return records.some((r) => {
         if (!r) return false;
         const hasRefundAmount = parseFloat(r.refundAmount || '0') > 0;
-        const hasRefundTime = r.refundTime && r.refundTime !== '-';
+        const hasRefundTime = r.refundTime && r.refundTime !== '--';
         return hasRefundAmount && !hasRefundTime;
       });
     });
@@ -329,11 +330,11 @@ export default defineComponent({
                                   </span>
                                 </div>
                                 <div>申请时间：{r.refundApplyTime}</div>
-                                <div>完款时间：{r.refundTime || '-'}</div>
+                                <div>完款时间：{r.refundTime || '--'}</div>
                               </div>
                               <div class={styles.refundCol}>
                                 <div>退款方式：{r.refundMethod}</div>
-                                <div>第三方退款单号：{r.refundOutTradeNo || '-'}</div>
+                                <div>第三方退款单号：{r.refundOutTradeNo || '--'}</div>
                                 <div>已退金额：¥{formatMoney(r.refundedAmount)}</div>
                               </div>
                             </div>
diff --git a/src/pages/events/orders/index.tsx b/src/pages/events/orders/index.tsx
index 5a97b67..7257675 100644
--- a/src/pages/events/orders/index.tsx
+++ b/src/pages/events/orders/index.tsx
@@ -230,21 +230,15 @@ export default defineComponent({
           <div class={pageStyles.summary}>
             <span class={pageStyles.summaryItem}>
               <span class={pageStyles.summaryLabel}>总订单金额（已支付）：</span>
-              <span class={pageStyles.summaryValue}>
-                {summary.value.totalOrderAmount.toFixed(2)}元
-              </span>
+              <span class={pageStyles.summaryValue}>{summary.value.totalOrderAmount}元</span>
             </span>
             <span class={pageStyles.summaryItem}>
               <span class={pageStyles.summaryLabel}>总实付金额：</span>
-              <span class={pageStyles.summaryValue}>
-                {summary.value.totalPaidAmount.toFixed(2)}元
-              </span>
+              <span class={pageStyles.summaryValue}>{summary.value.totalActualAmount}元</span>
             </span>
             <span class={pageStyles.summaryItem}>
               <span class={pageStyles.summaryLabel}>总退款金额：</span>
-              <span class={pageStyles.summaryValue}>
-                {summary.value.totalRefundAmount.toFixed(2)}元
-              </span>
+              <span class={pageStyles.summaryValue}>{summary.value.totalRefundAmount}元</span>
             </span>
           </div>
 
diff --git a/src/pages/events/orders/model/config.ts b/src/pages/events/orders/model/config.ts
index e87347c..40370a6 100644
--- a/src/pages/events/orders/model/config.ts
+++ b/src/pages/events/orders/model/config.ts
@@ -49,9 +49,9 @@ export const ORDER_STATUS_OPTIONS = [
   { value: '4', label: '超时关闭' },
 ] as const;
 
-/** 退款状态选项（value 对应 API refundStatus: 不传=全部、0=退款失败，1=退款成功） */
+/** 退款状态选项（value 对应 API refundStatus: 不传=全部、2=退款成功，3=退款失败） */
 export const REFUND_STATUS_OPTIONS = [
   { value: '', label: '全部' },
-  { value: '1', label: '退款成功' },
-  { value: '0', label: '退款失败' },
+  { value: '2', label: '退款成功' },
+  { value: '3', label: '退款失败' },
 ] as const;
diff --git a/src/pages/events/orders/model/services.ts b/src/pages/events/orders/model/services.ts
index 8ec7837..bc6a692 100644
--- a/src/pages/events/orders/model/services.ts
+++ b/src/pages/events/orders/model/services.ts
@@ -11,6 +11,7 @@ import type {
   TournamentAdminOrderPageVO,
   TournamentAdminOrderInfoVO,
   TournamentAdminOrderInfoPageVO,
+  OrderPageData,
   PageData,
   ApiResult,
 } from '@/api/orders/types';
@@ -24,6 +25,7 @@ export type {
   OrderDetailQueryParams,
   OrderPlayerListQueryParams,
   RetryRefundParams,
+  OrderPageData,
   PageData,
   ApiResult,
 } from '@/api/orders/types';
@@ -43,7 +45,7 @@ const retryRefund = '/admin/manager/order/retryRefund';
 /** 订单管理 - 订单分页 */
 export async function getOrderList(
   params: OrderListQueryParams,
-): Promise<ApiResult<PageData<TournamentAdminOrderPageVO>>> {
+): Promise<ApiResult<OrderPageData>> {
   return get(orderList, params as Record<string, any>);
 }
 
diff --git a/src/pages/events/orders/model/useOrderModel.ts b/src/pages/events/orders/model/useOrderModel.ts
index 0f78f08..b148b3d 100644
--- a/src/pages/events/orders/model/useOrderModel.ts
+++ b/src/pages/events/orders/model/useOrderModel.ts
@@ -1,15 +1,14 @@
 import { computed, reactive, toRef, Ref, h } from 'vue';
-import Big from 'big.js';
 import { StatusTag, type StatusTagTone } from '@/components';
 import { useDebounce } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
 import { useEffect } from '@/hooks/useEffect';
-import { usePagination } from '@/hooks/usePagination';
+import { usePagination, syncPaginationTotal } from '@/hooks/usePagination';
 import { hasValue, isEmptyValue, safeTransform } from '@/utils';
 import type {
   TournamentAdminOrderPageVO,
   OrderListQueryParams,
-  PageData,
+  OrderPageData,
   ApiResult,
 } from './services';
 import { getOrderList } from './services';
@@ -23,18 +22,18 @@ import {
 export { ORDER_STATUS_OPTIONS, REFUND_STATUS_OPTIONS };
 
 /** 订单状态 StatusTag 映射 */
-const ORDER_STATUS_MAP: Record<number, { label: string; tone: StatusTagTone }> = {
-  1: { label: '支付成功', tone: 'success' },
-  2: { label: '部分退款', tone: 'orange' },
-  3: { label: '全部退款', tone: 'primary' },
-  4: { label: '已关闭', tone: 'default' },
+const ORDER_STATUS_MAP: Record<string, { label: string; tone: StatusTagTone }> = {
+  '1': { label: '支付成功', tone: 'success' },
+  '2': { label: '部分退款', tone: 'orange' },
+  '3': { label: '全部退款', tone: 'primary' },
+  '4': { label: '已关闭', tone: 'default' },
 };
 
 /** 退款状态 StatusTag 映射 */
-const REFUND_STATUS_MAP: Record<number, { label: string; tone: StatusTagTone }> = {
-  1: { label: '无退款', tone: 'default' },
-  2: { label: '退款成功', tone: 'success' },
-  3: { label: '退款失败', tone: 'danger' },
+const REFUND_STATUS_MAP: Record<string, { label: string; tone: StatusTagTone }> = {
+  '1': { label: '无退款', tone: 'default' },
+  '2': { label: '退款成功', tone: 'success' },
+  '3': { label: '退款失败', tone: 'danger' },
 };
 
 /**
@@ -82,12 +81,12 @@ export function useOrderModel() {
     data,
     loading,
     run: fetchList,
-  } = useRequest<ApiResult<PageData<TournamentAdminOrderPageVO>>>(
-    () => getOrderList(buildQueryParams()),
-    { refreshDeps: [], formatResult: (res) => res },
-  );
+  } = useRequest<ApiResult<OrderPageData>>(() => getOrderList(buildQueryParams()), {
+    refreshDeps: [],
+    formatResult: (res) => res,
+  });
 
-  const listData = computed<PageData<TournamentAdminOrderPageVO> | undefined>(() => {
+  const listData = computed<OrderPageData | undefined>(() => {
     const res = data.value;
     return res ? (res as any).data : undefined;
   });
@@ -95,26 +94,16 @@ export function useOrderModel() {
   const dataSource = computed(() => listData.value?.list || []);
 
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
-  }, [data]);
+    syncPaginationTotal(pagination, listData.value?.total);
+  }, [listData]);
 
+  /** 金额汇总（API 直接返回，无需前端累加） */
   const summary = computed(() => {
-    const list = listData.value?.list || [];
-    let totalOrder = new Big(0);
-    let totalPaid = new Big(0);
-    let totalRefund = new Big(0);
-
-    for (const item of list) {
-      totalOrder = totalOrder.plus(new Big(item.creatorSignupFee || 0));
-      totalPaid = totalPaid.plus(new Big(item.creatorSignupFeeActual || 0));
-      totalRefund = totalRefund.plus(new Big(item.creatorSignupFeeRefund || 0));
-    }
-
+    const d = listData.value;
     return {
-      totalOrderAmount: totalOrder.toNumber(),
-      totalPaidAmount: totalPaid.toNumber(),
-      totalRefundAmount: totalRefund.toNumber(),
+      totalOrderAmount: d?.exData?.totalOrderAmount || '0',
+      totalActualAmount: d?.exData?.totalActualAmount || '0',
+      totalRefundAmount: d?.exData?.totalRefundAmount || '0',
     };
   });
 
@@ -189,9 +178,9 @@ export function useOrderModel() {
       dataIndex: 'orderStatus',
       key: 'orderStatus',
       width: 100,
-      customRender: ({ text }: { text: number }) => {
+      customRender: ({ text }: { text: string }) => {
         const info = ORDER_STATUS_MAP[text] || {
-          label: String(text ?? '-'),
+          label: String(text ?? '--'),
           tone: 'default' as const,
         };
         return h(StatusTag, { label: info.label, tone: info.tone });
@@ -203,9 +192,8 @@ export function useOrderModel() {
       key: 'refundStatus',
       width: 100,
       align: 'center' as const,
-      customRender: ({ text }: { text: number }) => {
-        if (text === 1) return h('span', '-');
-        const info = REFUND_STATUS_MAP[text] || { label: String(text), tone: 'default' as const };
+      customRender: ({ text }: { text: string }) => {
+        const info = REFUND_STATUS_MAP[text] || { label: '--', tone: 'default' as const };
         return h(StatusTag, { label: info.label, tone: info.tone });
       },
     },
diff --git a/src/pages/events/users/index.tsx b/src/pages/events/users/index.tsx
index 9548cc8..231a01b 100644
--- a/src/pages/events/users/index.tsx
+++ b/src/pages/events/users/index.tsx
@@ -36,7 +36,7 @@ export default defineComponent({
 
     /** 渲染操作列 */
     const renderAction = (record: any) => {
-      if (!canToggleStatus) return <span>-</span>;
+      if (!canToggleStatus) return <span>--</span>;
 
       const isActive = record.status === '1';
       return (
diff --git a/src/pages/events/users/model/useUserColumns.ts b/src/pages/events/users/model/useUserColumns.ts
index e84635e..96e0d9d 100644
--- a/src/pages/events/users/model/useUserColumns.ts
+++ b/src/pages/events/users/model/useUserColumns.ts
@@ -62,7 +62,7 @@ export function useUserColumns() {
       align: 'center' as const,
       customRender: ({ text }: { text: string[] }): VNodeChild => {
         const imgList = Array.isArray(text) ? text : [];
-        if (imgList.length === 0) return '-';
+        if (imgList.length === 0) return '--';
         return h(
           Space,
           { size: 4 },
diff --git a/src/pages/events/users/model/useUserModel.ts b/src/pages/events/users/model/useUserModel.ts
index 883a746..76eaaef 100644
--- a/src/pages/events/users/model/useUserModel.ts
+++ b/src/pages/events/users/model/useUserModel.ts
@@ -3,7 +3,11 @@ import { Modal, message } from 'ant-design-vue';
 import { useState, useDebounce } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
 import { useEffect } from '@/hooks/useEffect';
-import { usePagination, type UsePaginationReturn } from '@/hooks/usePagination';
+import {
+  usePagination,
+  syncPaginationTotal,
+  type UsePaginationReturn,
+} from '@/hooks/usePagination';
 import { hasValue, isEmptyValue, safeTransform } from '@/utils';
 import {
   getUserList,
@@ -94,9 +98,8 @@ export function useUserModel() {
 
   // 同步分页总条数
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
-  }, [data]);
+    syncPaginationTotal(pagination, listData.value?.total);
+  }, [listData]);
 
   // ===== 计算属性 =====
   const hasFilter = computed(() => {
diff --git a/src/pages/finance/payments/model/usePaymentsModel.ts b/src/pages/finance/payments/model/usePaymentsModel.ts
index 7e47d99..27e31bc 100644
--- a/src/pages/finance/payments/model/usePaymentsModel.ts
+++ b/src/pages/finance/payments/model/usePaymentsModel.ts
@@ -1,5 +1,12 @@
 import { computed, reactive, toRef, Ref } from 'vue';
-import { useDebounce, useThrottleFn, useRequest, usePagination, useEffect } from '@/hooks';
+import {
+  useDebounce,
+  useThrottleFn,
+  useRequest,
+  usePagination,
+  useEffect,
+  syncPaginationTotal,
+} from '@/hooks';
 import { getPaymentFlowList, type PaymentFlowVO, type PaymentFlowQueryParams } from './services';
 import dayjs from 'dayjs';
 
@@ -81,9 +88,8 @@ export function usePaymentsModel() {
 
   // 同步 total 到 pagination
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
-  }, [data]);
+    syncPaginationTotal(pagination, listData.value?.total);
+  }, [listData]);
 
   // ===== 表格列（dataIndex 对齐 API） =====
   const columns = [
@@ -94,7 +100,7 @@ export function usePaymentsModel() {
       dataIndex: 'type',
       key: 'type',
       width: 110,
-      customRender: ({ text }: { text: number }) => PAYMENT_TYPE_MAP[text] || text || '-',
+      customRender: ({ text }: { text: number }) => PAYMENT_TYPE_MAP[text] || text || '--',
     },
     { title: '用户昵称', dataIndex: 'nickname', key: 'nickname', width: 120 },
     { title: '手机号', dataIndex: 'phone', key: 'phone', width: 140 },
diff --git a/src/pages/finance/wallet/components/WalletDetailModal.tsx b/src/pages/finance/wallet/components/WalletDetailModal.tsx
index c03ecad..1c35b01 100644
--- a/src/pages/finance/wallet/components/WalletDetailModal.tsx
+++ b/src/pages/finance/wallet/components/WalletDetailModal.tsx
@@ -113,7 +113,7 @@ export default defineComponent({
         dataIndex: 'type',
         key: 'type',
         width: 120,
-        customRender: ({ text }: { text: number }) => TRANSACTION_TYPE_MAP[text] || text || '-',
+        customRender: ({ text }: { text: number }) => TRANSACTION_TYPE_MAP[text] || text || '--',
       },
       {
         title: '金额',
@@ -162,14 +162,14 @@ export default defineComponent({
         dataIndex: 'freezeTime',
         key: 'freezeTime',
         width: 140,
-        customRender: ({ text }: { text: string }) => text || '-',
+        customRender: ({ text }: { text: string }) => text || '--',
       },
       {
         title: '解冻时间',
         dataIndex: 'unfreezeTime',
         key: 'unfreezeTime',
         width: 140,
-        customRender: ({ text }: { text: string }) => text || '-',
+        customRender: ({ text }: { text: string }) => text || '--',
       },
       {
         title: '关联单号',
diff --git a/src/pages/finance/wallet/index.tsx b/src/pages/finance/wallet/index.tsx
index 071fbda..d7e7015 100644
--- a/src/pages/finance/wallet/index.tsx
+++ b/src/pages/finance/wallet/index.tsx
@@ -30,7 +30,7 @@ function renderBodyCell({
   canViewDetail: boolean;
 }) {
   if (column.key === 'action') {
-    if (!canViewDetail) return <span>-</span>;
+    if (!canViewDetail) return <span>--</span>;
 
     return (
       <Button type="link" size="small" onClick={() => onViewDetail(record)}>
diff --git a/src/pages/finance/wallet/model/useWalletModel.ts b/src/pages/finance/wallet/model/useWalletModel.ts
index a309560..d13ddf5 100644
--- a/src/pages/finance/wallet/model/useWalletModel.ts
+++ b/src/pages/finance/wallet/model/useWalletModel.ts
@@ -6,6 +6,7 @@ import {
   useRequest,
   usePagination,
   useEffect,
+  syncPaginationTotal,
 } from '@/hooks';
 import { getWalletList, type WalletSummaryVO, type WalletQueryParams } from './services';
 
@@ -111,9 +112,8 @@ export function useWalletModel() {
 
   // 同步 total 到 pagination
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
-  }, [data]);
+    syncPaginationTotal(pagination, listData.value?.total);
+  }, [listData]);
 
   // ===== 详情弹窗状态 =====
   const [detailVisible, setDetailVisible] = useState<boolean>(false);
diff --git a/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx b/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
index 7565a18..1bd89d2 100644
--- a/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
+++ b/src/pages/finance/withdraw/components/WithdrawDetailModal.tsx
@@ -153,14 +153,14 @@ export default defineComponent({
     const renderItem = (label: string, value: any, isBold = false) => (
       <div class={styles.descItem}>
         <span class={styles.descLabel}>{label}</span>
-        <span class={[styles.descValue, isBold ? styles.descValueBold : '']}>{value || '-'}</span>
+        <span class={[styles.descValue, isBold ? styles.descValueBold : '']}>{value || '--'}</span>
       </div>
     );
 
     /** 渲染内容区（加载完成后） */
     const renderContent = () => {
       const d = detail.value!;
-      const bankCardTypeLabel = d.bankCardType === 1 ? '个人' : d.bankCardType || '-';
+      const bankCardTypeLabel = d.bankCardType === 1 ? '个人' : d.bankCardType || '--';
       const isPending = d.auditStatus == 0;
 
       return (
@@ -200,7 +200,7 @@ export default defineComponent({
           <div class={styles.section}>
             <div class={styles.sectionTitle}>支付信息</div>
             <div class={styles.descGrid}>
-              {renderItem('到账支付时间：', d.payTime || '-')}
+              {renderItem('到账支付时间：', d.payTime || '--')}
               {renderItem('订单号：', d.orderNo)}
             </div>
           </div>
diff --git a/src/pages/finance/withdraw/model/useWithdrawModel.ts b/src/pages/finance/withdraw/model/useWithdrawModel.ts
index badb5c1..f8c9bcd 100644
--- a/src/pages/finance/withdraw/model/useWithdrawModel.ts
+++ b/src/pages/finance/withdraw/model/useWithdrawModel.ts
@@ -7,6 +7,7 @@ import {
   useRequest,
   usePagination,
   useEffect,
+  syncPaginationTotal,
 } from '@/hooks';
 import { getWithdrawList, type WithdrawVO, type WithdrawQueryParams } from './services';
 
@@ -47,7 +48,7 @@ const PAY_STATUS_MAP: Record<number, { label: string; tone: StatusTagTone }> = {
 /** 渲染审核状态 StatusTag */
 export function renderAuditStatus(status: number) {
   const info = AUDIT_STATUS_MAP[status] || {
-    label: String(status ?? '-'),
+    label: String(status ?? '--'),
     tone: 'default' as const,
   };
   return h(StatusTag, { label: info.label, tone: info.tone });
@@ -61,12 +62,12 @@ export function renderPayStatus(status: number) {
 
 /** 获取审核状态纯文本（详情弹窗用） */
 export function getAuditStatusText(status: number): string {
-  return AUDIT_STATUS_MAP[status]?.label ?? String(status ?? '-');
+  return AUDIT_STATUS_MAP[status]?.label ?? String(status ?? '--');
 }
 
 /** 获取到账状态纯文本（详情弹窗用） */
 export function getPayStatusText(status: number): string {
-  return PAY_STATUS_MAP[status]?.label ?? String(status ?? '-');
+  return PAY_STATUS_MAP[status]?.label ?? String(status ?? '--');
 }
 
 // ============================================================
@@ -132,9 +133,8 @@ export function useWithdrawModel() {
 
   // 同步 total 到 pagination
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
-  }, [data]);
+    syncPaginationTotal(pagination, listData.value?.total);
+  }, [listData]);
 
   // ===== 审核弹窗状态 =====
   const [auditVisible, setAuditVisible] = useState<boolean>(false);
diff --git a/src/pages/system/logs/index.tsx b/src/pages/system/logs/index.tsx
index 1d64eff..4db4962 100644
--- a/src/pages/system/logs/index.tsx
+++ b/src/pages/system/logs/index.tsx
@@ -11,9 +11,9 @@ const { RangePicker } = DatePicker;
  */
 function renderBodyCell({ column, text }: { column: any; text: any }) {
   if (column.key === 'type') {
-    return <span>{ACTION_TYPE_MAP[text as number] || text || '-'}</span>;
+    return <span>{ACTION_TYPE_MAP[text as number] || text || '--'}</span>;
   }
-  return <span>{text || '-'}</span>;
+  return <span>{text || '--'}</span>;
 }
 
 /**
diff --git a/src/pages/system/logs/model/useLogModel.ts b/src/pages/system/logs/model/useLogModel.ts
index a8df446..03862d5 100644
--- a/src/pages/system/logs/model/useLogModel.ts
+++ b/src/pages/system/logs/model/useLogModel.ts
@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import { useDebounce, useThrottleFn } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
 import { useEffect } from '@/hooks/useEffect';
-import { usePagination } from '@/hooks/usePagination';
+import { usePagination, syncPaginationTotal } from '@/hooks/usePagination';
 import {
   getOperationLogList,
   type SysOperationLogVO,
@@ -100,8 +100,7 @@ export function useLogModel() {
   });
 
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
+    syncPaginationTotal(pagination, (data.value as any)?.data?.total);
   }, [data]);
 
   // ===== 表格列配置（字段名对齐 API） =====
diff --git a/src/pages/system/roles/components/UserListModal.tsx b/src/pages/system/roles/components/UserListModal.tsx
index ab72ea7..9370dc1 100644
--- a/src/pages/system/roles/components/UserListModal.tsx
+++ b/src/pages/system/roles/components/UserListModal.tsx
@@ -44,7 +44,10 @@ export default defineComponent({
         width: 90,
         align: 'center' as const,
         customRender: ({ text }: { text: number }) => {
-          const info = STATUS_MAP[text] || { label: String(text ?? '-'), tone: 'default' as const };
+          const info = STATUS_MAP[text] || {
+            label: String(text ?? '--'),
+            tone: 'default' as const,
+          };
           return h(StatusTag, { label: info.label, tone: info.tone });
         },
       },
diff --git a/src/pages/system/roles/index.tsx b/src/pages/system/roles/index.tsx
index 9ae6ce2..907b4e2 100644
--- a/src/pages/system/roles/index.tsx
+++ b/src/pages/system/roles/index.tsx
@@ -40,7 +40,7 @@ function renderBodyCell({
 
   if (column.key === 'action') {
     const { canEdit, canDelete } = permissions;
-    if (!canEdit && !canDelete) return <span>-</span>;
+    if (!canEdit && !canDelete) return <span>--</span>;
 
     return (
       <Space>
diff --git a/src/pages/system/roles/model/useRoleModel.ts b/src/pages/system/roles/model/useRoleModel.ts
index 706cbf3..27adaec 100644
--- a/src/pages/system/roles/model/useRoleModel.ts
+++ b/src/pages/system/roles/model/useRoleModel.ts
@@ -3,7 +3,7 @@ import { message } from 'ant-design-vue';
 import { useState, useDebounce, useThrottleFn } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
 import { useEffect } from '@/hooks/useEffect';
-import { usePagination } from '@/hooks/usePagination';
+import { usePagination, syncPaginationTotal } from '@/hooks/usePagination';
 import {
   getRoleList,
   saveRole,
@@ -61,8 +61,7 @@ export function useRoleModel() {
   });
 
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
+    syncPaginationTotal(pagination, (data.value as any)?.data?.total);
   }, [data]);
 
   // ===== 弹窗状态 =====
diff --git a/src/pages/system/users/index.tsx b/src/pages/system/users/index.tsx
index 7a152ce..0407f74 100644
--- a/src/pages/system/users/index.tsx
+++ b/src/pages/system/users/index.tsx
@@ -41,7 +41,7 @@ function renderBodyCell({
   if (column.key === 'action') {
     const isActive = record.status === '1';
     const { canEdit, canToggleStatus } = permissions;
-    if (!canEdit && !canToggleStatus) return <span>-</span>;
+    if (!canEdit && !canToggleStatus) return <span>--</span>;
 
     return (
       <Space>
diff --git a/src/pages/system/users/model/useUserModel.ts b/src/pages/system/users/model/useUserModel.ts
index 558abe9..a69242f 100644
--- a/src/pages/system/users/model/useUserModel.ts
+++ b/src/pages/system/users/model/useUserModel.ts
@@ -4,7 +4,7 @@ import { StatusTag, type StatusTagTone } from '@/components';
 import { useDebounce, useThrottleFn } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
 import { useEffect } from '@/hooks/useEffect';
-import { usePagination } from '@/hooks/usePagination';
+import { usePagination, syncPaginationTotal } from '@/hooks/usePagination';
 import {
   getUserList,
   type TournamentAdminUserVO,
@@ -102,8 +102,7 @@ export function useUserModel() {
   });
 
   useEffect(() => {
-    const total = (data.value as any)?.data?.total;
-    if (total !== undefined) pagination.setTotal(total);
+    syncPaginationTotal(pagination, (data.value as any)?.data?.total);
   }, [data]);
 
   // ===== 表格列配置 =====
@@ -118,7 +117,7 @@ export function useUserModel() {
       width: 100,
       align: 'center' as const,
       customRender: ({ text }: { text: string }) => {
-        const info = STATUS_MAP[text] || { label: text || '-', tone: 'default' as const };
+        const info = STATUS_MAP[text] || { label: text || '--', tone: 'default' as const };
         return h(StatusTag, { label: info.label, tone: info.tone });
       },
     },
-- 
2.52.0


From 130a253b83c9c4d320d5a50f6fd722badee9fc6f Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Thu, 6 Aug 2026 11:56:37 +0800
Subject: [PATCH 25/25] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E5=88=86setTime=200=20=E7=9A=84=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChangePasswordModal/index.tsx           | 4 ++--
 src/pages/events/banner/components/BannerFormModal.tsx | 4 ++--
 src/pages/events/list/model/useEventListModel.ts       | 4 ++--
 src/pages/events/orders/model/useOrderModel.ts         | 4 ++--
 src/pages/finance/payments/model/usePaymentsModel.ts   | 4 ++--
 src/pages/finance/wallet/model/useWalletModel.ts       | 4 ++--
 src/pages/finance/withdraw/model/useWithdrawModel.ts   | 4 ++--
 src/pages/system/logs/model/useLogModel.ts             | 4 ++--
 src/pages/system/roles/components/RoleFormModal.tsx    | 4 ++--
 src/pages/system/roles/model/useRoleModel.ts           | 4 ++--
 src/pages/system/users/components/UserFormModal.tsx    | 4 ++--
 src/pages/system/users/model/useUserModel.ts           | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/ChangePasswordModal/index.tsx b/src/components/ChangePasswordModal/index.tsx
index 7c0f258..faef592 100644
--- a/src/components/ChangePasswordModal/index.tsx
+++ b/src/components/ChangePasswordModal/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive } from 'vue';
+import { defineComponent, ref, reactive, nextTick } from 'vue';
 import { useEffect } from '@/hooks';
 import { Modal, Form, Input, Button, message } from 'ant-design-vue';
 import { TIPS_TEXT, newPasswordRules, confirmNewPasswordRules } from './controller';
@@ -34,7 +34,7 @@ export default defineComponent({
     useEffect(() => {
       if (props.visible) {
         Object.assign(formData, getDefaultForm());
-        setTimeout(() => formRef.value?.clearValidate(), 0);
+        nextTick().then(() => formRef.value?.clearValidate());
       }
     }, [() => props.visible]);
 
diff --git a/src/pages/events/banner/components/BannerFormModal.tsx b/src/pages/events/banner/components/BannerFormModal.tsx
index be5777a..e662968 100644
--- a/src/pages/events/banner/components/BannerFormModal.tsx
+++ b/src/pages/events/banner/components/BannerFormModal.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, computed } from 'vue';
+import { defineComponent, ref, reactive, computed, nextTick } from 'vue';
 import { useEffect, useState } from '@/hooks';
 import {
   Modal,
@@ -305,7 +305,7 @@ export default defineComponent({
         initFormFromRecord(props.record);
         setCropperVisible(false);
         setUploadImageUrl('');
-        setTimeout(() => formRef.value?.clearValidate(), 0);
+        nextTick().then(() => formRef.value?.clearValidate());
       }
     }, [() => props.visible]);
 
diff --git a/src/pages/events/list/model/useEventListModel.ts b/src/pages/events/list/model/useEventListModel.ts
index 6059011..cd8e4c6 100644
--- a/src/pages/events/list/model/useEventListModel.ts
+++ b/src/pages/events/list/model/useEventListModel.ts
@@ -1,4 +1,4 @@
-import { computed, reactive, toRef, Ref } from 'vue';
+import { computed, reactive, toRef, Ref, nextTick } from 'vue';
 import { Modal, message } from 'ant-design-vue';
 import { useState, useDebounce } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
@@ -109,7 +109,7 @@ export function useEventListModel() {
     if (pageSize !== (pagination as any).pageSize.value) {
       pagination.setPageSize(pageSize);
     }
-    setTimeout(fetchList, 0);
+    nextTick().then(() => fetchList());
   };
 
   const openDetailModal = (record: any) => {
diff --git a/src/pages/events/orders/model/useOrderModel.ts b/src/pages/events/orders/model/useOrderModel.ts
index b148b3d..b3b2569 100644
--- a/src/pages/events/orders/model/useOrderModel.ts
+++ b/src/pages/events/orders/model/useOrderModel.ts
@@ -1,4 +1,4 @@
-import { computed, reactive, toRef, Ref, h } from 'vue';
+import { computed, reactive, toRef, Ref, h, nextTick } from 'vue';
 import { StatusTag, type StatusTagTone } from '@/components';
 import { useDebounce } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
@@ -212,7 +212,7 @@ export function useOrderModel() {
     if (pageSize !== (pagination as any).pageSize.value) {
       pagination.setPageSize(pageSize);
     }
-    setTimeout(fetchList, 0);
+    nextTick().then(() => fetchList());
   };
 
   return {
diff --git a/src/pages/finance/payments/model/usePaymentsModel.ts b/src/pages/finance/payments/model/usePaymentsModel.ts
index 27e31bc..a82a739 100644
--- a/src/pages/finance/payments/model/usePaymentsModel.ts
+++ b/src/pages/finance/payments/model/usePaymentsModel.ts
@@ -1,4 +1,4 @@
-import { computed, reactive, toRef, Ref } from 'vue';
+import { computed, reactive, toRef, Ref, nextTick } from 'vue';
 import {
   useDebounce,
   useThrottleFn,
@@ -142,7 +142,7 @@ export function usePaymentsModel() {
     if (pageSize !== (pagination as any).pageSize.value) {
       pagination.setPageSize(pageSize);
     }
-    setTimeout(fetchList, 0);
+    nextTick().then(() => fetchList());
   };
 
   return {
diff --git a/src/pages/finance/wallet/model/useWalletModel.ts b/src/pages/finance/wallet/model/useWalletModel.ts
index d13ddf5..1da9c6c 100644
--- a/src/pages/finance/wallet/model/useWalletModel.ts
+++ b/src/pages/finance/wallet/model/useWalletModel.ts
@@ -1,4 +1,4 @@
-import { computed, reactive, toRef, Ref } from 'vue';
+import { computed, reactive, toRef, Ref, nextTick } from 'vue';
 import {
   useState,
   useDebounce,
@@ -175,7 +175,7 @@ export function useWalletModel() {
     if (pageSize !== (pagination as any).pageSize.value) {
       pagination.setPageSize(pageSize);
     }
-    setTimeout(fetchList, 0);
+    nextTick().then(() => fetchList());
   };
 
   const handleViewDetail = (record: any) => {
diff --git a/src/pages/finance/withdraw/model/useWithdrawModel.ts b/src/pages/finance/withdraw/model/useWithdrawModel.ts
index f8c9bcd..e62c76d 100644
--- a/src/pages/finance/withdraw/model/useWithdrawModel.ts
+++ b/src/pages/finance/withdraw/model/useWithdrawModel.ts
@@ -1,4 +1,4 @@
-import { computed, reactive, toRef, Ref, h } from 'vue';
+import { computed, reactive, toRef, Ref, h, nextTick } from 'vue';
 import { StatusTag, type StatusTagTone } from '@/components';
 import {
   useState,
@@ -197,7 +197,7 @@ export function useWithdrawModel() {
     if (pageSize !== (pagination as any).pageSize.value) {
       pagination.setPageSize(pageSize);
     }
-    setTimeout(fetchList, 0);
+    nextTick().then(() => fetchList());
   };
 
   /** 打开审核弹窗 */
diff --git a/src/pages/system/logs/model/useLogModel.ts b/src/pages/system/logs/model/useLogModel.ts
index 03862d5..24f4967 100644
--- a/src/pages/system/logs/model/useLogModel.ts
+++ b/src/pages/system/logs/model/useLogModel.ts
@@ -1,4 +1,4 @@
-import { computed, reactive, toRef, Ref } from 'vue';
+import { computed, reactive, toRef, Ref, nextTick } from 'vue';
 import dayjs from 'dayjs';
 import { useDebounce, useThrottleFn } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
@@ -138,7 +138,7 @@ export function useLogModel() {
     if (pageSize !== (pagination as any).pageSize.value) {
       pagination.setPageSize(pageSize);
     }
-    setTimeout(fetchList, 0);
+    nextTick().then(() => fetchList());
   };
 
   return {
diff --git a/src/pages/system/roles/components/RoleFormModal.tsx b/src/pages/system/roles/components/RoleFormModal.tsx
index c27f4aa..596259a 100644
--- a/src/pages/system/roles/components/RoleFormModal.tsx
+++ b/src/pages/system/roles/components/RoleFormModal.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive } from 'vue';
+import { defineComponent, ref, reactive, nextTick } from 'vue';
 import { useEffect } from '@/hooks';
 import { Modal, Form, Input, Tree, Button, Spin, message } from 'ant-design-vue';
 import type { TreeProps } from 'ant-design-vue';
@@ -82,7 +82,7 @@ export default defineComponent({
     useEffect(() => {
       if (props.visible) {
         initFormFromRecord(props.record);
-        setTimeout(() => formRef.value?.clearValidate(), 0);
+        nextTick().then(() => formRef.value?.clearValidate());
       }
     }, [() => props.visible]);
 
diff --git a/src/pages/system/roles/model/useRoleModel.ts b/src/pages/system/roles/model/useRoleModel.ts
index 27adaec..68e1340 100644
--- a/src/pages/system/roles/model/useRoleModel.ts
+++ b/src/pages/system/roles/model/useRoleModel.ts
@@ -1,4 +1,4 @@
-import { computed, reactive, toRef, Ref } from 'vue';
+import { computed, reactive, toRef, Ref, nextTick } from 'vue';
 import { message } from 'ant-design-vue';
 import { useState, useDebounce, useThrottleFn } from '@/hooks';
 import { useRequest } from '@/hooks/useRequest';
@@ -107,7 +107,7 @@ export function useRoleModel() {
     if (pageSize !== (pagination as any).pageSize.value) {
       pagination.setPageSize(pageSize);
     }
-    setTimeout(fetchList, 0);
+    nextTick().then(() => fetchList());
   };
 
   /** 新增 */
diff --git a/src/pages/system/users/components/UserFormModal.tsx b/src/pages/system/users/components/UserFormModal.tsx
index 36c89ad..7044d72 100644
--- a/src/pages/system/users/components/UserFormModal.tsx
+++ b/src/pages/system/users/components/UserFormModal.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive } from 'vue';
+import { defineComponent, ref, reactive, nextTick } from 'vue';
 import { useEffect, useState } from '@/hooks';
 import { Modal, Form, Input, Select, Button } from 'ant-design-vue';
 import { getRoleList, type TournamentAdminRolePageVO } from '../../roles/model/services';
@@ -166,7 +166,7 @@ export default defineComponent({
       if (props.visible) {
         initFormFromRecord(props.record);
         setIsResetting(false);
-        setTimeout(() => formRef.value?.clearValidate(), 0);
+        nextTick().then(() => formRef.value?.clearValidate());
       }
     }, [() => props.visible]);
 
diff --git a/src/pages/system/users/model/useUserModel.ts b/src/pages/system/users/model/useUserModel.ts
index a69242f..533c6b1 100644
--- a/src/pages/system/users/model/useUserModel.ts
+++ b/src/pages/system/users/model/useUserModel.ts
@@ -1,4 +1,4 @@
-import { computed, reactive, toRef, Ref, h, ref } from 'vue';
+import { computed, reactive, toRef, Ref, h, ref, nextTick } from 'vue';
 import { message } from 'ant-design-vue';
 import { StatusTag, type StatusTagTone } from '@/components';
 import { useDebounce, useThrottleFn } from '@/hooks';
@@ -150,7 +150,7 @@ export function useUserModel() {
     if (pageSize !== (pagination as any).pageSize.value) {
       pagination.setPageSize(pageSize);
     }
-    setTimeout(fetchList, 0);
+    nextTick().then(() => fetchList());
   };
 
   // ===== 初始化：加载角色选项 =====
-- 
2.52.0