From 1f74306c986c6ab44efe3f8b2da8d48959319e57 Mon Sep 17 00:00:00 2001 From: zhaoxing <2558691827@qq.com> Date: Tue, 17 Nov 2026 13:53:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(semi-auto):=20=E6=8D=A2=E7=BB=91=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=A1=B5=E6=94=AF=E6=8C=81=E8=BF=94=E5=9B=9E=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=A0=B8=E5=AF=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerFulfillmentPage.tsx | 59 +++++++++++++++---- ...customer-fulfillment-rebind-return.test.ts | 31 ++++++++++ 2 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 apps/frontend/tests/customer-fulfillment-rebind-return.test.ts diff --git a/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx b/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx index f7e305b9..f459a765 100644 --- a/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx +++ b/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx @@ -75,6 +75,7 @@ export default function CustomerFulfillmentPage() { const [profileServerZone, setProfileServerZone] = useState('') const [profileSaving, setProfileSaving] = useState(false) const [profileEditing, setProfileEditing] = useState(false) + const [rebindFailureDismissed, setRebindFailureDismissed] = useState(false) const startingBindingRef = useRef(false) const hydratingBindingRef = useRef(false) const autoOpenedRoleRef = useRef('') @@ -136,6 +137,7 @@ export default function CustomerFulfillmentPage() { autoOpenedRoleRef.current = '' setBindingSessionExpired(false) setBindingLoadError('') + setRebindFailureDismissed(false) }, [selectedTask?.id]) useEffect(() => { @@ -709,11 +711,11 @@ export default function CustomerFulfillmentPage() { if (!selectedTask || bindingLoading) return const reason = String(bindingInfo?.rebindConfirmMessage || '').trim() modal.confirm({ - title: '仍使用原绑定角色?', + title: '确认使用原角色?', content: `本次换绑未成功${reason ? `(${reason})` : ''},平台仍返回原绑定角色「${ bindingRoleName || '当前角色' }」。确认后本次换绑作废,直接使用该角色继续履约。`, - okText: '仍使用原角色', + okText: '确认使用原角色', cancelText: '先不确认', onOk: () => handleConfirmBinding(true), }) @@ -808,6 +810,8 @@ export default function CustomerFulfillmentPage() { })() const bindingRoleName = bindingInfo?.bindGameRole || selectedTask?.bindGameRole || '' const rebindUnchanged = bindingInfo?.rebindUnchanged === true + // 换绑失败视图可返回「已识别角色 + 资料不一致」的核对界面;后端 rebindUnchanged 保持不变。 + const showRebindFailure = rebindUnchanged && !rebindFailureDismissed const rebindConfirmState = bindingInfo?.rebindConfirmState || 'idle' const rebindRejected = rebindConfirmState === 'rejected' const rebindAccepted = rebindConfirmState === 'accepted' @@ -829,7 +833,7 @@ export default function CustomerFulfillmentPage() { text: '已登录,但平台未返回可核对的角色ID,请联系客服人工核实', } } - if (rebindUnchanged) { + if (showRebindFailure) { return { tone: 'is-warning', text: rebindRejected ? '虎牙未接受本次换绑,请查看下方原因' : '换绑未生效,请查看下方原因', @@ -857,9 +861,7 @@ export default function CustomerFulfillmentPage() { ? formatAdminDateTime(bindingInfo.nextRebindAt) : '' const comparisonMismatch = - selectedTask?.bindingStatus === 'role_ready' && - !rebindUnchanged && - bindingComparison?.verdict === 'mismatch' + selectedTask?.bindingStatus === 'role_ready' && bindingComparison?.verdict === 'mismatch' const showProfileForm = showBindingStage && profileEditing const bindingCustomerReady = Boolean( bindingComparison?.customerRoleId || bindingComparison?.customerRoleName, @@ -1107,7 +1109,7 @@ export default function CustomerFulfillmentPage() { ) : null} {showBindingStage ? ( -
+

绑定信息 (已登录虎牙账号) @@ -1329,7 +1331,7 @@ export default function CustomerFulfillmentPage() { orderNo || selectedTask?.orderNo || '' } 联系客服,核实完成前请不要确认绑定。`} /> - ) : rebindUnchanged ? ( + ) : showRebindFailure ? ( )} - {!bindingRequiresSupport && comparisonMismatch && bindingComparison ? ( + {!bindingRequiresSupport && + !showRebindFailure && + comparisonMismatch && + bindingComparison ? (

- ) : rebindUnchanged ? ( + ) : showRebindFailure ? (
) : comparisonMismatch ? ( @@ -1464,6 +1475,28 @@ export default function CustomerFulfillmentPage() { 角色不对,重新扫码换绑 + ) : rebindUnchanged ? ( +
+ + +
) : (