File tree Expand file tree Collapse file tree 4 files changed +8
-12
lines changed Expand file tree Collapse file tree 4 files changed +8
-12
lines changed Original file line number Diff line number Diff line change @@ -51,11 +51,10 @@ export interface OrderVO {
51
51
avatar ?: string
52
52
}
53
53
// 订单操作日志
54
- logs ?: logs [ ]
54
+ logs ?: OrderLogRespVO [ ]
55
55
}
56
56
57
- // TODO @puhui 999:OrderLogRespVO 会不会更好哈。
58
- export interface logs {
57
+ export interface OrderLogRespVO {
59
58
content ?: string
60
59
createTime ?: Date
61
60
userType ?: number
Original file line number Diff line number Diff line change @@ -191,11 +191,6 @@ service.interceptors.response.use(
191
191
}
192
192
return Promise . reject ( 'error' )
193
193
} else {
194
- // TODO @puhui 999:这个先不用支持哈;
195
- // 前端处理 data 为 null 的情况,进行提示
196
- if ( data . msg !== '' ) {
197
- ElNotification . error ( { title : msg } )
198
- }
199
194
return data
200
195
}
201
196
} ,
Original file line number Diff line number Diff line change @@ -195,7 +195,8 @@ const getDetail = async () => {
195
195
if (id ) {
196
196
const res = await AfterSaleApi .getAfterSale (id )
197
197
// 没有表单信息则关闭页面返回
198
- if (res === null ) {
198
+ if (res == null ) {
199
+ message .notifyError (' 售后订单不存在' )
199
200
close ()
200
201
}
201
202
formData .value = res
Original file line number Diff line number Diff line change @@ -245,9 +245,10 @@ const { params } = useRoute() // 查询参数
245
245
const getDetail = async () => {
246
246
const id = params .orderId as unknown as number
247
247
if (id ) {
248
- const res = (await TradeOrderApi .getOrder (id )) as TradeOrderApi .OrderVO
248
+ const res = (await TradeOrderApi .getOrder (66666 )) as TradeOrderApi .OrderVO
249
249
// 没有表单信息则关闭页面返回
250
- if (res === null ) {
250
+ if (res == null ) {
251
+ message .error (' 交易订单不存在' )
251
252
close ()
252
253
}
253
254
formData .value = res
@@ -259,7 +260,7 @@ const { delView } = useTagsViewStore() // 视图操作
259
260
const { push, currentRoute } = useRouter () // 路由
260
261
const close = () => {
261
262
delView (unref (currentRoute ))
262
- push ({ name: ' TradeAfterSale ' })
263
+ push ({ name: ' TradeOrder ' })
263
264
}
264
265
265
266
/** 复制 */
You can’t perform that action at this time.
0 commit comments