Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7e511d1e
authored
Sep 09, 2023
by
puhui999
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mall-order:修复 todo 提到的问题
parent
a79f1452
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
12 deletions
+8
-12
src/api/mall/trade/order/index.ts
+2
-3
src/config/axios/service.ts
+0
-5
src/views/mall/trade/afterSale/detail/index.vue
+2
-1
src/views/mall/trade/order/detail/index.vue
+4
-3
No files found.
src/api/mall/trade/order/index.ts
View file @
7e511d1e
...
...
@@ -51,11 +51,10 @@ export interface OrderVO {
avatar
?:
string
}
// 订单操作日志
logs
?:
logs
[]
logs
?:
OrderLogRespVO
[]
}
// TODO @puhui999:OrderLogRespVO 会不会更好哈。
export
interface
logs
{
export
interface
OrderLogRespVO
{
content
?:
string
createTime
?:
Date
userType
?:
number
...
...
src/config/axios/service.ts
View file @
7e511d1e
...
...
@@ -191,11 +191,6 @@ service.interceptors.response.use(
}
return
Promise
.
reject
(
'error'
)
}
else
{
// TODO @puhui999:这个先不用支持哈;
// 前端处理 data 为 null 的情况,进行提示
if
(
data
.
msg
!==
''
)
{
ElNotification
.
error
({
title
:
msg
})
}
return
data
}
},
...
...
src/views/mall/trade/afterSale/detail/index.vue
View file @
7e511d1e
...
...
@@ -195,7 +195,8 @@ const getDetail = async () => {
if
(
id
)
{
const
res
=
await
AfterSaleApi
.
getAfterSale
(
id
)
// 没有表单信息则关闭页面返回
if
(
res
===
null
)
{
if
(
res
==
null
)
{
message
.
notifyError
(
'售后订单不存在'
)
close
()
}
formData
.
value
=
res
...
...
src/views/mall/trade/order/detail/index.vue
View file @
7e511d1e
...
...
@@ -245,9 +245,10 @@ const { params } = useRoute() // 查询参数
const
getDetail
=
async
()
=>
{
const
id
=
params
.
orderId
as
unknown
as
number
if
(
id
)
{
const
res
=
(
await
TradeOrderApi
.
getOrder
(
id
))
as
TradeOrderApi
.
OrderVO
const
res
=
(
await
TradeOrderApi
.
getOrder
(
66666
))
as
TradeOrderApi
.
OrderVO
// 没有表单信息则关闭页面返回
if
(
res
===
null
)
{
if
(
res
==
null
)
{
message
.
error
(
'交易订单不存在'
)
close
()
}
formData
.
value
=
res
...
...
@@ -259,7 +260,7 @@ const { delView } = useTagsViewStore() // 视图操作
const
{
push
,
currentRoute
}
=
useRouter
()
// 路由
const
close
=
()
=>
{
delView
(
unref
(
currentRoute
))
push
({
name
:
'Trade
AfterSale
'
})
push
({
name
:
'Trade
Order
'
})
}
/** 复制 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment