diff --git a/src/pages/approval/handle.vue b/src/pages/approval/handle.vue index 885daa1..49ed9d3 100644 --- a/src/pages/approval/handle.vue +++ b/src/pages/approval/handle.vue @@ -53,6 +53,11 @@ const validateForm = () => { showConfirmDialog({ title: '提示', message: '退款金额不能超过商品价格' }) return false } + + if (!formData.value.auditImages) { + showConfirmDialog({ title: '提示', message: '请上传审核图片' }) + return false + } if (formData.value.status === 3 && !formData.value.auditRemark) { showConfirmDialog({ title: '提示', message: '驳回时必须填写审核说明' }) return false @@ -153,7 +158,7 @@ const handleSubmit = async () => { submitting.value = true try { - const { code } = await handleApprovalApi(formData.value) + const { code, msg } = await handleApprovalApi(formData.value) if (code === 0) { showSuccessToast('操作成功') @@ -162,6 +167,12 @@ const handleSubmit = async () => { message: `审批处理已完成` }) router.push('/approval/list') + } else { + console.error('操作失败code:', code, 'msg:', msg) + showConfirmDialog({ + title: '操作失败', + message: msg || '操作失败' + }) } } catch (error) { console.error('提交失败:', error) diff --git a/src/pages/order/Success.vue b/src/pages/order/Success.vue index 1e441c8..34b26ff 100644 --- a/src/pages/order/Success.vue +++ b/src/pages/order/Success.vue @@ -20,7 +20,7 @@ async function handleOpenCabinet(orderId: number, orderGoodsId: number) { try { const result = await openCabinetApi(orderId, orderGoodsId) if (result.code !== 0) { - showFailToast(result.message) + showFailToast(result.msg || '开启失败,请稍后重试') return } showSuccessToast('柜口已成功开启') diff --git a/types/api.d.ts b/types/api.d.ts index d28b91f..45e18a6 100644 --- a/types/api.d.ts +++ b/types/api.d.ts @@ -2,11 +2,11 @@ interface ApiResponseData { code: number data: T - message: string + msg: string } interface ApiResponseMsgData { code: number data: T - message: string + msg: string } \ No newline at end of file