diff --git a/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue b/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue
index b17f54eca..2598d0a85 100644
--- a/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue
+++ b/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue
@@ -36,10 +36,10 @@
-
+
-
{{ data.delivery_type == 'express' ? '物流信息' : '送货人信息' }}
+
{{ isExpress ? '物流信息' : deliveryType === 'send' ? '送货人信息' : '发货信息' }}
-
-
{{ data.delivery_type == 'express' ? '物流公司:' : '送货人姓名:' }}
+ {{ isExpress ? '物流公司:' : deliveryType === 'send' ? '送货人姓名:' : '发货方式:' }}
{{ data.delivery_name || '--' }}
-
-
{{ data.delivery_type == 'express' ? '物流单号:' : '送货人电话:' }}
+ {{ isExpress ? '物流单号:' : deliveryType === 'send' ? '送货人电话:' : '发货备注:' }}
{{ data.delivery_id || '--' }}
-
物流查询
+
物流查询
@@ -255,6 +255,14 @@ const orderItems = computed(() => {
return props.data.order_items || props.data.cartInfo || [];
});
+/** 配送方式:express 快递 / send 送货 / fictitious 无需配送 / pickup 自提 / door 上门 */
+const deliveryType = computed(
+ () => props.data.delivery_type || props.data.extra_info?.delivery_type || '',
+);
+const isExpress = computed(() => deliveryType.value === 'express');
+/** 到店自提:后端统一标识 is_pickup,兼容旧字段 order_delivery_type */
+const isPickup = computed(() => props.data.is_pickup == 1 || props.data.order_delivery_type === 'pickup');
+
function formatDate(timestamp) {
if (!timestamp) return '--';
const d = new Date(timestamp * 1000);
diff --git a/frontend/admin/src/pages/plugin/normal/order/Detail.vue b/frontend/admin/src/pages/plugin/normal/order/Detail.vue
index 81d1dd247..8611be857 100644
--- a/frontend/admin/src/pages/plugin/normal/order/Detail.vue
+++ b/frontend/admin/src/pages/plugin/normal/order/Detail.vue
@@ -91,9 +91,7 @@
配送方式:{{
- detailData.extra_info?.delivery_type === 'pickup' ? '到店自提' : '快递配送'
- }}
+ >{{ deliveryTypeText }}
@@ -101,25 +99,23 @@
-
{{ detailData.delivery_type == 'express' ? '物流信息' : '送货人信息' }}
+
{{ isExpressDelivery ? '物流信息' : '发货信息' }}
- {{
- detailData.delivery_type == 'express' ? '物流公司:' : '送货人姓名:'
- }}{{ isExpressDelivery ? '物流公司:' : deliveryType === 'send' ? '送货人姓名:' : '发货方式:' }}{{ detailData.delivery_name || '--' }}