提交授权等待,素材云,消耗列表页面更新
This commit is contained in:
@@ -39,7 +39,6 @@ const ConsumePage: React.FC = () => {
|
||||
|
||||
const loadData = async () => {
|
||||
setLoading(true);
|
||||
console.log(consumeDateRange);
|
||||
try {
|
||||
const res = await getMaterialConsumpList({
|
||||
advertiser_id: advertiserId || undefined,
|
||||
|
||||
@@ -230,7 +230,8 @@ const AuthorizationPage: React.FC = () => {
|
||||
key: 'action',
|
||||
width: 120,
|
||||
render: (_: unknown, record: AuthorizationData) => (
|
||||
<Link to={`/consume?accountId=${record.id}`} style={{ color: '#6366f1' }}>
|
||||
<Link to={`/consume`} style={{ color: '#6366f1' }}>
|
||||
{/* ?accountId=${record.id} */}
|
||||
查看消耗
|
||||
</Link>
|
||||
),
|
||||
|
||||
@@ -34,13 +34,13 @@ const AuthorizationWaitingPage: React.FC = () => {
|
||||
|
||||
const handleCallback = async () => {
|
||||
try {
|
||||
await juliang_callback(params);
|
||||
// setAuthSuccess(true);
|
||||
// setIsChecking(false);
|
||||
// message.success('授权成功');
|
||||
// setTimeout(() => {
|
||||
// navigate('/authorization');
|
||||
// }, 1500);
|
||||
const res = await juliang_callback(params);
|
||||
setAuthSuccess(true);
|
||||
setIsChecking(false);
|
||||
message.success(res?.message || '授权成功');
|
||||
setTimeout(() => {
|
||||
navigate('/authorization');
|
||||
}, 1500);
|
||||
} catch (error: any) {
|
||||
const errorMsg = error?.message || '授权失败';
|
||||
setAuthError(errorMsg);
|
||||
@@ -51,25 +51,9 @@ const AuthorizationWaitingPage: React.FC = () => {
|
||||
|
||||
handleCallback();
|
||||
|
||||
const checkInterval = setInterval(async () => {
|
||||
try {
|
||||
// await getOAuthList({ page: 1, page_size: 1 });
|
||||
// setAuthSuccess(true);
|
||||
// setIsChecking(false);
|
||||
// message.success('授权成功');
|
||||
// clearInterval(checkInterval);
|
||||
// setTimeout(() => {
|
||||
// navigate('/authorization');
|
||||
// }, 1500);
|
||||
} catch (error) {
|
||||
console.log('授权检查中...');
|
||||
}
|
||||
}, 2000);
|
||||
|
||||
const timer = setInterval(() => {
|
||||
setCountdown(prev => {
|
||||
if (prev >= 11) {
|
||||
clearInterval(checkInterval);
|
||||
setIsChecking(false);
|
||||
return prev;
|
||||
}
|
||||
@@ -78,7 +62,6 @@ const AuthorizationWaitingPage: React.FC = () => {
|
||||
}, 1000);
|
||||
|
||||
return () => {
|
||||
clearInterval(checkInterval);
|
||||
clearInterval(timer);
|
||||
};
|
||||
}, [navigate, searchParams, message]);
|
||||
|
||||
@@ -41,12 +41,12 @@ const ConsumePage: React.FC = () => {
|
||||
loadData();
|
||||
}, []);
|
||||
|
||||
const loadData = async (page = 1, pageSizeNum = 10) => {
|
||||
const loadData = async (page = 1, pageSizeNum = 10, consumeDate?: [string, string] | null) => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const res = await getMaterialConsumpList({
|
||||
advertiser_id: advertiserId || undefined,
|
||||
consume_date: consumeDateRange,
|
||||
consume_date: consumeDate !== undefined ? consumeDate : consumeDateRange,
|
||||
page,
|
||||
page_size: pageSizeNum,
|
||||
});
|
||||
@@ -100,7 +100,7 @@ const ConsumePage: React.FC = () => {
|
||||
setAdvertiserId('');
|
||||
setConsumeDateRange(undefined);
|
||||
setCurrentPage(1);
|
||||
loadData(1, pageSize);
|
||||
loadData(1, pageSize, null);
|
||||
};
|
||||
|
||||
const handleSync = () => {
|
||||
|
||||
@@ -846,8 +846,8 @@ const GeneratedRecord: React.FC = () => {
|
||||
// 批量更新 recordlist 中的文件名,使用 API 返回的 new_file_name
|
||||
const resultsMap = new Map<string, string>();
|
||||
response?.results?.forEach((r: any) => {
|
||||
if (r.success && r.new_file_name) {
|
||||
resultsMap.set(r.source_id, r.new_file_name);
|
||||
if (r.success && r.newFileName) {
|
||||
resultsMap.set(r.sourceId, r.newFileName);
|
||||
}
|
||||
});
|
||||
setRecordList(prevList => {
|
||||
@@ -864,7 +864,8 @@ const GeneratedRecord: React.FC = () => {
|
||||
}),
|
||||
}));
|
||||
});
|
||||
const successCount = response?.success_count || 0;
|
||||
console.log(response);
|
||||
const successCount = response?.successCount || 0;
|
||||
message.success(`已更新 ${successCount} 个文件名`);
|
||||
} catch (error: any) {
|
||||
console.error('文件名更新失败:', error);
|
||||
|
||||
Reference in New Issue
Block a user