Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project
jinfa-admin
Commits
380d1018
Commit
380d1018
authored
Jan 05, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:简单流程订单添加发货信息显示
parent
73dd81d0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
2 deletions
+36
-2
index.tsx
...orderSystem/orderDetail/components/orderPayTabs/index.tsx
+36
-2
No files found.
src/pages/orderSystem/orderDetail/components/orderPayTabs/index.tsx
View file @
380d1018
...
...
@@ -7,6 +7,7 @@ import StatusColors from '../../../components/StatusColors'
import
{
PublicApi
}
from
'@/services/api'
import
{
PayOutWorkState
}
from
'@/constants'
import
{
Link
}
from
'umi'
import
moment
from
'moment'
export
interface
OrderPayTabsProps
{}
...
...
@@ -48,6 +49,9 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
const
{
data
}
=
useContext
(
OrderDetailContext
)
const
[
payList
,
setPaylist
]
=
useState
<
any
[]
>
([])
// 简单流程为24
const
processEnum
=
data
.
processEnum
useEffect
(()
=>
{
PublicApi
.
getPayPayWayList
({
memberId
:
data
.
supplyMembersId
,
memberRoleId
:
data
.
supplyMembersRoleId
}).
then
(
res
=>
{
const
{
code
,
data
}
=
res
...
...
@@ -56,8 +60,12 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
}
})
},
[])
return
(
<
MellowCard
style=
{
{
marginTop
:
24
}
}
bordered=
{
false
}
>
<
Row
gutter=
{
24
}
style=
{
{
marginTop
:
24
}
}
>
<
Col
span=
{
processEnum
===
24
?
12
:
24
}
>
<
MellowCard
bordered=
{
false
}
fullHeight
>
{
/* <Row gutter={24}> */
}
<
Tabs
defaultActiveKey=
'1'
>
{
data
.
paymentInformationResponses
&&
data
.
paymentInformationResponses
.
map
(
v
=>
<
TabPane
key=
{
v
.
id
}
tab=
{
<
TabHeader
dataSource=
{
v
}
/>
}
>
<
Row
>
...
...
@@ -70,11 +78,37 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
</
Row
>
<
Row
>
<
Col
className=
{
style
.
fontGray
}
span=
{
4
}
>
支付渠道:
</
Col
>
<
Col
>
{
payList
.
find
(
j
=>
j
.
id
===
v
.
channel
)?.
way
}
</
Col
>
<
Col
>
{
payList
.
find
(
j
=>
j
.
id
===
v
.
channel
)?.
way
||
(
v
.
channel
===
0
&&
'积分支付'
)
}
</
Col
>
</
Row
>
</
TabPane
>)
}
</
Tabs
>
{
/* </Row> */
}
</
MellowCard
>
</
Col
>
{
processEnum
===
24
&&
data
&&
<
Col
span=
{
12
}
>
<
MellowCard
title=
"发货信息"
fullHeight
>
{
data
.
name
&&
<
Row
className=
{
style
[
'card-list'
]
}
>
<
Col
span=
{
6
}
><
p
>
发货地址:
</
p
></
Col
>
<
Col
><
p
>
{
data
.
name
}
</
p
></
Col
>
</
Row
>
}
{
data
?.
deliverTime
&&
<
Row
className=
{
style
[
'card-list'
]
}
>
<
Col
span=
{
6
}
><
p
>
发货时间:
</
p
></
Col
>
<
Col
><
p
>
{
data
?.
deliverTime
&&
moment
(
data
.
deliverTime
).
format
(
'YYYY-MM-DD'
)
}
</
p
></
Col
>
</
Row
>
}
{
data
.
deliverNo
&&
<
Row
className=
{
style
[
'card-list'
]
}
>
<
Col
span=
{
6
}
><
p
>
物流单号:
</
p
></
Col
>
<
Col
><
p
><
a
href=
{
`https://www.kuaidi100.com/chaxun?nu=${data.deliverNo}`
}
target=
"_blank"
>
{
data
.
deliverNo
}
</
a
></
p
></
Col
>
</
Row
>
}
{
data
.
logisticsCompany
&&
<
Row
className=
{
style
[
'card-list'
]
}
>
<
Col
span=
{
6
}
><
p
>
物流公司:
</
p
></
Col
>
<
Col
><
p
>
{
data
.
logisticsCompany
}
</
p
></
Col
>
</
Row
>
}
</
MellowCard
>
</
Col
>
}
</
Row
>
)
}
...
...
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