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
shenshaokai
jinfa-admin
Commits
59a6f99b
Commit
59a6f99b
authored
Jun 24, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 订单详情月结账期支付方式显示
parent
7c8070e4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
7 deletions
+29
-7
index.tsx
...orderSystem/orderDetail/components/orderPayTabs/index.tsx
+27
-5
index.tsx
src/pages/orderSystem/orderDetail/index.tsx
+2
-2
yarn.lock
yarn.lock
+0
-0
No files found.
src/pages/orderSystem/orderDetail/components/orderPayTabs/index.tsx
View file @
59a6f99b
...
...
@@ -37,14 +37,26 @@ const TabHeader = ({dataSource}) => {
</
div
>
}
// 支付
信息
const
payTextList
=
[
"
"
,
// 支付
方式
const
payTextList
=
[
"积分支付
"
,
'线上支付'
,
'线下支付'
,
'授信支付'
,
'货到付款'
'货到付款'
,
]
// 支付渠道
const
payChannel
=
[
"积分支付"
,
"支付宝"
,
"微信"
,
"银联"
,
"余额支付"
,
"线下支付线上确认"
,
"授信额度支付"
,
"货到付款"
,
]
const
OrderPayTabs
:
React
.
FC
<
OrderPayTabsProps
>
=
(
props
)
=>
{
const
{
data
}
=
useContext
(
OrderDetailContext
)
const
[
payList
,
setPaylist
]
=
useState
<
any
[]
>
([])
...
...
@@ -72,14 +84,24 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
<
Col
className=
{
style
.
fontGray
}
span=
{
4
}
>
支付环节:
</
Col
>
<
Col
>
{
v
.
payNode
}
</
Col
>
</
Row
>
{
v
.
payWay
===
-
1
?
<
Row
>
<
Col
className=
{
style
.
fontGray
}
span=
{
4
}
>
支付方式:
</
Col
>
<
Col
>
{
v
.
channel
===
100
?
'账期'
:
'月结'
}
</
Col
>
</
Row
>
:
<>
<
Row
>
<
Col
className=
{
style
.
fontGray
}
span=
{
4
}
>
支付方式:
</
Col
>
<
Col
>
{
payTextList
[
v
.
payWay
]
}
</
Col
>
</
Row
>
<
Row
>
<
Col
className=
{
style
.
fontGray
}
span=
{
4
}
>
支付渠道:
</
Col
>
<
Col
>
{
payList
.
find
(
j
=>
j
.
id
===
v
.
channel
)?.
way
||
(
v
.
channel
===
0
&&
'积分支付'
)
}
</
Col
>
<
Col
>
{
payChannel
[
v
.
channel
]
}
</
Col
>
</
Row
>
</>
}
</
TabPane
>)
}
</
Tabs
>
{
/* </Row> */
}
...
...
src/pages/orderSystem/orderDetail/index.tsx
View file @
59a6f99b
...
...
@@ -79,8 +79,8 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
customKey=
'state'
outerVerifyCurrent=
{
findLastIndexFlowState
(
formData
.
externalWorkflowFlowRecordLogResponses
)
}
innerVerifyCurrent=
{
findLastIndexFlowState
(
formData
.
interiorWorkflowFlowRecordLogResponses
)
}
outerVerifySteps=
{
formData
.
externalWorkflowFlowRecordLogResponses
||
[]
}
innerVerifySteps=
{
formData
.
interiorWorkflowFlowRecordLogResponses
||
[]
}
outerVerifySteps=
{
formData
.
externalWorkflowFlowRecordLogResponses
||
null
}
innerVerifySteps=
{
formData
.
interiorWorkflowFlowRecordLogResponses
||
null
}
></
AuditProcess
>
}
{
/* 商品列表 */
}
...
...
yarn.lock
View file @
59a6f99b
This diff is collapsed.
Click to expand it.
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