From 73089bbfdf620ad9cbb02dcc8dc925ba81efe2d7 Mon Sep 17 00:00:00 2001 From: erio Date: Sun, 1 Mar 2026 14:49:25 +0800 Subject: [PATCH] fix: display backend error message directly without i18n translation --- backend/internal/handler/admin/account_handler.go | 6 ------ .../src/components/account/BulkEditAccountModal.vue | 12 ++---------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/backend/internal/handler/admin/account_handler.go b/backend/internal/handler/admin/account_handler.go index 38250ae3..98ead284 100644 --- a/backend/internal/handler/admin/account_handler.go +++ b/backend/internal/handler/admin/account_handler.go @@ -1127,12 +1127,6 @@ func (h *AccountHandler) BulkUpdate(c *gin.Context) { c.JSON(409, gin.H{ "error": "mixed_channel_warning", "message": mixedErr.Error(), - "details": gin.H{ - "group_id": mixedErr.GroupID, - "group_name": mixedErr.GroupName, - "current_platform": mixedErr.CurrentPlatform, - "other_platform": mixedErr.OtherPlatform, - }, }) return } diff --git a/frontend/src/components/account/BulkEditAccountModal.vue b/frontend/src/components/account/BulkEditAccountModal.vue index 949400ea..30c3d739 100644 --- a/frontend/src/components/account/BulkEditAccountModal.vue +++ b/frontend/src/components/account/BulkEditAccountModal.vue @@ -1283,11 +1283,7 @@ const preCheckMixedChannelRisk = async (built: Record): Promise if (!result.has_risk) return true pendingUpdatesForConfirm.value = built - mixedChannelWarningMessage.value = t('admin.accounts.mixedChannelWarning', { - groupName: result.details?.group_name, - currentPlatform: result.details?.current_platform, - otherPlatform: result.details?.other_platform - }) + mixedChannelWarningMessage.value = result.message || t('admin.accounts.bulkEdit.failed') showMixedChannelWarning.value = true return false } catch (error: any) { @@ -1362,11 +1358,7 @@ const submitBulkUpdate = async (baseUpdates: Record) => { // 兜底:多平台混合场景下,预检查跳过,由后端 409 触发确认框 if (error.status === 409 && error.error === 'mixed_channel_warning') { pendingUpdatesForConfirm.value = baseUpdates - mixedChannelWarningMessage.value = t('admin.accounts.mixedChannelWarning', { - groupName: error.details?.group_name, - currentPlatform: error.details?.current_platform, - otherPlatform: error.details?.other_platform - }) + mixedChannelWarningMessage.value = error.message showMixedChannelWarning.value = true } else { appStore.showError(error.message || t('admin.accounts.bulkEdit.failed'))