diff --git a/src/api/hard/hard-order.ts b/src/api/hard/hard-order.ts index b133ffb..fe43bf4 100644 --- a/src/api/hard/hard-order.ts +++ b/src/api/hard/hard-order.ts @@ -126,7 +126,7 @@ export interface HardDoorManualSettleItem { /** * 智能柜订单手动结算(第三方识别不可用时,人工核对视频后结算) */ -export function manualSettle(data: { orderId: string | number; items: HardDoorManualSettleItem[] }) { +export function manualSettle(data: { orderId: string | number; items: HardDoorManualSettleItem[]; reason?: string }) { return request({ url: "/hard/hard-order/manual-settle", method: "post", @@ -137,7 +137,7 @@ export function manualSettle(data: { orderId: string | number; items: HardDoorMa /** * 智能柜订单手动取消(用户未拿商品) */ -export function manualCancel(data: { orderId: string | number }) { +export function manualCancel(data: { orderId: string | number; reason?: string }) { return request({ url: "/hard/hard-order/manual-cancel", method: "post", diff --git a/src/views/hard/components/hard-door-log.vue b/src/views/hard/components/hard-door-log.vue index f07aa7d..7267f4d 100644 --- a/src/views/hard/components/hard-door-log.vue +++ b/src/views/hard/components/hard-door-log.vue @@ -1,114 +1,115 @@ diff --git a/src/views/hard/components/manual-settlement.vue b/src/views/hard/components/manual-settlement.vue index 1a7cab4..c5da0fd 100644 --- a/src/views/hard/components/manual-settlement.vue +++ b/src/views/hard/components/manual-settlement.vue @@ -1,97 +1,92 @@