fixed: 订单分页效果

src/assets/core.scss

@@ -263,7 +263,9 @@
     }
   }
 }
-
+.w-min-60px{
+  min-width: 60px;
+}
 .list-scroller-container {
   overflow: auto;
   margin-right: -20px;

src/components/scoller/infinite-scroller.tsx

@@ -2,6 +2,7 @@ import React, {CSSProperties, useCallback, useEffect, useImperativeHandle, useRe
 import {useInViewport, useScroll} from "ahooks";
 import { LoadingOutlined } from '@ant-design/icons';
 import {Spin} from "antd";
+import {t} from "i18next";
 
 export type InfiniteScrollerRef = {
 	scrollToPosition: (top: number) => void
@@ -65,7 +66,7 @@ const InfiniteScroller = React.forwardRef<InfiniteScrollerRef, InfiniteScrollerP
 			{props.loading && <div style={{minHeight:'30vh'}}></div>}
 		{props?.pagination && props.pagination.total > props.pagination.limit * props.pagination.page && (props.loadingPlaceholder ||
             <div className="data-load-control-element py-10 text-center">
-                <div className="loading-text">加载中...</div>
+                <div className="loading-text">{t('loading')}</div>
             </div>)}
 		{props?.empty && !props.loading && props.pagination?.total == 0 && <div className="flex justify-center text-center pt-20">
             <div className="rounded-lg px-4 py-10">

src/i18n/translations/en-US.json

@@ -38,6 +38,7 @@
     "playlist_count": "{{count}} videos in total",
     "title": "Livestream"
   },
+  "loading": "Loading...",
   "login": {
     "code_sending": "Sending...",
     "invalid_username_or_pwd": "Invalid phone number or code",
@@ -149,6 +150,12 @@
     "remaining_duration_warning": "Unable to generate videos due to insufficient remaining time？",
     "text": "Orders"
   },
+  "page": {
+    "size_10": "10 per page",
+    "size_20": "20 per page",
+    "size_30": "30 per page",
+    "total_item": "{{total}} videos in total"
+  },
   "recycle": {
     "remove_forever": "Remove Forever",
     "restore_video": "Restore"

src/i18n/translations/zh-CN.json

@@ -38,6 +38,7 @@
     "playlist_count": "当前播放列表共 {{count}} 条",
     "title": "直播界面"
   },
+  "loading": "加载中...",
   "login": {
     "code_sending": "发送中",
     "invalid_username_or_pwd": "账号或密码错误",
@@ -149,6 +150,12 @@
     "remaining_duration_warning": "视频生成剩余时长为零，将无法生成视频，请尽快充值额度。",
     "text": "订单记录"
   },
+  "page": {
+    "size_10": "10条/页",
+    "size_20": "20条/页",
+    "size_30": "30条/页",
+    "total_item": "共计{{total}}条"
+  },
   "recycle": {
     "remove_forever": "彻底删除",
     "restore_video": "还原视频"

src/pages/news/components/style.module.scss

@@ -97,3 +97,22 @@
     }
   }
 }
+.orderDataList{
+
+  :global {
+    .id{
+      @apply  pl-0;
+      width: 120px;
+      &:after{
+        display: none;
+      }
+    }
+    .title {
+      @apply flex-1 pl-4;
+      min-width: 100px;
+      &:after {
+        display: block;
+      }
+    }
+  }
+}

src/pages/order/index.tsx

@@ -5,7 +5,7 @@ import styles from "@/pages/news/components/style.module.scss";
 
 import {formatDurationToTime, formatTime} from "@/util/strings.ts";
 import {IconDelete, IconEdit, IconWarningCircle} from "@/components/icons";
-import {Empty, Popconfirm} from "antd";
+import {Empty, Pagination, PaginationProps, Popconfirm} from "antd";
 import {useRequest, useSetState} from "ahooks";
 import {getList} from "@/service/api/order.ts";
 
@@ -14,7 +14,7 @@ function OrderIndex() {
 	const {t} = useTranslation()
 	const [params, setParams] = useState<ApiArticleSearchParams>({
 		pagination: {page: 1, limit: 12},
-		time_flag: 1,
+		time_flag: 0,
 	})
 	const {data} = useRequest(() => getList(params), {
 		refreshDeps: [params],
@@ -22,28 +22,30 @@ function OrderIndex() {
 
 	return <div className="container pb-5 page-order-index">
 		<SearchPanel
-			hideNewsSource={true} defaultParams={params} onSearch={setParams}
+			hideNewsSource={true}
+			defaultParams={params}
+			onSearch={setParams}
 			rightRender={<div>{t('order.left_time')}: <span
 				className={`${!data?.remaining_duration || Number(data?.remaining_duration) < 3600 ? 'text-red-600' : ''}`}>{formatDurationToTime(data?.remaining_duration)}</span>
 			</div>}
 		/>
 		<div className="mt-2">
-			<div className={styles.newListTable}>
+			<div className={`${styles.newListTable} ${styles.orderDataList} `}>
 				<div className="header row flex">
-					<div className="col w-[160px]">{t('order.list.id')}</div>
+					<div className="col id w-[160px]">{t('order.list.id')}</div>
 					<div className="col w-[180px]">{t('order.list.cover')}</div>
-					<div className="col title">{t('order.list.title')}</div>
+					<div className="col title w-min-60px">{t('order.list.title')}</div>
 					<div className="col w-[180px]">{t('order.list.order_time')}</div>
 					<div className="col w-[180px]">{t('order.list.consume_time')}</div>
 					<div className="col w-[180px]">{t('order.list.operator')}</div>
 				</div>
-				<div className="data-list-container">
+				<div >
 					{data?.list.length === 0 && <div style={{marginTop: 50}}>
               <Empty/>
           </div>}
 					{data?.list.map((item, i) => {
 						return <div key={i} className="row flex">
-							<div className="col w-[160px] text-center">
+							<div className="col id w-[160px] text-center">
 								<div className="flex-1">
 									<div className="text-base">{item.order_id}</div>
 								</div>
@@ -51,7 +53,7 @@ function OrderIndex() {
 							<div className="col w-[180px]">
 								<img src={item.img_url} className="rounded w-[140px] h-[60px]" alt=""/>
 							</div>
-							<div className="col flex-1">
+							<div className="col flex-1 w-min-60px">
 								<div className="text-sm line-clamp-2">{item.title}</div>
 							</div>
 							<div className="col w-[180px]">
@@ -66,6 +68,22 @@ function OrderIndex() {
 							</div>
 						</div>
 					})}
+
+					<div className="footer flex justify-end mt-10">
+						<Pagination
+							total={data?.pagination.total || 0}
+							showTotal={(total) => <div>{t('page.total_item', {total})}</div>}
+							showSizeChanger={{
+								options: [
+									{value: 10, label: t('page.size_10')},
+									{value: 20, label: t('page.size_20')},
+									{value: 30, label: t('page.size_30')}
+								]
+							}}
+							showQuickJumper={true}
+							hideOnSinglePage={true}
+						/>
+					</div>
 				</div>
 			</div>
 		</div>

src/pages/recycle/index.tsx

@@ -1,4 +1,4 @@
-import React, {useEffect, useMemo, useRef, useState} from "react";
+import React, {useEffect, useRef, useState} from "react";
 import {Checkbox, Modal, Space} from "antd";
 import {useRequest, useSetState} from "ahooks";
 import {useTranslation} from "react-i18next";
@@ -42,9 +42,9 @@ export default function RecycleIndex() {
 		onSuccess: (data) => {
 			setData(prev => {
 				// 判断页码是否是第1页
-				//if (data.pagination.page == 1) return data;
+				if (data.pagination.page == 1) return data;
 				return {
-					list: data?.list || [], //[...(prev?.list || []), ...(data?.list || [])],
+					list: [...(prev?.list || []), ...(data?.list || [])],
 					pagination: data.pagination || {
 						page: 1,
 						limit: DEFAULT_PAGE_LIMIT.limit

src/routes/index.tsx

@@ -36,7 +36,7 @@ const AppRouter = () => {
 
 	const initRemainingDuration = () => {
 		getRemainingDuration().then(remain => {
-			if(remain > 0){
+			if(remain <= 0){
 				Modal.warning({
 					wrapClassName:'root-modal-confirm',
 					title: t('confirm.title'),

src/service/api/order.ts

@@ -5,10 +5,7 @@ type OrderInfoData = DataList<OrderInfo> & {
 }
 
 export function getList(params: OrderSearchParam) {
-	return post<OrderInfoData>('/order/list', {
-		page_num: params.pagination.page || 1,
-		page_size: params.pagination.limit || 10,
-	})
+	return post<OrderInfoData>('/order/list', params)
 }
 
 

src/service/api/recycle.ts

@@ -1,10 +1,7 @@
 import {post} from "@/service/request.ts";
 
-export function getList(params: VideoSearchParams) {
-	return post<DataList<VideoInfo>>('/recycle/list', {
-		page_num: params.pagination.page || 1,
-		page_size: params.pagination.limit || 10,
-	})
+export function getList(params: NormalSearchParams) {
+	return post<DataList<VideoInfo>>('/recycle/list', params)
 }
 export function remove(ids: Id[]) {
 	return post('/recycle/remove', {ids})

src/types/api.d.ts

@@ -86,6 +86,11 @@ declare interface ListCrawlerNewsItem extends BasicArticleInfo {
 	// 内部文章关联id
 	internal_article_id: number;
 }
+declare interface NormalSearchParams extends ApiRequestPageParams{
+	// 标题
+	title?: string;
+	time_flag?: number;
+}
 declare interface VideoSearchParams extends ApiRequestPageParams{
 	// 标题
 	title?: string;