|
|
@@ -53,8 +53,8 @@ export const OrdersPage = () => {
|
|
|
page: 1,
|
|
|
limit: 10,
|
|
|
search: '',
|
|
|
- status: '',
|
|
|
- payStatus: '',
|
|
|
+ status: 'all',
|
|
|
+ payStatus: 'all',
|
|
|
});
|
|
|
const [isModalOpen, setIsModalOpen] = useState(false);
|
|
|
const [editingOrder, setEditingOrder] = useState<OrderResponse | null>(null);
|
|
|
@@ -71,13 +71,22 @@ export const OrdersPage = () => {
|
|
|
const { data, isLoading, refetch } = useQuery({
|
|
|
queryKey: ['orders', searchParams],
|
|
|
queryFn: async () => {
|
|
|
+ const filters: any = {};
|
|
|
+
|
|
|
+ if (searchParams.status !== 'all') {
|
|
|
+ filters.state = parseInt(searchParams.status);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (searchParams.payStatus !== 'all') {
|
|
|
+ filters.payState = parseInt(searchParams.payStatus);
|
|
|
+ }
|
|
|
+
|
|
|
const res = await orderClient.$get({
|
|
|
query: {
|
|
|
page: searchParams.page,
|
|
|
pageSize: searchParams.limit,
|
|
|
keyword: searchParams.search,
|
|
|
- ...(searchParams.status && { filters: JSON.stringify({ state: parseInt(searchParams.status) }) }),
|
|
|
- ...(searchParams.payStatus && { filters: JSON.stringify({ payState: parseInt(searchParams.payStatus) }) }),
|
|
|
+ ...(Object.keys(filters).length > 0 && { filters: JSON.stringify(filters) }),
|
|
|
}
|
|
|
});
|
|
|
if (res.status !== 200) throw new Error('获取订单列表失败');
|
|
|
@@ -211,7 +220,7 @@ export const OrdersPage = () => {
|
|
|
<SelectValue placeholder="订单状态" />
|
|
|
</SelectTrigger>
|
|
|
<SelectContent>
|
|
|
- <SelectItem value="">全部</SelectItem>
|
|
|
+ <SelectItem value="all">全部</SelectItem>
|
|
|
<SelectItem value="0">未发货</SelectItem>
|
|
|
<SelectItem value="1">已发货</SelectItem>
|
|
|
<SelectItem value="2">收货成功</SelectItem>
|
|
|
@@ -226,7 +235,7 @@ export const OrdersPage = () => {
|
|
|
<SelectValue placeholder="支付状态" />
|
|
|
</SelectTrigger>
|
|
|
<SelectContent>
|
|
|
- <SelectItem value="">全部</SelectItem>
|
|
|
+ <SelectItem value="all">全部</SelectItem>
|
|
|
<SelectItem value="0">未支付</SelectItem>
|
|
|
<SelectItem value="1">支付中</SelectItem>
|
|
|
<SelectItem value="2">支付成功</SelectItem>
|