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
陈智峰
jinfa-platform
Commits
d92d53f7
Commit
d92d53f7
authored
Nov 10, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 调整b2b下单配送时间段传参
parent
2143120e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
index.tsx
src/pages/transaction/components/orderPayModal/index.tsx
+5
-0
index.tsx
...nsaction/purchaseOrder/orderCollectB2b/constant/index.tsx
+0
-1
index.tsx
...pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
+7
-5
No files found.
src/pages/transaction/components/orderPayModal/index.tsx
View file @
d92d53f7
...
...
@@ -155,6 +155,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
})
}
else
if
(
checked
.
id
===
6
)
{
// 授信额度支付
console
.
log
(
'选择了授信支付'
)
mobilePayFlag
.
current
=
0
setIsSpin
(
true
)
PublicApi
.
getPayCreditGetCredit
({
parentMemberId
:
data
.
vendorMemberId
,
...
...
@@ -169,6 +170,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
setPayStep
(
1
)
}
else
if
(
checked
.
id
===
4
)
{
// 余额支付
console
.
log
(
'选择了余额支付'
)
mobilePayFlag
.
current
=
0
setIsSpin
(
true
)
PublicApi
.
getPayAssetAccountBalance
({
fundMode
:
checked
.
fundMode
,
...
...
@@ -184,6 +186,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
setPayStep
(
1
)
}
else
if
(
checked
.
id
===
7
)
{
console
.
log
(
'选择了货到付款'
)
mobilePayFlag
.
current
=
0
setCurrent
(
5
)
setPayStep
(
1
)
}
else
if
(
checked
.
id
===
2
)
{
...
...
@@ -204,10 +207,12 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
handleSubmitPay
()
}
else
if
(
checked
.
id
===
100
)
{
console
.
log
(
'选择了账期结算模式'
)
mobilePayFlag
.
current
=
0
setCurrent
(
100
)
setPayStep
(
1
)
}
else
if
(
checked
.
id
===
101
)
{
console
.
log
(
'选择了月结结算模式'
)
mobilePayFlag
.
current
=
0
setCurrent
(
101
)
setPayStep
(
1
)
}
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/constant/index.tsx
View file @
d92d53f7
...
...
@@ -102,7 +102,6 @@ export const procurementProcessField = (value) => {
supplyMemberName
:
item
.
upperMemberName
,
}
delete
obj
.
imgUrl
delete
obj
.
address
delete
obj
.
logistics
return
obj
})
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
View file @
d92d53f7
...
...
@@ -315,11 +315,13 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = () => {
telephone
:
addressDetail
.
tel
,
defaultConsignee
:
!!
addressDetail
.
isDefault
,
}
if
(
params
?.
timeLine
)
{
params
.
consignee
.
deliverDate
=
`
${
params
.
deliverDate
}
${
params
.
timeLine
}
`
}
else
{
params
.
consignee
.
deliverDate
=
params
.
deliverDate
}
}
// 组合配送时间字段
if
(
params
?.
timeLine
)
{
params
.
deliverDate
=
`
${
params
.
deliverDate
}
${
params
.
timeLine
}
`
}
else
{
params
.
deliverDate
=
params
.
deliverDate
}
// 其他需求
...
...
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