diff --git a/src/api/mall/trade/order/index.ts b/src/api/mall/trade/order/index.ts index 21ef8de3..9ab2756c 100644 --- a/src/api/mall/trade/order/index.ts +++ b/src/api/mall/trade/order/index.ts @@ -34,6 +34,7 @@ export interface OrderVO { deliveryTemplateId?: number | null // 配送模板编号 logisticsId?: number | null // 发货物流公司编号 logisticsNo?: string // 发货物流单号 + logisticsLabel?: string //发货物流面单短链 deliveryTime?: Date | null // 发货时间 receiveTime?: Date | null // 收货时间 receiverName?: string // 收件人名称 diff --git a/src/views/mall/product/spu/form/DeliveryForm.vue b/src/views/mall/product/spu/form/DeliveryForm.vue index 20aacf5e..d012f015 100644 --- a/src/views/mall/product/spu/form/DeliveryForm.vue +++ b/src/views/mall/product/spu/form/DeliveryForm.vue @@ -3,27 +3,16 @@ - + {{ dict.label }} - + - + @@ -44,7 +33,7 @@ const message = useMessage() // 消息弹窗 const props = defineProps({ propFormData: { type: Object as PropType, - default: () => {} + default: () => { } }, isDetail: propTypes.bool.def(false) // 是否作为详情组件 }) diff --git a/src/views/mall/trade/order/detail/index.vue b/src/views/mall/trade/order/detail/index.vue index bc427cdc..a3bfa52e 100644 --- a/src/views/mall/trade/order/detail/index.vue +++ b/src/views/mall/trade/order/detail/index.vue @@ -27,37 +27,23 @@ - + 调整价格 备注 @@ -93,10 +79,7 @@ @@ -152,30 +135,23 @@
{{ formData.receiverAreaName }} {{ formData.receiverDetailAddress }} - + - {{ deliveryExpressList.find((item) => item.id === formData.logisticsId)?.name }} + {{deliveryExpressList.find((item) => item.id === formData.logisticsId)?.name}} {{ formData.logisticsNo }} - - + + {{ formatDate(formData.deliveryTime) }} - + {{ express.content }} @@ -193,20 +169,13 @@ - +
{{ log.content }}
@@ -258,7 +227,7 @@ const getUserTypeColor = (type: number) => { } // 订单详情 -const formData = ref({ +const formData = ref < TradeOrderApi.OrderVO > ({ logs: [] }) @@ -290,7 +259,7 @@ const handlePickUp = async () => { message.success('核销成功') // 刷新列表 await getDetail() - } catch {} + } catch { } } /** 获得详情 */ @@ -403,11 +372,15 @@ onMounted(async () => { &::before { position: absolute; top: 10px; - left: 13px; /* 将伪元素水平居中 */ - border-color: transparent var(--app-content-bg-color) transparent transparent; /* 尖角颜色,左侧朝向 */ + left: 13px; + /* 将伪元素水平居中 */ + border-color: transparent var(--app-content-bg-color) transparent transparent; + /* 尖角颜色,左侧朝向 */ border-style: solid; - border-width: 8px; /* 调整尖角大小 */ - content: ''; /* 必须设置 content 属性 */ + border-width: 8px; + /* 调整尖角大小 */ + content: ''; + /* 必须设置 content 属性 */ } } diff --git a/src/views/mall/trade/order/form/OrderDeliveryForm.vue b/src/views/mall/trade/order/form/OrderDeliveryForm.vue index fca5a466..f01d25c0 100644 --- a/src/views/mall/trade/order/form/OrderDeliveryForm.vue +++ b/src/views/mall/trade/order/form/OrderDeliveryForm.vue @@ -7,6 +7,16 @@ 无需发货 + diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue index ea571ff1..b1c904c4 100644 --- a/src/views/mall/trade/order/index.vue +++ b/src/views/mall/trade/order/index.vue @@ -4,149 +4,64 @@ - + - + - - + + - + - + - + - + - + - + - - - + + + - - + + - + @@ -171,19 +86,11 @@