Skip to content

Commit 7e511d1

Browse files
author
puhui999
committed
mall-order:修复 todo 提到的问题
1 parent a79f145 commit 7e511d1

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

src/api/mall/trade/order/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ export interface OrderVO {
5151
avatar?: string
5252
}
5353
// 订单操作日志
54-
logs?: logs[]
54+
logs?: OrderLogRespVO[]
5555
}
5656

57-
// TODO @puhui999:OrderLogRespVO 会不会更好哈。
58-
export interface logs {
57+
export interface OrderLogRespVO {
5958
content?: string
6059
createTime?: Date
6160
userType?: number

src/config/axios/service.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,6 @@ service.interceptors.response.use(
191191
}
192192
return Promise.reject('error')
193193
} else {
194-
// TODO @puhui999:这个先不用支持哈;
195-
// 前端处理 data 为 null 的情况,进行提示
196-
if (data.msg !== '') {
197-
ElNotification.error({ title: msg })
198-
}
199194
return data
200195
}
201196
},

src/views/mall/trade/afterSale/detail/index.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ const getDetail = async () => {
195195
if (id) {
196196
const res = await AfterSaleApi.getAfterSale(id)
197197
// 没有表单信息则关闭页面返回
198-
if (res === null) {
198+
if (res == null) {
199+
message.notifyError('售后订单不存在')
199200
close()
200201
}
201202
formData.value = res

src/views/mall/trade/order/detail/index.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,10 @@ const { params } = useRoute() // 查询参数
245245
const getDetail = async () => {
246246
const id = params.orderId as unknown as number
247247
if (id) {
248-
const res = (await TradeOrderApi.getOrder(id)) as TradeOrderApi.OrderVO
248+
const res = (await TradeOrderApi.getOrder(66666)) as TradeOrderApi.OrderVO
249249
// 没有表单信息则关闭页面返回
250-
if (res === null) {
250+
if (res == null) {
251+
message.error('交易订单不存在')
251252
close()
252253
}
253254
formData.value = res
@@ -259,7 +260,7 @@ const { delView } = useTagsViewStore() // 视图操作
259260
const { push, currentRoute } = useRouter() // 路由
260261
const close = () => {
261262
delView(unref(currentRoute))
262-
push({ name: 'TradeAfterSale' })
263+
push({ name: 'TradeOrder' })
263264
}
264265
265266
/** 复制 */

0 commit comments

Comments
 (0)