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
918b240b
Commit
918b240b
authored
Nov 18, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理新增订单或者支付订单时获取支付方式没有带memberId
parent
af1ef987
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
8 deletions
+39
-8
useOrderDetail.tsx
...ages/transaction/_public/order/effects/useOrderDetail.tsx
+14
-4
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+1
-1
usePaymentInfo.tsx
...ction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
+24
-3
No files found.
src/pages/transaction/_public/order/effects/useOrderDetail.tsx
View file @
918b240b
...
@@ -38,7 +38,7 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
...
@@ -38,7 +38,7 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
useEffect
(()
=>
{
useEffect
(()
=>
{
reloadFormData
()
reloadFormData
()
reloadPayList
()
//
reloadPayList()
},
[])
},
[])
const
reloadFormData
=
useCallback
(()
=>
{
const
reloadFormData
=
useCallback
(()
=>
{
...
@@ -51,6 +51,7 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
...
@@ -51,6 +51,7 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
if
(
data
.
paymentInformationResponses
.
length
>
0
){
if
(
data
.
paymentInformationResponses
.
length
>
0
){
setCurrentPayInfoId
(
data
.
paymentInformationResponses
[
0
].
id
)
setCurrentPayInfoId
(
data
.
paymentInformationResponses
[
0
].
id
)
}
}
reloadPayList
(
data
.
supplyMembersId
)
}
else
{
}
else
{
message
.
error
(
msg
)
message
.
error
(
msg
)
}
}
...
@@ -58,14 +59,23 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
...
@@ -58,14 +59,23 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
}
}
},
[
id
])
},
[
id
])
const
reloadPayList
=
useCallback
((
)
=>
{
const
reloadPayList
=
(
memberId
)
=>
{
PublicApi
.
getPayPayWayList
().
then
(
res
=>
{
PublicApi
.
getPayPayWayList
(
{
memberId
}
).
then
(
res
=>
{
const
{
code
,
data
}
=
res
const
{
code
,
data
}
=
res
if
(
code
===
1000
)
{
if
(
code
===
1000
)
{
setPaylist
(
data
)
setPaylist
(
data
)
}
}
})
})
},
[
id
])
}
// const reloadPayList = useCallback(() => {
// PublicApi.getPayPayWayList().then(res => {
// const { code, data } = res
// if (code === 1000) {
// setPaylist(data)
// }
// })
// }, [id])
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
918b240b
...
@@ -127,7 +127,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
...
@@ -127,7 +127,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
}
}
return
resultState
return
resultState
})
})
const
[
paymentColumns
,
paymentComponents
,
paymentSave
]
=
usePaymentInfo
(
addSchemaAction
)
const
[
paymentColumns
,
paymentComponents
,
paymentSave
]
=
usePaymentInfo
(
addSchemaAction
,
addSchemaAction
.
getFieldValue
(
'supplyMembersId'
)
)
const
{
productAddButton
,
productRef
,
productColumns
,
productComponents
,
...
sectionProps
}
=
useProductTable
(
addSchemaAction
)
const
{
productAddButton
,
productRef
,
productColumns
,
productComponents
,
...
sectionProps
}
=
useProductTable
(
addSchemaAction
)
// 页面进入时, 当前所处的下单模式
// 页面进入时, 当前所处的下单模式
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
View file @
918b240b
...
@@ -5,7 +5,7 @@ import { useEffect, useState, useRef, useContext } from 'react'
...
@@ -5,7 +5,7 @@ import { useEffect, useState, useRef, useContext } from 'react'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
import
{
ReadyAddOrderDetailContext
}
from
'../../context'
import
{
ReadyAddOrderDetailContext
}
from
'../../context'
export
const
usePaymentInfo
=
(
ctx
:
ISchemaFormActions
|
ISchemaFormAsyncActions
):
any
=>
{
export
const
usePaymentInfo
=
(
ctx
:
ISchemaFormActions
|
ISchemaFormAsyncActions
,
memberId
:
any
):
any
=>
{
const
paywayData
=
useRef
<
any
>
({})
const
paywayData
=
useRef
<
any
>
({})
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
paymentInformationColumns
)
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
paymentInformationColumns
)
const
{
productSumPrice
}
=
useContext
(
ReadyAddOrderDetailContext
)
const
{
productSumPrice
}
=
useContext
(
ReadyAddOrderDetailContext
)
...
@@ -54,8 +54,29 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
...
@@ -54,8 +54,29 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
return
result
return
result
}
}
// useEffect(() => {
// PublicApi.getPayPayWayList().then(res => {
// const { code, data } = res
// if (code === 1000) {
// const newColumns = [...columns]
// newColumns[5].formItemProps.options = initPayWayList(data)
// paywayData.current = data
// setColumns(newColumns)
// }
// })
// }, [])
useEffect
(()
=>
{
useEffect
(()
=>
{
PublicApi
.
getPayPayWayList
().
then
(
res
=>
{
console
.
log
(
memberId
,
'memberId'
)
// 当选择报价单/会员/商品时有memberId传入时 调用支付方式api
if
(
memberId
)
{
getPayLists
(
memberId
)
}
},
[
memberId
])
const
getPayLists
=
(
memberId
)
=>
{
PublicApi
.
getPayPayWayList
({
memberId
}).
then
(
res
=>
{
const
{
code
,
data
}
=
res
const
{
code
,
data
}
=
res
if
(
code
===
1000
)
{
if
(
code
===
1000
)
{
const
newColumns
=
[...
columns
]
const
newColumns
=
[...
columns
]
...
@@ -65,7 +86,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
...
@@ -65,7 +86,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
setColumns
(
newColumns
)
setColumns
(
newColumns
)
}
}
})
})
}
,
[])
}
const
handleSave
=
row
=>
{
const
handleSave
=
row
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
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