From 25fe87e94c3a479e3f87cfb253e86d7711391527 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 5 Oct 2025 21:30:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E3=80=90antd=E3=80=91=E3=80=90ele?=
 =?UTF-8?q?=E3=80=91=E3=80=90pay=20=E6=94=AF=E4=BB=98=E3=80=91pay/order=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BD=BF=E7=94=A8=E9=94=99=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/pay/order/data.ts            | 4 +++-
 apps/web-antd/src/views/pay/order/modules/detail.vue | 4 ++--
 apps/web-ele/src/views/pay/order/data.ts             | 4 +++-
 apps/web-ele/src/views/pay/order/modules/detail.vue  | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

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();
     }