Merge branch 'main' into dev

apps/frontend/src/components/WorkOrderEventTimeline.tsx

@@ -158,8 +158,16 @@ export function formatWorkOrderEvent(event: WorkOrderEvent): EventNodeStyle {
         title: note ? `客服已处理问题反馈：${note}` : '客服已处理问题反馈',
         color: 'green',
       }
-    case 'timeout_reopen':
-      return { title: '订单超时未完成，已退回抢单大厅', color: 'orange' }
+    case 'timeout_reopen': {
+      const isSharing = Boolean(event.payload?.isSharing)
+      const quantity = readPayloadAmount(event, 'quantity')
+      return {
+        title: isSharing
+          ? `拼单份额超时未完成${quantity > 0 ? `（${quantity} 份）` : ''}，已退回抢单大厅`
+          : '订单超时未完成，已退回抢单大厅',
+        color: 'orange',
+      }
+    }
 
     // —— 资料节点 ——
     case 'material_submitted':
@@ -435,9 +443,14 @@ export function formatWorkOrderEvent(event: WorkOrderEvent): EventNodeStyle {
     case 'sharing_share_cancelled_by_admin': {
       const workerLabel = resolveEventWorkerLabel(event)
       const quantity = readPayload(event, 'quantity')
+      const details = [
+        quantity ? `撤销 ${quantity} 份` : '',
+        '空出的份数已回到接单大厅',
+        note ? `原因：${note}` : '',
+      ].filter(Boolean)
       return {
         title: `撤销拼单参与者${workerLabel ? `（${workerLabel}）` : ''}`,
-        description: `${quantity ? `撤销 ${quantity} 份；` : ''}${note ? `原因：${note}` : '份数已退回接单大厅'}`,
+        description: details.join('；'),
         color: 'red',
       }
     }

apps/frontend/src/pages/admin/panels/WorkOrdersPanel.tsx

@@ -783,7 +783,7 @@ export default function WorkOrdersPanel() {
         cancelAdminWorkOrderShare(workOrderId, cancelShare.shareId, {
           reason: String(values.reason || '').trim(),
         }),
-      '该参与者已撤单，押金已退还，母单状态未变更',
+      '该参与者已撤单，押金已退还，空出的份数已回到接单大厅',
     )
     if (!succeeded) return
     await queryClient.invalidateQueries({
@@ -3717,7 +3717,7 @@ export default function WorkOrdersPanel() {
                                   danger
                                   size="small"
                                   icon={<UndoOutlined />}
-                                  title="只撤销当前参与者的拼单份额，其他参与者不受影响"
+                                  title="只撤销当前参与者的拼单份额，空出的份数回到接单大厅，其他参与者不受影响"
                                   onClick={() => {
                                     setCancelShare(share)
                                     cancelShareForm.setFieldsValue({ reason: '' })
@@ -3779,7 +3779,7 @@ export default function WorkOrdersPanel() {
               showIcon
               type="warning"
               message={`将撤销该打手承接的 ${cancelShare.quantity} 份拼单`}
-              description="撤单只释放这一份份额并退还该份额冻结的押金，母单状态保持不变（待验收/进行中的单不会被踢回大厅）；已提交的验收资料会保留在后台记录中。"
+              description="撤单只释放这一份份额并退还该份额冻结的押金；空出的份数会回到接单大厅，母单显示待抢单；重新拼满后再按各份额状态推进。该份额已提交的验收资料会被清空，仅保留撤单记录。"
               style={{ marginBottom: 16 }}
             />
             <Form.Item label="撤单原因" name="reason">
@@ -3813,7 +3813,7 @@ export default function WorkOrdersPanel() {
               showIcon
               type="warning"
               message={`将从该打手的 ${reduceShare.quantity} 份中撤掉指定份数`}
-              description="撤掉的份数会立刻回到抢单大厅；押金保持原冻结额不退还；验收资料保留，之后仍可单独验收剩余份数。"
+              description="撤掉的份数会立刻回到抢单大厅，母单显示待抢单；押金保持原冻结额不退还；验收资料保留，之后仍可单独验收剩余份数。"
               style={{ marginBottom: 16 }}
             />
             <Form.Item