@ -3,35 +3,21 @@
<!-- 订单信息 -- >
< el -descriptions title = "订单信息" >
< el -descriptions -item label = "订单号: " > { { formData . no } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "配送方式: " >
< dict -tag :type ="DICT_TYPE.TRADE_DELIVERY_TYPE" :value ="formData.deliveryType!" / >
< / e l - d e s c r i p t i o n s - i t e m >
<!-- TODO 营销活动待实现 -- >
< el -descriptions -item label = "营销活动: " > 秒杀活动 < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "买家: " > { { formData ? . user ? . nickname } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "订单类型: " >
< dict -tag :type ="DICT_TYPE.TRADE_ORDER_TYPE" :value ="formData.type!" / >
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "收货人: " > { { formData . receiverName } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "买家留言: " > { { formData . userRemark } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "订单来源: " >
< dict -tag :type ="DICT_TYPE.TERMINAL" :value ="formData.terminal!" / >
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = " 联系电话: "> { { formData . receiverMobile } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = " 买家留言: "> { { formData . userRemark } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "商家备注: " > { { formData . remark } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "支付单号: " > { { formData . payOrderId } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "付款方式: " >
< dict -tag :type ="DICT_TYPE.PAY_CHANNEL_CODE" :value ="formData.payChannelCode!" / >
< / e l - d e s c r i p t i o n s - i t e m >
<!-- < el -descriptions -item label = "买家: " > { { formData . user . nickname } } < / e l - d e s c r i p t i o n s - i t e m > - - >
<!-- TODO @ puhui999 ： 待实现 ： 跳转会员 -- >
< el -descriptions -item label = "收货地址: " >
{ { formData . receiverAreaName } } { { formData . receiverDetailAddress } }
< el -link
v - clipboard : copy = "formData.receiverAreaName + ' ' + formData.receiverDetailAddress"
v - clipboard : success = "clipboardSuccess"
icon = "ep:document-copy"
type = "primary"
/ >
< el -descriptions -item label = "推广用户: " v-if ="formData.brokerageUser" >
{ { formData . brokerageUser ? . nickname } }
< / e l - d e s c r i p t i o n s - i t e m >
< / e l - d e s c r i p t i o n s >
@ -45,10 +31,18 @@
调整价格
< / e l - b u t t o n >
< el -button type = "primary" @click ="remark" > 备注 < / el -button >
< el -button v-if ="formData.status! === 10" type="primary" @click="delivery" >
< el -button
v - if = "formData.status! === 10 && formData.deliveryType === DeliveryTypeEnum.EXPRESS.type"
type = "primary"
@ click = "delivery"
>
发货
< / e l - b u t t o n >
< el -button v-if ="formData.status! === 10" type="primary" @click="updateAddress" >
< el -button
v - if = "formData.status! === 10 && formData.deliveryType === DeliveryTypeEnum.EXPRESS.type"
type = "primary"
@ click = "updateAddress"
>
修改地址
< / e l - b u t t o n >
< / e l - d e s c r i p t i o n s - i t e m >
@ -95,53 +89,71 @@
< / e l - r o w >
< / e l - d e s c r i p t i o n s - i t e m >
< / e l - d e s c r i p t i o n s >
< el -descriptions :column ="6" >
< el -descriptions :column ="4" >
<!-- 第一层 -- >
< el -descriptions -item label = "商品总额: " >
{ { fenToYuan ( formData . totalPrice ! ) } } 元
{ { fenToYuan ( formData . totalPrice ! ) } } 元
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "运费金额: " >
{ { fenToYuan ( formData . deliveryPrice ! ) } } 元
{ { fenToYuan ( formData . deliveryPrice ! ) } } 元
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "订单调价: " >
{ { fenToYuan ( formData . adjustPrice ! ) } } 元
{ { fenToYuan ( formData . adjustPrice ! ) } } 元
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item v -for = " item in 1 " :key ="item" label -class -name = " no -colon " / >
<!-- 第二层 -- >
< el -descriptions -item >
< template # label > < span style = "color: red" > 商品 优惠: < / span > < / template >
{ { fenToYuan ( formData . couponPrice ! ) } } 元
< template # label > < span style = "color: red" > 优惠劵 优惠: < / span > < / template >
{ { fenToYuan ( formData . couponPrice ! ) } } 元
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item >
< template # label > < span style = "color: red" > 订单优惠 : < / span > < / template >
{ { fenToYuan ( formData . discountPrice ! ) } } 元
< template # label > < span style = "color: red" > VIP 优惠 : < / span > < / template >
{ { fenToYuan ( formData . vipPrice ! ) } } 元
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item >
< template # label > < span style = "color: red" > 活动优惠 : < / span > < / template >
{ { fenToYuan ( formData . discountPrice ! ) } } 元
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item >
< template # label > < span style = "color: red" > 积分抵扣 : < / span > < / template >
{ { fenToYuan ( formData . pointPrice ! ) } } 元
{ { fenToYuan ( formData . pointPrice ! ) } } 元
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item v -for = " item in 5 " :key ="item" label -class -name = " no -colon " / >
<!-- 占位 -- >
<!-- 第三层 -- >
< el -descriptions -item v -for = " item in 3 " :key ="item" label -class -name = " no -colon " / >
< el -descriptions -item label = "应付金额: " >
{ { fenToYuan ( formData . payPrice ! ) } } 元
{ { fenToYuan ( formData . payPrice ! ) } } 元
< / e l - d e s c r i p t i o n s - i t e m >
< / e l - d e s c r i p t i o n s >
<!-- TODO 芋艿 ： 需要改改 -- >
< el -descriptions :column ="4" title = "物流信息" >
< el -descriptions -item label = "物流公司: " >
<!-- 物流信息 -- >
< el -descriptions :column ="4" title = "收货信息" >
< el -descriptions -item label = "配送方式: " >
< dict -tag :type ="DICT_TYPE.TRADE_DELIVERY_TYPE" :value ="formData.deliveryType!" / >
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "收货人: " > { { formData . receiverName } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "联系电话: " > { { formData . receiverMobile } } < / e l - d e s c r i p t i o n s - i t e m >
<!-- 快递配送 -- >
< div v-if ="formData.deliveryType === DeliveryTypeEnum.EXPRESS.type" >
< el -descriptions -item label = "收货地址: " v-if ="formData.receiverDetailAddress" >
{ { formData . receiverAreaName } } { { formData . receiverDetailAddress } }
< el -link
v - clipboard : copy = "formData.receiverAreaName + ' ' + formData.receiverDetailAddress"
v - clipboard : success = "clipboardSuccess"
icon = "ep:document-copy"
type = "primary"
/ >
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "物流公司: " v-if ="formData.logisticsId" >
{ { deliveryExpressList . find ( ( item ) => item . id === formData . logisticsId ) ? . name } }
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "运单号: " > { { formData . logisticsNo } } < / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "发货时间: " >
{ { formatDate ( formData . deliveryTime ! ) } }
< el -descriptions -item label = "运单号: " v-if ="formData.logisticsId" >
{ { formData . logisticsNo } }
< / e l - d e s c r i p t i o n s - i t e m >
< el -descriptions -item label = "物流状态: " >
<!-- TODO 物流状态怎么获取 ？ -- >
< dict -tag :type ="DICT_TYPE.TRADE_ORDER_STATUS" :value ="formData.deliveryStatus!" / >
< el -descriptions -item label = "发货时间: " v-if ="formatDate.deliveryTime" >
{ { formatDate ( formData . deliveryTime ) } }
< / e l - d e s c r i p t i o n s - i t e m >
<!-- 占位 4 -- >
< el -descriptions -item v -for = " item in 4 " :key ="item" label -class -name = " no -colon " / >
< el -descriptions -item label = "物流详情: " >
< el -descriptions -item v -for = " item in 2 " :key ="item" label -class -name = " no -colon " / >
< el -descriptions -item label = "物流详情: " v-if ="expressTrackList.length > 0" >
< el -timeline >
< el -timeline -item
v - for = "(express, index) in expressTrackList"
@ -152,7 +164,16 @@
< / e l - t i m e l i n e - i t e m >
< / e l - t i m e l i n e >
< / e l - d e s c r i p t i o n s - i t e m >
< / div >
<!-- 自提门店 -- >
< div v-if ="formData.deliveryType === DeliveryTypeEnum.PICK_UP.type" >
< el -descriptions -item label = "自提门店: " v-if ="formData.pickUpStoreId" >
{ { pickUpStore . name } }
< / e l - d e s c r i p t i o n s - i t e m >
< / div >
< / e l - d e s c r i p t i o n s >
<!-- 订单日志 -- >
< el -descriptions title = "订单操作日志" >
< el -descriptions -item labelClassName = "no-colon" >
< el -timeline >
@ -196,6 +217,8 @@ import OrderUpdateAddressForm from '@/views/mall/trade/order/form/OrderUpdateAdd
import OrderUpdatePriceForm from '@/views/mall/trade/order/form/OrderUpdatePriceForm.vue'
import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
import { useTagsViewStore } from '@/store/modules/tagsView'
import { DeliveryTypeEnum } from '@/utils/constants'
import * as DeliveryPickUpStoreApi from '@/api/mall/trade/delivery/pickUpStore'
defineOptions ( { name : 'TradeOrderDetail' } )
@ -271,10 +294,20 @@ const clipboardSuccess = () => {
/** 初始化 **/
const deliveryExpressList = ref ( [ ] ) / / 物 流 公 司
const expressTrackList = ref ( [ ] ) / / 物 流 详 情
const pickUpStore = ref ( { } ) / / 自 提 门 店
onMounted ( async ( ) => {
await getDetail ( )
/ / 如 果 配 送 方 式 为 快 递 ， 则 查 询 物 流 公 司
if ( formData . value . deliveryType === DeliveryTypeEnum . EXPRESS . type ) {
deliveryExpressList . value = await DeliveryExpressApi . getSimpleDeliveryExpressList ( )
if ( form . value . logisticsId ) {
expressTrackList . value = await TradeOrderApi . getExpressTrackList ( formData . value . id ! )
}
} else if ( formData . value . deliveryType === DeliveryTypeEnum . PICK _UP . type ) {
pickUpStore . value = await DeliveryPickUpStoreApi . getDeliveryPickUpStore (
formData . value . pickUpStoreId
)
}
} )
< / script >
< style lang = "scss" scoped >
@ -312,7 +345,7 @@ onMounted(async () => {
/ / 时 间 线 样 式 调 整
: deep ( . el - timeline ) {
margin : 10 px 0 px 0 px 160 px ;
margin : 10 px 0 0 160 px ;
. el - timeline - item _ _wrapper {
position : relative ;
YunaiV