From 06decc51ff39d091d9ed6f5c190147eb4a0cd40a Mon Sep 17 00:00:00 2001 From: yml2213 Date: Thu, 23 Jul 2026 11:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/admin/AdminKuaishouIndustryPage.tsx | 16 ++++++++++------ apps/frontend/src/styles/main.css | 13 +++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/apps/frontend/src/pages/admin/AdminKuaishouIndustryPage.tsx b/apps/frontend/src/pages/admin/AdminKuaishouIndustryPage.tsx index 774872b9..e77f2d53 100644 --- a/apps/frontend/src/pages/admin/AdminKuaishouIndustryPage.tsx +++ b/apps/frontend/src/pages/admin/AdminKuaishouIndustryPage.tsx @@ -693,16 +693,20 @@ export default function AdminKuaishouIndustryPage() { } function buildVoucherToolPayload(): AdminKuaishouIndustryVoucherToolPayload { - const voucherCode = String(selectedVoucher?.voucherCode || toolForm.voucherCode || '').trim() - const oid = String(selectedVoucher?.oid || toolForm.oid || toolForm.orderId || '').trim() + const voucherCode = String( + selectedVoucher ? selectedVoucher.voucherCode : toolForm.voucherCode || '', + ).trim() + const oid = String( + selectedVoucher ? selectedVoucher.oid : toolForm.oid || toolForm.orderId || '', + ).trim() return { ...toolForm, - sellerId: selectedVoucher?.sellerId || toolForm.sellerId, + sellerId: selectedVoucher ? selectedVoucher.sellerId : toolForm.sellerId, oid, orderId: oid, - taskId: selectedVoucher?.taskId || toolForm.taskId, + taskId: selectedVoucher ? selectedVoucher.taskId || '' : toolForm.taskId, voucherCode, - eticketType: selectedVoucher?.eticketType || toolForm.eticketType, + eticketType: selectedVoucher ? selectedVoucher.eticketType || '' : toolForm.eticketType, serialNum: toolForm.serialNum || selectedVoucher?.consumeSerialNum, etickets: voucherCode ? [{ id: voucherCode, code: voucherCode, num: 1 }] : undefined, } @@ -1146,7 +1150,7 @@ export default function AdminKuaishouIndustryPage() { :last-child { + grid-column: auto; + } +} + @media (max-width: 420px) { .claim-header-copy { padding-right: 124px;