diff --git a/video-gen-app/src/pages/AuthorizationPage.tsx b/video-gen-app/src/pages/AuthorizationPage.tsx index 2e5903fa..6afd30e8 100644 --- a/video-gen-app/src/pages/AuthorizationPage.tsx +++ b/video-gen-app/src/pages/AuthorizationPage.tsx @@ -225,17 +225,16 @@ const AuthorizationPage: React.FC = () => { width: 160, render: (text: string) => {formatDateTime(text)}, }, - { - title: '操作', - key: 'action', - width: 120, - render: (_: unknown, record: AuthorizationData) => ( - - {/* ?accountId=${record.id} */} - 查看消耗 - - ), - }, + // { + // title: '操作', + // key: 'action', + // width: 120, + // render: (_: unknown) => ( + // + // 查看消耗 + // + // ), + // }, ]; const tableData = authorizations.map((item, index) => ({ diff --git a/video-gen-app/src/pages/ConsumePage.tsx b/video-gen-app/src/pages/ConsumePage.tsx index 5a372e61..eb44b879 100644 --- a/video-gen-app/src/pages/ConsumePage.tsx +++ b/video-gen-app/src/pages/ConsumePage.tsx @@ -41,12 +41,12 @@ const ConsumePage: React.FC = () => { loadData(); }, []); - const loadData = async (page = 1, pageSizeNum = 10, consumeDate?: [string, string] | null) => { + const loadData = async (page = 1, pageSizeNum = 10, consumeDate?: [string, string] | null, advertiserIdParam?: string | null) => { setLoading(true); try { const res = await getMaterialConsumpList({ - advertiser_id: advertiserId || undefined, - consume_date: consumeDate !== undefined ? consumeDate : consumeDateRange, + advertiser_id: advertiserIdParam != null ? advertiserIdParam : advertiserId, + consume_date: consumeDate != null ? consumeDate : consumeDateRange, page, page_size: pageSizeNum, }); @@ -100,7 +100,7 @@ const ConsumePage: React.FC = () => { setAdvertiserId(''); setConsumeDateRange(undefined); setCurrentPage(1); - loadData(1, pageSize, null); + loadData(1, pageSize, null, ''); }; const handleSync = () => { diff --git a/video-gen-app/src/pages/MaterialListPage.tsx b/video-gen-app/src/pages/MaterialListPage.tsx index e3a033c5..0a2e9335 100644 --- a/video-gen-app/src/pages/MaterialListPage.tsx +++ b/video-gen-app/src/pages/MaterialListPage.tsx @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; import { Button, Table, Tag, Input, Pagination, Typography, Select, App } from 'antd'; +import { Link } from 'react-router-dom'; import { FolderOpenOutlined, EyeOutlined } from '@ant-design/icons'; import { getResourcesMaterialList } from '../api'; @@ -267,6 +268,16 @@ const MaterialListPage: React.FC = () => { width: 160, render: (text: string) => {formatDateTime(text)}, }, + { + title: '操作', + key: 'action', + width: 120, + render: (_: unknown, record) => ( + + 查看消耗 + + ), + }, // { // title: '更新时间', // dataIndex: 'updatedAt',