Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
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
linweijiong
jinfa-platform
Commits
9e42aa53
Commit
9e42aa53
authored
Nov 19, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:支付错误时为显示错误提示的问题
parent
a127e538
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
19 deletions
+18
-19
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+2
-1
index.tsx
src/pages/lxMall/pay/components/balance/index.tsx
+6
-1
index.tsx
src/pages/lxMall/pay/index.tsx
+10
-17
No files found.
src/pages/lxMall/commodityDetail/index.tsx
View file @
9e42aa53
...
...
@@ -1007,7 +1007,8 @@ const CommodityDetail = (props) => {
<
div
className=
{
styles
.
product_info_line_label
}
>
支付方式
</
div
>
<
div
className=
{
styles
.
product_info_line_brief
}
>
{
payWayList
.
map
((
item
,
index
)
=>
<
span
key=
{
`pay_way_item_${index}`
}
className=
{
styles
.
text
}
>
{
item
.
payVal
}
</
span
>)
commodityDetail
?.
priceType
===
3
?
<
span
className=
{
styles
.
text
}
>
积分支付
</
span
>
:
payWayList
.
map
((
item
,
index
)
=>
<
span
key=
{
`pay_way_item_${index}`
}
className=
{
styles
.
text
}
>
{
item
.
payVal
}
</
span
>)
}
</
div
>
</
div
>
...
...
src/pages/lxMall/pay/components/balance/index.tsx
View file @
9e42aa53
...
...
@@ -22,7 +22,7 @@ interface BablancePayWayPropsType {
}
const
BablancePayWay
:
React
.
FC
<
BablancePayWayPropsType
>
=
(
props
)
=>
{
const
{
payInfo
,
orderId
,
orderInfo
,
layoutType
,
shopUrlParam
}
=
props
const
{
payInfo
,
orderId
,
orderInfo
,
layoutType
,
shopUrlParam
,
onChange
}
=
props
const
[
balanceInfo
,
setBalanceInfo
]
=
useState
<
GetPayAssetAccountGetUserBalanceResponse
>
(
0
)
const
[
securityInfo
,
setSecurityInfo
]
=
useState
<
GetMemberSecurityGetResponse
>
()
const
[
payPassword
,
setPayPassword
]
=
useState
<
string
>
(
''
)
...
...
@@ -51,7 +51,12 @@ const BablancePayWay: React.FC<BablancePayWayPropsType> = (props) => {
if
(
res
.
code
===
1000
)
{
setBalanceInfo
(
res
.
data
)
setPageLoading
(
false
)
}
else
{
setPageLoading
(
false
)
onChange
(
true
,
res
.
message
)
}
}).
catch
(()
=>
{
})
}
...
...
src/pages/lxMall/pay/index.tsx
View file @
9e42aa53
...
...
@@ -90,8 +90,10 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
})
}
const
handlePayChangge
=
(
state
)
=>
{
const
handlePayChangge
=
(
state
,
errMsg
?)
=>
{
console
.
log
(
state
,
"state"
)
setPayState
(
state
)
errMsg
&&
setErrMsg
(
errMsg
)
}
const
renderPayWay
=
()
=>
{
...
...
@@ -101,17 +103,17 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
switch
(
payInfo
.
paymentChannelsId
)
{
case
PayWayType
.
point
:
return
<
PointPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
PointPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
case
PayWayType
.
balance
:
return
<
BablancePayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
BablancePayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
case
PayWayType
.
credit
:
return
<
CreditPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
CreditPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
case
PayWayType
.
wechat
:
return
<
WechatPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
WechatPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
case
PayWayType
.
bank
:
return
<
BankPayWay
/>
case
PayWayType
.
transfer
:
return
<
TransferPayWay
payInfo=
{
payInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
TransferPayWay
payInfo=
{
payInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
default
:
return
null
}
...
...
@@ -133,16 +135,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
}
</
div
>
</
div
>
)
:
(<
div
>
<
CommonHeader
logoUrl=
{
(
layoutType
===
LAYOUT_TYPE
.
channel
||
layoutType
===
LAYOUT_TYPE
.
ichannel
)
?
shopInfo
?.
logo
:
mallInfo
.
logoUrl
}
title=
"支付成功"
/>
<
div
className=
{
styles
.
errmsg
}
>
<
p
>
支付成功
</
p
>
<
Button
type=
"primary"
className=
{
styles
.
backbtn
}
onClick=
{
()
=>
backHome
()
}
>
继续购物
</
Button
>
</
div
>
</
div
>)
:
loading
?
null
:
(
)
:
loading
?
null
:
(
<
div
>
<
CommonHeader
logoUrl=
{
(
layoutType
===
LAYOUT_TYPE
.
channel
||
layoutType
===
LAYOUT_TYPE
.
ichannel
)
?
shopInfo
?.
logo
:
mallInfo
.
logoUrl
}
...
...
@@ -153,7 +146,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
<
Button
type=
"primary"
className=
{
styles
.
backbtn
}
onClick=
{
()
=>
backHome
()
}
>
返回首页
</
Button
>
</
div
>
</
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