diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index f211154..a967093 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -343,7 +343,7 @@ const computeEligibilityError = () => { if (!formData.value.marriageNo) return ''; if (!formData.value.marriageNo.startsWith('640')) { - return '本活动仅限在宁夏办理结婚登记的新人参与,当前结婚证字号不符合活动要求。'; + return '此结婚登记号不符合本次活动,谢谢!'; } const registerYear = pickYear(formData.value.registerDate); @@ -351,7 +351,7 @@ const computeEligibilityError = () => { const endYear = pickYear(activityInfo.value.activityEndTime); if (![startYear, endYear].includes(registerYear)) { - return `您的结婚证登记年份不在活动范围内,暂无法领取。`; + return `此结婚登记号不符合本次活动,谢谢!`; } return ''; @@ -659,13 +659,13 @@ const handleImageChange = () => { persistMarriageInfo(); } else { showDialog({ - message: '解析OCR信息失败,请稍后重试', + message: '结婚证上传失败,请重试!', }); ocrUploadId.value && (ocrUploadId.value.value = ''); } }).catch((error) => { showDialog({ - message: error?.msg || '解析OCR信息失败,请稍后重试', + message: error?.msg || '结婚证上传失败,请重试!', }); ocrUploadId.value && (ocrUploadId.value.value = ''); }).finally(() => { diff --git a/src/pages/idcard/index.vue b/src/pages/idcard/index.vue index da3724d..38eef9f 100644 --- a/src/pages/idcard/index.vue +++ b/src/pages/idcard/index.vue @@ -325,6 +325,8 @@ const submitClaim = async () => { showLoading() try { await apiService.receiveCheck({ + manIdCard: marriageInfo.value.husbandId || '', + womanIdCard: marriageInfo.value.wifeId || '', marriageNo: marriageInfo.value.marriageNo, receiveName: marriageInfo.value.husbandName || marriageInfo.value.certificateHolder || marriageInfo.value.wifeName, receiveMobile: userInfo.value.phone, diff --git a/src/services/apiService.ts b/src/services/apiService.ts index d4882d2..7f29cd1 100644 --- a/src/services/apiService.ts +++ b/src/services/apiService.ts @@ -64,6 +64,8 @@ export interface MarriageOcrParseResponse { } export interface MarriageCodeDTO { + manIdCard?: string + womanIdCard?: string marriageNo?: string receiveName?: string receiveMobile?: string