修改:主体不一致不拦截,只提示
continuous-integration/drone/push Build was killed
continuous-integration/drone/promote/prod Build is failing

This commit is contained in:
Linzm committed 2026-11-04 09:59:24 +08:00
1 parent ff30dbb6b4
commit b25e3ca473
2 files changed
+7 -12

No files matched your search

+4 -4
View File
@@ -60,7 +60,10 @@ export const jingdongConfig = {
needPhotoOrText: '请上传照片或输入描述后再发送', needPhotoOrText: '请上传照片或输入描述后再发送',
needProductTitle: (label: string) => `请填写${label}后再发送`, needProductTitle: (label: string) => `请填写${label}后再发送`,
inspectingTip: '正在识别照片,请稍候…', inspectingTip: '正在识别照片,请稍候…',
subjectMismatchTip: '照片主体与订单不符,请更换照片', /** 仅提示,不拦截发送 */
subjectMismatchTip: '上传图片的主体数量与下单主体数量不一致',
subjectMismatchToast: (got: string, need: string) =>
`上传图片主体(${got})与下单主体(${need})数量不一致`,
generating: '正在生成效果图,请稍候…', generating: '正在生成效果图,请稍候…',
generatingTip: '效果图生成中,完成后可继续操作', generatingTip: '效果图生成中,完成后可继续操作',
downloadOk: '已开始下载效果图', downloadOk: '已开始下载效果图',
@@ -70,8 +73,5 @@ export const jingdongConfig = {
effectPreparing: '效果图准备中,请稍后再试', effectPreparing: '效果图准备中,请稍后再试',
generateFail: '这次没生成成功,请换个描述或照片再试', generateFail: '这次没生成成功,请换个描述或照片再试',
editFail: '这次调整没成功,请换个描述再试', editFail: '这次调整没成功,请换个描述再试',
/** 识别主体与订单主体不一致 */
subjectMismatch:
'上传图片的主体数量与下单主体不一致,请更换与订单相符的照片后再试',
}, },
} }
+3 -8
View File
@@ -355,7 +355,7 @@ const canSend = computed(() => {
// 编辑:需有飞入的效果图 + 调整文案 // 编辑:需有飞入的效果图 + 调整文案
return !!pendingPreview.value && draft.value.trim().length > 0 return !!pendingPreview.value && draft.value.trim().length > 0
} }
if (!subjectMatched.value && pendingPreview.value) return false // 主体不一致只提示,不拦截发送
// 首轮生图需上传照片(对齐 agent:upload → submit → poll) // 首轮生图需上传照片(对齐 agent:upload → submit → poll)
return !!pendingPreview.value return !!pendingPreview.value
}) })
@@ -420,8 +420,9 @@ function checkSubjectMatch(inspectResult: ImageInspect) {
if (!matched) { if (!matched) {
const need = subjectNameFromStat.value || formatSubjectCountsLabel(orderSubject) const need = subjectNameFromStat.value || formatSubjectCountsLabel(orderSubject)
const got = formatSubjectCountsLabel(detected) const got = formatSubjectCountsLabel(detected)
// 仅提示不一致,不拦截后续发送
showToast({ showToast({
message: `图片主体(${got})与下单主体(${need})不一致,请更换与订单相符的照片`, message: config.messages.subjectMismatchToast(got, need),
duration: 3200, duration: 3200,
}) })
} }
@@ -863,12 +864,6 @@ function onSend() {
return return
} }
if (pendingPreview.value && !subjectMatched.value) {
const need = subjectNameFromStat.value || '订单主体'
showToast(`图片主体与下单主体(${need})不一致,请更换照片`)
return
}
if (titleSpec.value && !productTitle.value.trim()) { if (titleSpec.value && !productTitle.value.trim()) {
titleInvalid.value = true titleInvalid.value = true
showToast(config.messages.needProductTitle(titleSpec.value.label)) showToast(config.messages.needProductTitle(titleSpec.value.label))