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
shenshaokai
jinfa-platform
Commits
c346b1e3
Commit
c346b1e3
authored
Jan 27, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复在线结算无收获地址情况下,页面一直在加载状态的问题
parent
f7616513
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
index.tsx
src/pages/lxMall/order/address/index.tsx
+6
-2
index.tsx
src/pages/lxMall/order/index.tsx
+6
-3
No files found.
src/pages/lxMall/order/address/index.tsx
View file @
c346b1e3
...
...
@@ -7,11 +7,12 @@ import { GetLogisticsReceiverAddressPageResponseDetail, GetLogisticsReceiverAddr
import
styles
from
'./index.less'
interface
AddressPropsType
{
onChange
:
Function
onChange
:
Function
,
onHideLoading
?:
Function
,
}
const
Address
:
React
.
FC
<
AddressPropsType
>
=
(
props
)
=>
{
const
{
onChange
}
=
props
const
{
onChange
,
onHideLoading
}
=
props
const
[
selectKey
,
setSelectKey
]
=
useState
<
number
>
()
const
[
expand
,
setExpand
]
=
useState
<
boolean
>
(
false
)
const
[
addressFormVisible
,
setAddressFormVisible
]
=
useState
<
boolean
>
(
false
)
...
...
@@ -47,9 +48,12 @@ const Address: React.FC<AddressPropsType> = (props) => {
}
}
if
(
selectItem
)
{
setSelectKey
(
selectItem
.
id
)
const
res
=
await
PublicApi
.
getLogisticsReceiverAddressGet
({
id
:
selectItem
.
id
})
onChange
(
Object
.
assign
(
selectItem
,
res
.
data
))
}
else
{
onHideLoading
()
}
}
...
...
src/pages/lxMall/order/index.tsx
View file @
c346b1e3
...
...
@@ -535,9 +535,12 @@ const Order: React.FC<OrderPropsType> = (props) => {
<
div
className=
{
styles
.
order_container
}
>
{
orderInfo
.
logistics
.
deliveryType
===
1
&&
(
<
Address
onChange=
{
(
selectItem
)
=>
{
setSelectAddressInfo
(
selectItem
)
}
}
/>
<
Address
onChange=
{
(
selectItem
)
=>
{
setSelectAddressInfo
(
selectItem
)
}
}
onHideLoading=
{
()
=>
setSpinningState
(
false
)
}
/>
)
}
<
PayWay
supplyMembersId=
{
orderInfo
.
supplyMembersId
}
deliveryType=
{
orderInfo
.
logistics
.
deliveryType
}
supplyMembersRoleId=
{
orderInfo
.
supplyMembersRoleId
}
selectItem=
{
selectPayWay
}
payWayList=
{
orderInfo
.
payWayList
}
onChange=
{
(
val
)
=>
setSelectPayWay
(
val
)
}
/>
...
...
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