修复接单平台并发、分页与补资料

apps/frontend/src/pages/worker/WorkerHallPage.tsx

@@ -1,6 +1,6 @@
 import { ReloadOutlined, SearchOutlined } from '@ant-design/icons'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
-import { App, Button, Card, Empty, Input, Space, Spin, Tag, Typography } from 'antd'
+import { App, Button, Card, Empty, Input, Pagination, Space, Spin, Tag, Typography } from 'antd'
 import { useState } from 'react'
 
 import { fetchWorkerHallOrders, grabWorkerOrder } from '@/services/worker'
@@ -9,16 +9,20 @@ import type { WorkOrder } from '@/types/worker-platform'
 export default function WorkerHallPage() {
   const { message } = App.useApp()
   const queryClient = useQueryClient()
+  const [keywordInput, setKeywordInput] = useState('')
   const [keyword, setKeyword] = useState('')
+  const [page, setPage] = useState(1)
+  const [pageSize, setPageSize] = useState(20)
   const [grabbingId, setGrabbingId] = useState(0)
 
   const ordersQuery = useQuery({
-    queryKey: ['worker-hall-orders', keyword],
-    queryFn: () => fetchWorkerHallOrders({ keyword }),
+    queryKey: ['worker-hall-orders', keyword, page, pageSize],
+    queryFn: () => fetchWorkerHallOrders({ keyword, page, pageSize }),
     retry: false,
   })
 
   const orders = ordersQuery.data?.data.items || []
+  const pagination = ordersQuery.data?.data.pagination
 
   async function submitGrab(order: WorkOrder) {
     setGrabbingId(order.workOrderId)
@@ -33,6 +37,11 @@ export default function WorkerHallPage() {
     }
   }
 
+  function applyKeywordSearch() {
+    setKeyword(keywordInput.trim())
+    setPage(1)
+  }
+
   return (
     <section className="page-stack">
       <div className="worker-page-head">
@@ -40,13 +49,31 @@ export default function WorkerHallPage() {
         <Space.Compact>
           <Input
             allowClear
-            value={keyword}
+            value={keywordInput}
             placeholder="搜索商品或订单号"
             prefix={<SearchOutlined />}
-            onChange={(event) => setKeyword(event.target.value)}
-            onPressEnter={() => void ordersQuery.refetch()}
+            onChange={(event) => {
+              const nextKeyword = event.target.value
+              setKeywordInput(nextKeyword)
+              if (!nextKeyword.trim()) {
+                setKeyword('')
+                setPage(1)
+              }
+            }}
+            onPressEnter={applyKeywordSearch}
           />
-          <Button icon={<ReloadOutlined />} loading={ordersQuery.isFetching} onClick={() => ordersQuery.refetch()}>
+          <Button
+            icon={<SearchOutlined />}
+            loading={ordersQuery.isFetching}
+            onClick={applyKeywordSearch}
+          >
+            查询
+          </Button>
+          <Button
+            icon={<ReloadOutlined />}
+            loading={ordersQuery.isFetching}
+            onClick={() => ordersQuery.refetch()}
+          >
             刷新
           </Button>
         </Space.Compact>
@@ -79,7 +106,7 @@ export default function WorkerHallPage() {
                   {formatMoney(order.rewardAmount)}
                 </Typography.Title>
                 <Typography.Text type="secondary">
-                  所需冻结押金：{formatMoney(order.freezeDepositAmount ?? order.requiredDepositAmount)}
+                  所需冻结押金：{formatMoney(order.freezeDepositAmount)}
                 </Typography.Text>
                 <Button
                   type="primary"
@@ -93,6 +120,21 @@ export default function WorkerHallPage() {
           ))}
         </div>
       )}
+
+      {(pagination?.total || 0) > 0 ? (
+        <Pagination
+          current={pagination?.page || page}
+          pageSize={pagination?.pageSize || pageSize}
+          total={pagination?.total || 0}
+          showSizeChanger
+          pageSizeOptions={[10, 20, 50, 100]}
+          showTotal={(total) => `共 ${total} 条`}
+          onChange={(nextPage, nextPageSize) => {
+            setPage(nextPage)
+            setPageSize(nextPageSize)
+          }}
+        />
+      ) : null}
     </section>
   )
 }

apps/frontend/src/pages/worker/WorkerOrdersPage.tsx

@@ -26,21 +26,25 @@ const STATUS_OPTIONS = [
   { value: 'pending_acceptance', label: '待验收' },
   { value: 'problem', label: '问题单' },
   { value: 'accepted', label: '已验收' },
+  { value: 'cancelled', label: '已取消' },
 ]
 
 export default function WorkerOrdersPage() {
   const { message } = App.useApp()
   const queryClient = useQueryClient()
   const [status, setStatus] = useState('')
+  const [page, setPage] = useState(1)
+  const [pageSize, setPageSize] = useState(20)
   const [submittingOrder, setSubmittingOrder] = useState<WorkOrder | null>(null)
   const [acceptanceFiles, setAcceptanceFiles] = useState<UploadedFile[]>([])
   const [form] = Form.useForm()
 
   const ordersQuery = useQuery({
-    queryKey: ['worker-my-orders', status],
-    queryFn: () => fetchWorkerMyOrders({ status }),
+    queryKey: ['worker-my-orders', status, page, pageSize],
+    queryFn: () => fetchWorkerMyOrders({ status, page, pageSize }),
     retry: false,
   })
+  const pagination = ordersQuery.data?.data.pagination
 
   async function submitAcceptance(values: { note?: string }) {
     if (!submittingOrder) return
@@ -121,6 +125,7 @@ export default function WorkerOrdersPage() {
             onClick={() => {
               setSubmittingOrder(row)
               setAcceptanceFiles([])
+              form.resetFields()
             }}
           >
             提交验收
@@ -138,7 +143,10 @@ export default function WorkerOrdersPage() {
             value={status}
             options={STATUS_OPTIONS}
             style={{ width: 140 }}
-            onChange={setStatus}
+            onChange={(nextStatus) => {
+              setStatus(nextStatus)
+              setPage(1)
+            }}
           />
           <Button
             icon={<ReloadOutlined />}
@@ -155,7 +163,18 @@ export default function WorkerOrdersPage() {
         loading={ordersQuery.isLoading}
         dataSource={ordersQuery.data?.data.items || []}
         columns={columns}
-        pagination={false}
+        pagination={{
+          current: pagination?.page || page,
+          pageSize: pagination?.pageSize || pageSize,
+          total: pagination?.total || 0,
+          showSizeChanger: true,
+          pageSizeOptions: [10, 20, 50, 100],
+          showTotal: (total) => `共 ${total} 条`,
+          onChange: (nextPage, nextPageSize) => {
+            setPage(nextPage)
+            setPageSize(nextPageSize)
+          },
+        }}
         scroll={{ x: 900 }}
       />
 
@@ -165,6 +184,7 @@ export default function WorkerOrdersPage() {
         onCancel={() => {
           setSubmittingOrder(null)
           setAcceptanceFiles([])
+          form.resetFields()
         }}
         onOk={() => form.submit()}
         destroyOnHidden
@@ -210,12 +230,14 @@ function formatStatus(status: string) {
     pending_acceptance: '待验收',
     problem: '问题单',
     accepted: '已验收',
+    cancelled: '已取消',
   }
   return labels[status] || status
 }
 
 function resolveStatusColor(status: string) {
   if (status === 'accepted') return 'green'
+  if (status === 'cancelled') return 'default'
   if (status === 'problem') return 'red'
   if (status === 'pending_acceptance') return 'gold'
   return 'blue'

apps/frontend/src/pages/worker/WorkerProfilePage.tsx

@@ -22,7 +22,7 @@ export default function WorkerProfilePage() {
         </Button>
       </div>
 
-      {!worker && !profileQuery.isLoading ? <Empty description="暂无接单员信息" /> : null}
+      {!worker && !profileQuery.isLoading ? <Empty description="暂无打手信息" /> : null}
 
       {worker ? (
         <>