diff --git a/apps/web-antd/src/views/pay/order/data.ts b/apps/web-antd/src/views/pay/order/data.ts index 2192423ae..7acf14000 100644 --- a/apps/web-antd/src/views/pay/order/data.ts +++ b/apps/web-antd/src/views/pay/order/data.ts @@ -257,7 +257,9 @@ export function useDetailSchema(): DescriptionItemSchema[] { field: 'channelOrderNo', label: '渠道单号', content: (data: PayOrderApi.Order) => - h(Tag, { color: 'green' }, () => data?.channelOrderNo || ''), + data?.channelOrderNo + ? h(Tag, { color: 'green' }, () => data.channelOrderNo) + : '', }, { field: 'channelUserId', diff --git a/apps/web-antd/src/views/pay/order/modules/detail.vue b/apps/web-antd/src/views/pay/order/modules/detail.vue index 44d2866b1..dea8cdad4 100644 --- a/apps/web-antd/src/views/pay/order/modules/detail.vue +++ b/apps/web-antd/src/views/pay/order/modules/detail.vue @@ -5,7 +5,7 @@ import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; -import { getOrder } from '#/api/pay/order'; +import { getOrderDetail } from '#/api/pay/order'; import { useDescription } from '#/components/description'; import { useDetailSchema } from '../data'; @@ -34,7 +34,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getOrder(data.id); + formData.value = await getOrderDetail(data.id); } finally { modalApi.unlock(); } diff --git a/apps/web-ele/src/views/pay/order/data.ts b/apps/web-ele/src/views/pay/order/data.ts index 536e5bdfd..df6380880 100644 --- a/apps/web-ele/src/views/pay/order/data.ts +++ b/apps/web-ele/src/views/pay/order/data.ts @@ -257,7 +257,9 @@ export function useDetailSchema(): DescriptionItemSchema[] { field: 'channelOrderNo', label: '渠道单号', content: (data: PayOrderApi.Order) => - h(ElTag, { color: 'green' }, () => data?.channelOrderNo || ''), + data?.channelOrderNo + ? h(ElTag, { color: 'green' }, () => data.channelOrderNo) + : '', }, { field: 'channelUserId', diff --git a/apps/web-ele/src/views/pay/order/modules/detail.vue b/apps/web-ele/src/views/pay/order/modules/detail.vue index 84ab4664f..7f52112ee 100644 --- a/apps/web-ele/src/views/pay/order/modules/detail.vue +++ b/apps/web-ele/src/views/pay/order/modules/detail.vue @@ -5,7 +5,7 @@ import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; -import { getOrder } from '#/api/pay/order'; +import { getOrderDetail } from '#/api/pay/order'; import { useDescription } from '#/components/description'; import { useDetailSchema } from '../data'; @@ -37,7 +37,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getOrder(data.id); + formData.value = await getOrderDetail(data.id); } finally { modalApi.unlock(); }