From 1a485cee0c05b34c61dccf31624c8b0e6b9e8db8 Mon Sep 17 00:00:00 2001 From: zhaoxing <2558691827@qq.com> Date: Tue, 17 Nov 2026 13:33:03 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(semi-auto):=20=E6=8D=A2=E7=BB=91?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E8=B5=84=E6=96=99=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=97=B6=E5=BC=95=E5=AF=BC=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f6214e89952667a7b63fd1ebacba371b5f04a18a. --- .../CustomerFulfillmentPage.tsx | 90 ++++--------------- ...stomer-fulfillment-rebind-mismatch.test.ts | 30 ------- 2 files changed, 15 insertions(+), 105 deletions(-) delete mode 100644 apps/frontend/tests/customer-fulfillment-rebind-mismatch.test.ts diff --git a/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx b/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx index 76215fe5..f7e305b9 100644 --- a/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx +++ b/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx @@ -608,23 +608,8 @@ export default function CustomerFulfillmentPage() { } } - /** 资料不一致时展开资料编辑表单并滚动到可见位置。 */ - function openProfileEditor() { - setProfileEditing(true) - window.setTimeout(() => { - document - .getElementById('customer-profile-form') - ?.scrollIntoView({ behavior: 'smooth', block: 'center' }) - }, 0) - } - async function handleSubmitRebind() { if (!selectedTask) return - if (bindingInfo?.comparison?.verdict === 'mismatch') { - message.warning('当前资料与平台角色不一致,请先修改资料') - openProfileEditor() - return - } setBindingLoading(true) try { const response = await submitCustomerRebind(orderNo, selectedTask.id) @@ -681,11 +666,7 @@ export default function CustomerFulfillmentPage() { ) const bindingResponse = await pollCustomerBinding(orderNo, selectedTask.id) if (bindingResponse.data.binding) setBindingInfo(bindingResponse.data.binding) - message.success( - bindingInfo?.rebindUnchanged - ? '资料已按平台角色同步,请点「仍使用原角色」继续' - : '资料已按平台角色同步,请核对后确认绑定', - ) + message.success('资料已按平台角色同步,请核对后确认绑定') } catch (error) { message.error(error instanceof Error ? error.message : '同步角色资料失败') } finally { @@ -726,11 +707,6 @@ export default function CustomerFulfillmentPage() { /** 换绑被虎牙拒绝时的二次确认:客户可以选择继续使用原绑定角色。 */ function handleAcceptExistingRole() { if (!selectedTask || bindingLoading) return - if (bindingInfo?.comparison?.verdict === 'mismatch') { - message.warning('当前资料与平台原角色不一致,请先修改资料') - openProfileEditor() - return - } const reason = String(bindingInfo?.rebindConfirmMessage || '').trim() modal.confirm({ title: '仍使用原绑定角色?', @@ -770,9 +746,7 @@ export default function CustomerFulfillmentPage() { } catch { // 绑定尚未开始时没有 binding,可忽略。 } - message.success( - bindingInfo?.rebindUnchanged ? '资料已保存,请点「仍使用原角色」继续' : '角色资料已保存', - ) + message.success('角色资料已保存') } catch (error) { message.error(error instanceof Error ? error.message : '保存角色资料失败') } finally { @@ -882,16 +856,10 @@ export default function CustomerFulfillmentPage() { const nextRebindText = bindingInfo?.nextRebindAt ? formatAdminDateTime(bindingInfo.nextRebindAt) : '' - const bindingProfileMismatch = - selectedTask?.bindingStatus === 'role_ready' && bindingComparison?.verdict === 'mismatch' - const comparisonMismatch = bindingProfileMismatch && !rebindUnchanged - const canSyncBindingProfile = Boolean( - bindingComparison && - bindingComparison.boundRoleName && - bindingComparison.boundRoleId && - /^\d+$/.test(bindingComparison.boundRoleId) && - bindingComparison.boundZone, - ) + const comparisonMismatch = + selectedTask?.bindingStatus === 'role_ready' && + !rebindUnchanged && + bindingComparison?.verdict === 'mismatch' const showProfileForm = showBindingStage && profileEditing const bindingCustomerReady = Boolean( bindingComparison?.customerRoleId || bindingComparison?.customerRoleName, @@ -1384,11 +1352,6 @@ export default function CustomerFulfillmentPage() { {!bindingInfo?.rebindConfirmMessage && !nextRebindText ? ( 请核对虎牙弹窗中选中的目标角色后重新提交。 ) : null} - {bindingProfileMismatch ? ( - - 当前资料与平台原角色不一致,无法直接确认;请修改资料为原角色,或等可换绑时间后再试。 - - ) : null} } /> @@ -1450,38 +1413,15 @@ export default function CustomerFulfillmentPage() { ) : rebindUnchanged ? (
- {bindingProfileMismatch ? ( - - ) : ( - - )} - {bindingProfileMismatch && canSyncBindingProfile ? ( - - ) : null} +