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
619f156d
Commit
619f156d
authored
Oct 21, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:修改新增采购单需要的物流字段
parent
6cf27540
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
index.tsx
src/pages/lxMall/order/address/index.tsx
+2
-2
index.tsx
src/pages/lxMall/order/index.tsx
+8
-7
No files found.
src/pages/lxMall/order/address/index.tsx
View file @
619f156d
...
@@ -49,7 +49,7 @@ const Address: React.FC<AddressPropsType> = (props) => {
...
@@ -49,7 +49,7 @@ const Address: React.FC<AddressPropsType> = (props) => {
if
(
selectItem
)
{
if
(
selectItem
)
{
setSelectKey
(
selectItem
.
id
)
setSelectKey
(
selectItem
.
id
)
let
res
=
await
PublicApi
.
getLogisticsReceiverAddressGet
({
id
:
selectItem
.
id
})
let
res
=
await
PublicApi
.
getLogisticsReceiverAddressGet
({
id
:
selectItem
.
id
})
onChange
(
res
.
data
)
onChange
(
Object
.
assign
(
selectItem
,
res
.
data
)
)
}
}
}
}
...
@@ -63,7 +63,7 @@ const Address: React.FC<AddressPropsType> = (props) => {
...
@@ -63,7 +63,7 @@ const Address: React.FC<AddressPropsType> = (props) => {
}
}
if
(
selectItem
)
{
if
(
selectItem
)
{
let
res
=
await
PublicApi
.
getLogisticsReceiverAddressGet
({
id
:
selectItem
.
id
})
let
res
=
await
PublicApi
.
getLogisticsReceiverAddressGet
({
id
:
selectItem
.
id
})
onChange
(
res
.
data
)
onChange
(
Object
.
assign
(
selectItem
,
res
.
data
)
)
}
}
}
}
...
...
src/pages/lxMall/order/index.tsx
View file @
619f156d
...
@@ -42,7 +42,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
...
@@ -42,7 +42,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
const
[
orderList
,
setOrderList
]
=
useState
<
any
>
()
const
[
orderList
,
setOrderList
]
=
useState
<
any
>
()
const
[
needTheInvoice
,
setNeedTheInvoice
]
=
useState
<
boolean
>
(
false
)
const
[
needTheInvoice
,
setNeedTheInvoice
]
=
useState
<
boolean
>
(
false
)
const
[
needTheContract
,
setneedTheContract
]
=
useState
<
boolean
>
(
false
)
const
[
needTheContract
,
setneedTheContract
]
=
useState
<
boolean
>
(
false
)
const
[
selectAddressInfo
,
setSelectAddressInfo
]
=
useState
<
GetLogisticsReceiverAddressGetResponse
>
()
const
[
selectAddressInfo
,
setSelectAddressInfo
]
=
useState
<
any
>
()
const
[
selectInvoiceInfo
,
setSelectInvoiceInfo
]
=
useState
<
any
>
()
const
[
selectInvoiceInfo
,
setSelectInvoiceInfo
]
=
useState
<
any
>
()
const
[
logisticsFee
,
setLogisticsFee
]
=
useState
<
number
>
(
0
)
const
[
logisticsFee
,
setLogisticsFee
]
=
useState
<
number
>
(
0
)
const
[
isElectronicContract
,
setIsElectronicContract
]
=
useState
<
boolean
>
(
false
)
// 是否选用电子合同
const
[
isElectronicContract
,
setIsElectronicContract
]
=
useState
<
boolean
>
(
false
)
// 是否选用电子合同
...
@@ -253,13 +253,14 @@ const Order: React.FC<OrderPropsType> = (props) => {
...
@@ -253,13 +253,14 @@ const Order: React.FC<OrderPropsType> = (props) => {
if
(
orderInfo
.
logistics
.
deliveryType
===
1
&&
!!
selectAddressInfo
)
{
if
(
orderInfo
.
logistics
.
deliveryType
===
1
&&
!!
selectAddressInfo
)
{
params
.
deliveryAddresId
=
selectAddressInfo
.
id
params
.
deliveryAddresId
=
selectAddressInfo
.
id
params
.
addres
Name
=
selectAddressInfo
.
receiverName
params
.
receiver
Name
=
selectAddressInfo
.
receiverName
params
.
isDefault
=
selectAddressInfo
.
isDefault
params
.
isDefault
=
selectAddressInfo
.
isDefault
params
.
province
=
selectAddressInfo
.
provinceName
params
.
fullAddress
=
selectAddressInfo
.
fullAddress
params
.
city
=
selectAddressInfo
.
cityName
params
.
phone
=
selectAddressInfo
.
phone
params
.
area
=
selectAddressInfo
.
districtName
// params.province = selectAddressInfo.provinceName
params
.
addres
=
selectAddressInfo
.
address
// params.city = selectAddressInfo.cityName
params
.
tel
=
selectAddressInfo
.
phone
// params.area = selectAddressInfo.districtName
// params.addres = selectAddressInfo.address
}
}
let
orderProductRequests
=
[]
let
orderProductRequests
=
[]
...
...
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