From 3ad7310a6e62cbf69fbdd54725cd48df2d5b1b48 Mon Sep 17 00:00:00 2001 From: yml Date: Sun, 22 Nov 2026 22:25:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(fulfillment):=20=E6=94=B9=E4=B8=BA=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=B1=95=E7=A4=BA=E5=AE=A2=E6=88=B7=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/PlatformFulfillmentPage.tsx | 83 +++++++++++++++++-- 1 file changed, 76 insertions(+), 7 deletions(-) diff --git a/web/frontend/src/pages/PlatformFulfillmentPage.tsx b/web/frontend/src/pages/PlatformFulfillmentPage.tsx index 8137f20..d397868 100644 --- a/web/frontend/src/pages/PlatformFulfillmentPage.tsx +++ b/web/frontend/src/pages/PlatformFulfillmentPage.tsx @@ -388,6 +388,8 @@ export default function PlatformFulfillmentPage() { const [detail, setDetail] = useState(null); const [detailLoading, setDetailLoading] = useState(false); const [qrOpen, setQrOpen] = useState(false); + const [bindingQrImage, setBindingQrImage] = useState(''); + const [bindingQrLoading, setBindingQrLoading] = useState(false); const [mappingOpen, setMappingOpen] = useState(false); const [mappingSku, setMappingSku] = useState(''); const [mappingEditingId, setMappingEditingId] = useState(null); @@ -521,10 +523,41 @@ export default function PlatformFulfillmentPage() { const selectedExchangeImageKey = selected?.exchangeResultImage?.objectKey || ''; const qrValue = selected?.bindTask?.qrUrl || ''; const douyuActionQrValue = douyuActionTask ? taskQrUrl(douyuActionTask) : ''; + const pendingBindRoleName = selected?.bindTask?.bindReadyForConfirm + ? selected.bindTask.roleName + : ''; + const pendingBindRoleChannel = selected?.bindTask + ? [selected.bindTask.platName, selected.bindTask.areaName].filter(Boolean).join(' / ') + : ''; + + const openBindingQr = async () => { + const bindTaskId = selected?.bindTask?.id; + setQrOpen(true); + setBindingQrImage(''); + if (!bindTaskId) return; + setBindingQrLoading(true); + try { + const task = await douyuApi.getTask(bindTaskId); + const image = task.result?.mini_qrcode_image; + if (typeof image === 'string') setBindingQrImage(image); + } catch { + // 小程序码详情读取失败时保留原链接二维码作为回退。 + } finally { + setBindingQrLoading(false); + } + }; + + const closeBindingQr = () => { + setQrOpen(false); + setBindingQrImage(''); + setBindingQrLoading(false); + }; useEffect(() => { - if (qrValue) setQrOpen(true); - }, [qrValue]); + setQrOpen(false); + setBindingQrImage(''); + setBindingQrLoading(false); + }, [selectedId]); useEffect(() => { if ( @@ -1274,7 +1307,7 @@ export default function PlatformFulfillmentPage() { const actionButtons = selected ? ( {selected.bindTask?.qrUrl ? ( - ) : null} @@ -1582,10 +1615,23 @@ export default function PlatformFulfillmentPage() { {bindStatusLabel(selected.account.roleBindStatus)} - {selected.account.gameName || '-'} - + + {selected.account.gameName || '-'} + + {selected.account.gameChannel || '-'} + {pendingBindRoleName ? ( + + + 待确认 + {pendingBindRoleName} + {pendingBindRoleChannel ? ( + {pendingBindRoleChannel} + ) : null} + + + ) : null} {formatTime(selected.account.roleChangeAvailableAt) || '无冷却'} @@ -1777,9 +1823,32 @@ export default function PlatformFulfillmentPage() { ) : null} - setQrOpen(false)}> + - {qrValue ? : null} + {bindingQrLoading ? ( + 正在加载小程序码... + ) : bindingQrImage ? ( +
+ 客户扫码绑定小程序码 +
+ ) : qrValue ? ( + + ) : null} 请客户使用对应游戏平台扫码。二维码只用于当前履约作业。