提交 cdb2b253 authored 作者: 王鹏飞's avatar 王鹏飞

新增订单日志

上级 c4a38c94
......@@ -33,3 +33,9 @@ export function getSkuList(data) {
export function orderSearch(data) {
return httpRequest.post('/api/shop/pay/order/search', data)
}
/**
* 获取订单日志
*/
export function getOrderLogs(data) {
return httpRequest.post('/api/shop/order/logs/search', data)
}
......@@ -11,24 +11,20 @@
</div>
<div>下单时间:{{ data.create_time }}</div>
</div>
<div class="order-status">
<div class="order-status" v-if="logs.length">
<el-steps :active="stepActive" align-center>
<el-step title="买家下单" :description="data.create_time"></el-step>
<!-- <el-step title="买家下单" :description="data.create_time"></el-step>
<el-step title="买家付款" :description="data.pay_time"></el-step>
<el-step title="交易成功">
<template #description>{{ data.update_time }}</template>
</el-step>
</el-step> -->
<el-step
:title="item.log_desc"
:description="item.create_time"
v-for="(item, index) in logs"
:key="index"
></el-step>
</el-steps>
<!-- <el-row>
<el-col :span="8"></el-col>
<el-col :span="16">
<el-steps :active="2" align-center>
<el-step title="买家下单" :description="data.create_time"></el-step>
<el-step title="买家付款" :description="data.pay_time"></el-step>
<el-step title="交易成功" :description="data.update_time"></el-step>
</el-steps>
</el-col>
</el-row> -->
</div>
<div class="order-fields">
<el-row>
......@@ -109,13 +105,14 @@ import AppCard from '@/components/base/card'
import TableList from '@/components/base/tableList'
import GoodsItem from '@/components/goods/goodsItem'
import { getOrderList } from '@/api/order'
import { getOrderList, getOrderLogs } from '@/api/order'
export default {
components: { AppCard, TableList, GoodsItem },
data() {
return {
loading: false,
data: {}
data: {},
logs: []
}
},
computed: {
......@@ -156,10 +153,15 @@ export default {
this.viewRender()
},
viewRender() {
// 订单详情
getOrderList({ shop_id: this.shopId, order_detail_id: this.pid }).then(response => {
const [first] = response.data
this.data = first
})
// 订单日志
getOrderLogs({ order_detail_id: this.pid }).then(response => {
this.logs = response.data
})
},
paymentMethod(value) {
const map = {
......
......@@ -41,7 +41,7 @@ httpRequest.interceptors.response.use(
router.replace('/shop')
return Promise.reject(data)
}
if (![1010, 1001].includes(data.code)) {
if (![1010, 1001, 3002].includes(data.code)) {
Message.error(data.msg || data.message)
}
return Promise.reject(data)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论