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
b079b4ba
Commit
b079b4ba
authored
Sep 28, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理订单线上确认凭证预览异常问题
parent
12c182e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
index.tsx
...stem/orderDetail/components/orderPayResultModal/index.tsx
+2
-1
index.tsx
...orderSystem/orderDetail/components/orderPayTabs/index.tsx
+1
-0
index.tsx
src/pages/orderSystem/orderDetail/index.tsx
+2
-0
No files found.
src/pages/orderSystem/orderDetail/components/orderPayResultModal/index.tsx
View file @
b079b4ba
...
...
@@ -7,6 +7,7 @@ import { history } from 'umi'
import
OverflowText
from
'@/components/OverflowText'
export
interface
OrderPayResultModalProps
{
/** default: 确认模式,preview: 预览模式 */
type
:
'default'
|
'preview'
,
currentRef
:
any
}
...
...
@@ -16,7 +17,7 @@ const OrderPayResultModal:React.FC<OrderPayResultModalProps> = ({type, currentRe
const
{
id
}
=
usePageStatus
()
const
[
visible
,
setVisible
]
=
useState
(
false
)
const
[
isReady
,
setIsReady
]
=
useState
<
any
>
()
const
canCtlData
=
data
.
payments
.
find
(
v
=>
v
.
showConfirm
)
||
{}
const
canCtlData
=
data
.
payments
.
find
(
v
=>
type
===
'preview'
?
v
.
showView
:
v
.
showConfirm
)
||
{}
// const transData = canCtlData.vouchers?.split(',') || []
...
...
src/pages/orderSystem/orderDetail/components/orderPayTabs/index.tsx
View file @
b079b4ba
...
...
@@ -15,6 +15,7 @@ const TabPane = Tabs.TabPane
const
TabHeader
=
({
dataSource
})
=>
{
const
{
setPayResultType
,
payResultVisible
}
=
useContext
(
OrderDetailContext
)
return
<
div
>
<
Row
justify=
'space-between'
style=
{
{
minWidth
:
216
}
}
>
<
Col
>
...
...
src/pages/orderSystem/orderDetail/index.tsx
View file @
b079b4ba
...
...
@@ -13,6 +13,7 @@ import OrderTransformRecord from './components/orderTransformRecord'
import
OrderPayTabs
from
'./components/orderPayTabs'
import
OrderDeleveRecord
from
'./components/orderDeleveRecord'
import
{
OrderKindType
}
from
'./constant'
import
OrderPayResultModal
from
'./components/orderPayResultModal'
export
interface
CommonOrderDetailProps
{}
...
...
@@ -110,6 +111,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
<
OrderTransformRecord
/>
</
div
>
</
OrderDetailWrapper
>
<
OrderPayResultModal
currentRef=
{
payResultVisible
}
type=
{
payResultType
}
/>
</
OrderDetailContext
.
Provider
>
</
div
>
)
:
null
...
...
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