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
f40dcece
Commit
f40dcece
authored
Nov 06, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:修改获取授信额度传参
parent
198b788e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
11 deletions
+35
-11
index.tsx
src/pages/lxMall/order/index.tsx
+3
-4
index.tsx
src/pages/lxMall/order/payway/index.tsx
+9
-2
index.tsx
src/pages/lxMall/pay/components/credit/index.tsx
+8
-3
index.tsx
src/pages/lxMall/pay/index.tsx
+15
-2
No files found.
src/pages/lxMall/order/index.tsx
View file @
f40dcece
...
...
@@ -13,7 +13,6 @@ import Contract from './contract'
import
Invoice
from
'./invoice'
import
styles
from
'./index.less'
import
{
PublicApi
}
from
'@/services/api'
import
{
GetLogisticsReceiverAddressGetResponse
}
from
'@/services/LogisticsApi'
import
SignModal
from
'@/components/SignModal'
import
{
isEmpty
}
from
'lodash'
import
{
getAuth
}
from
'@/utils/auth'
...
...
@@ -34,7 +33,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
const
[
signModalVisible
,
setSignModalVisible
]
=
useState
<
boolean
>
(
false
)
const
{
spam_id
}
=
props
.
location
.
query
const
OrderStore
=
useLocalStore
(()
=>
store
.
OrderStore
)
const
{
clearOrderInfo
,
getOrderInfo
}
=
OrderStore
const
{
getOrderInfo
}
=
OrderStore
const
[
orderInfo
,
setOrderInfo
]
=
useState
<
any
>
()
const
[
confirmLoading
,
setConfirmLoading
]
=
useState
(
false
)
const
[
selectPayWay
,
setSelectPayWay
]
=
useState
<
any
>
({})
...
...
@@ -310,7 +309,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
if
(
selectPayWay
.
payType
===
4
)
{
history
.
push
(
`/pay/result?orderId=
${
data
.
orderId
}
`
)
}
else
{
history
.
push
(
`/pay?orderId=
${
data
.
orderId
}
`
)
history
.
push
(
`/pay?orderId=
${
data
.
orderId
}
&spam_id=
${
spam_id
}
`
)
}
}
setConfirmLoading
(
false
)
...
...
@@ -419,7 +418,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
}
}
/>
)
}
<
PayWay
selectItem=
{
selectPayWay
}
payWayList=
{
orderInfo
.
payWayList
}
onChange=
{
(
val
)
=>
setSelectPayWay
(
val
)
}
/>
<
PayWay
s
upplyMembersId=
{
orderInfo
.
supplyMembersId
}
supplyMembersRoleId=
{
orderInfo
.
supplyMembersRoleId
}
s
electItem=
{
selectPayWay
}
payWayList=
{
orderInfo
.
payWayList
}
onChange=
{
(
val
)
=>
setSelectPayWay
(
val
)
}
/>
{
/* <Delivery /> */
}
<
Invoice
state=
{
needTheInvoice
}
onChange=
{
(
val
)
=>
setNeedTheInvoice
(
val
)
}
onSelect=
{
(
val
)
=>
setSelectInvoiceInfo
(
val
)
}
/>
{
...
...
src/pages/lxMall/order/payway/index.tsx
View file @
f40dcece
...
...
@@ -12,10 +12,12 @@ interface PayWayProps {
payWayList
:
any
;
onChange
:
Function
;
selectItem
:
any
;
supplyMembersId
:
number
;
supplyMembersRoleId
:
number
;
}
const
PayWay
:
React
.
FC
<
PayWayProps
>
=
(
props
)
=>
{
const
{
payWayList
=
[],
onChange
,
selectItem
=
{}
}
=
props
const
{
payWayList
=
[],
onChange
,
selectItem
=
{}
,
supplyMembersId
,
supplyMembersRoleId
}
=
props
const
[
expand
,
setExpand
]
=
useState
<
boolean
>
(
false
)
const
[
creditInfo
,
setCreditInfo
]
=
useState
<
GetPayCreditGetCreditResponse
>
()
...
...
@@ -39,7 +41,12 @@ const PayWay: React.FC<PayWayProps> = (props) => {
},
[
payWayList
])
const
fetchCreditInfo
=
()
=>
{
PublicApi
.
getPayCreditGetCredit
().
then
(
res
=>
{
let
param
=
{
parentMemberId
:
supplyMembersId
,
parentMemberRoleId
:
supplyMembersRoleId
}
//@ts-ignore
PublicApi
.
getPayCreditGetCredit
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setCreditInfo
(
res
.
data
)
}
...
...
src/pages/lxMall/pay/components/credit/index.tsx
View file @
f40dcece
...
...
@@ -11,13 +11,14 @@ import styles from './index.less'
import
{
message
,
Button
,
Spin
}
from
'antd'
interface
CreditPayWayPropsType
{
payInfo
:
GetOrderOrderPayDetailsResponse
payInfo
:
GetOrderOrderPayDetailsResponse
,
orderInfo
:
any
,
orderId
:
number
,
onChange
:
Function
}
const
CreditPayWay
:
React
.
FC
<
CreditPayWayPropsType
>
=
(
props
)
=>
{
const
{
payInfo
,
orderId
,
o
nChange
}
=
props
const
{
payInfo
,
orderId
,
o
rderInfo
}
=
props
const
[
payPassword
,
setPayPassword
]
=
useState
<
string
>
(
''
)
const
[
type
,
setType
]
=
useState
<
string
>
(
'normal'
)
// normal: 普通;member:会员
const
[
creditInfo
,
setCreditInfo
]
=
useState
<
GetPayCreditGetCreditResponse
>
()
...
...
@@ -48,7 +49,11 @@ const CreditPayWay: React.FC<CreditPayWayPropsType> = (props) => {
}
const
fetchSecurity
=
()
=>
{
PublicApi
.
getMemberSecurityGet
().
then
(
res
=>
{
let
param
=
{
parentMemberId
:
orderInfo
.
supplyMembersId
,
parentMemberRoleId
:
orderInfo
.
supplyMembersRoleId
}
PublicApi
.
getMemberSecurityGet
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setSecurityInfo
(
res
.
data
)
}
...
...
src/pages/lxMall/pay/index.tsx
View file @
f40dcece
...
...
@@ -8,6 +8,8 @@ import BankPayWay from './components/bank'
import
TransferPayWay
from
'./components/transfer'
import
{
PublicApi
}
from
'@/services/api'
import
{
GetOrderOrderPayDetailsResponse
}
from
'@/services/OrderApi'
import
{
useLocalStore
,
observer
}
from
'mobx-react'
import
{
store
}
from
'@/store'
import
{
LAYOUT_TYPE
}
from
'@/constants'
import
styles
from
'./index.less'
import
{
message
,
Button
}
from
'antd'
...
...
@@ -49,18 +51,29 @@ const getPayTypeTitle = (type) => {
const
PayPage
:
React
.
FC
<
PayPagePropsType
>
=
(
props
)
=>
{
const
{
shopInfo
,
mallInfo
,
layoutType
,
}
=
props
const
[
payState
,
setPayState
]
=
useState
<
boolean
>
(
false
)
const
{
orderId
}
=
props
.
location
.
query
const
{
orderId
,
spam_id
}
=
props
.
location
.
query
const
[
pageTitle
,
setPageTitle
]
=
useState
<
string
>
()
const
[
payType
]
=
useState
<
string
|
number
>
(
PayWayType
.
bank
)
const
[
payInfo
,
setPayInfo
]
=
useState
<
GetOrderOrderPayDetailsResponse
>
()
const
[
errMsg
,
setErrMsg
]
=
useState
<
string
>
(
''
)
const
OrderStore
=
useLocalStore
(()
=>
store
.
OrderStore
)
const
[
orderInfo
,
setOrderInfo
]
=
useState
<
any
>
({})
const
{
getOrderInfo
}
=
OrderStore
useEffect
(()
=>
{
initOrderInfo
()
if
(
orderId
)
{
fetchOrderInfo
()
}
},
[])
const
initOrderInfo
=
async
()
=>
{
if
(
spam_id
)
{
const
sessionOrderInfo
:
any
=
await
getOrderInfo
(
spam_id
)
setOrderInfo
(
sessionOrderInfo
)
}
}
const
fetchOrderInfo
=
()
=>
{
PublicApi
.
getOrderOrderPayDetails
({
id
:
orderId
}).
then
(
res
=>
{
message
.
destroy
()
...
...
@@ -88,7 +101,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
case
PayWayType
.
balance
:
return
<
BablancePayWay
/>
case
PayWayType
.
credit
:
return
<
CreditPayWay
payInfo=
{
payInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
/>
return
<
CreditPayWay
payInfo=
{
payInfo
}
orderI
nfo=
{
orderInfo
}
orderI
d=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
/>
case
PayWayType
.
wechat
:
return
<
WechatPayWay
/>
case
PayWayType
.
bank
:
...
...
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