Commit f40dcece authored by GuanHua's avatar GuanHua

feat:修改获取授信额度传参

parent 198b788e
...@@ -13,7 +13,6 @@ import Contract from './contract' ...@@ -13,7 +13,6 @@ import Contract from './contract'
import Invoice from './invoice' import Invoice from './invoice'
import styles from './index.less' import styles from './index.less'
import { PublicApi } from '@/services/api' import { PublicApi } from '@/services/api'
import { GetLogisticsReceiverAddressGetResponse } from '@/services/LogisticsApi'
import SignModal from '@/components/SignModal' import SignModal from '@/components/SignModal'
import { isEmpty } from 'lodash' import { isEmpty } from 'lodash'
import { getAuth } from '@/utils/auth' import { getAuth } from '@/utils/auth'
...@@ -34,7 +33,7 @@ const Order: React.FC<OrderPropsType> = (props) => { ...@@ -34,7 +33,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
const [signModalVisible, setSignModalVisible] = useState<boolean>(false) const [signModalVisible, setSignModalVisible] = useState<boolean>(false)
const { spam_id } = props.location.query const { spam_id } = props.location.query
const OrderStore = useLocalStore(() => store.OrderStore) const OrderStore = useLocalStore(() => store.OrderStore)
const { clearOrderInfo, getOrderInfo } = OrderStore const { getOrderInfo } = OrderStore
const [orderInfo, setOrderInfo] = useState<any>() const [orderInfo, setOrderInfo] = useState<any>()
const [confirmLoading, setConfirmLoading] = useState(false) const [confirmLoading, setConfirmLoading] = useState(false)
const [selectPayWay, setSelectPayWay] = useState<any>({}) const [selectPayWay, setSelectPayWay] = useState<any>({})
...@@ -310,7 +309,7 @@ const Order: React.FC<OrderPropsType> = (props) => { ...@@ -310,7 +309,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
if (selectPayWay.payType === 4) { if (selectPayWay.payType === 4) {
history.push(`/pay/result?orderId=${data.orderId}`) history.push(`/pay/result?orderId=${data.orderId}`)
} else { } else {
history.push(`/pay?orderId=${data.orderId}`) history.push(`/pay?orderId=${data.orderId}&spam_id=${spam_id}`)
} }
} }
setConfirmLoading(false) setConfirmLoading(false)
...@@ -419,7 +418,7 @@ const Order: React.FC<OrderPropsType> = (props) => { ...@@ -419,7 +418,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
}} /> }} />
) )
} }
<PayWay selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} /> <PayWay supplyMembersId={orderInfo.supplyMembersId} supplyMembersRoleId={orderInfo.supplyMembersRoleId} selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} />
{/* <Delivery /> */} {/* <Delivery /> */}
<Invoice state={needTheInvoice} onChange={(val) => setNeedTheInvoice(val)} onSelect={(val) => setSelectInvoiceInfo(val)} /> <Invoice state={needTheInvoice} onChange={(val) => setNeedTheInvoice(val)} onSelect={(val) => setSelectInvoiceInfo(val)} />
{ {
......
...@@ -12,10 +12,12 @@ interface PayWayProps { ...@@ -12,10 +12,12 @@ interface PayWayProps {
payWayList: any; payWayList: any;
onChange: Function; onChange: Function;
selectItem: any; selectItem: any;
supplyMembersId: number;
supplyMembersRoleId: number;
} }
const PayWay: React.FC<PayWayProps> = (props) => { 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 [expand, setExpand] = useState<boolean>(false)
const [creditInfo, setCreditInfo] = useState<GetPayCreditGetCreditResponse>() const [creditInfo, setCreditInfo] = useState<GetPayCreditGetCreditResponse>()
...@@ -39,7 +41,12 @@ const PayWay: React.FC<PayWayProps> = (props) => { ...@@ -39,7 +41,12 @@ const PayWay: React.FC<PayWayProps> = (props) => {
}, [payWayList]) }, [payWayList])
const fetchCreditInfo = () => { const fetchCreditInfo = () => {
PublicApi.getPayCreditGetCredit().then(res => { let param = {
parentMemberId: supplyMembersId,
parentMemberRoleId: supplyMembersRoleId
}
//@ts-ignore
PublicApi.getPayCreditGetCredit(param).then(res => {
if(res.code === 1000) { if(res.code === 1000) {
setCreditInfo(res.data) setCreditInfo(res.data)
} }
......
...@@ -11,13 +11,14 @@ import styles from './index.less' ...@@ -11,13 +11,14 @@ import styles from './index.less'
import { message, Button, Spin } from 'antd' import { message, Button, Spin } from 'antd'
interface CreditPayWayPropsType { interface CreditPayWayPropsType {
payInfo: GetOrderOrderPayDetailsResponse payInfo: GetOrderOrderPayDetailsResponse,
orderInfo: any,
orderId: number, orderId: number,
onChange: Function onChange: Function
} }
const CreditPayWay: React.FC<CreditPayWayPropsType> = (props) => { const CreditPayWay: React.FC<CreditPayWayPropsType> = (props) => {
const { payInfo, orderId, onChange } = props const { payInfo, orderId, orderInfo } = props
const [payPassword, setPayPassword] = useState<string>('') const [payPassword, setPayPassword] = useState<string>('')
const [type, setType] = useState<string>('normal') // normal: 普通;member:会员 const [type, setType] = useState<string>('normal') // normal: 普通;member:会员
const [creditInfo, setCreditInfo] = useState<GetPayCreditGetCreditResponse>() const [creditInfo, setCreditInfo] = useState<GetPayCreditGetCreditResponse>()
...@@ -48,7 +49,11 @@ const CreditPayWay: React.FC<CreditPayWayPropsType> = (props) => { ...@@ -48,7 +49,11 @@ const CreditPayWay: React.FC<CreditPayWayPropsType> = (props) => {
} }
const fetchSecurity = () => { const fetchSecurity = () => {
PublicApi.getMemberSecurityGet().then(res => { let param = {
parentMemberId: orderInfo.supplyMembersId,
parentMemberRoleId: orderInfo.supplyMembersRoleId
}
PublicApi.getMemberSecurityGet(param).then(res => {
if(res.code === 1000) { if(res.code === 1000) {
setSecurityInfo(res.data) setSecurityInfo(res.data)
} }
......
...@@ -8,6 +8,8 @@ import BankPayWay from './components/bank' ...@@ -8,6 +8,8 @@ import BankPayWay from './components/bank'
import TransferPayWay from './components/transfer' import TransferPayWay from './components/transfer'
import { PublicApi } from '@/services/api' import { PublicApi } from '@/services/api'
import { GetOrderOrderPayDetailsResponse } from '@/services/OrderApi' import { GetOrderOrderPayDetailsResponse } from '@/services/OrderApi'
import { useLocalStore, observer } from 'mobx-react'
import { store } from '@/store'
import { LAYOUT_TYPE } from '@/constants' import { LAYOUT_TYPE } from '@/constants'
import styles from './index.less' import styles from './index.less'
import { message, Button } from 'antd' import { message, Button } from 'antd'
...@@ -49,18 +51,29 @@ const getPayTypeTitle = (type) => { ...@@ -49,18 +51,29 @@ const getPayTypeTitle = (type) => {
const PayPage: React.FC<PayPagePropsType> = (props) => { const PayPage: React.FC<PayPagePropsType> = (props) => {
const { shopInfo, mallInfo, layoutType, } = props const { shopInfo, mallInfo, layoutType, } = props
const [payState, setPayState] = useState<boolean>(false) const [payState, setPayState] = useState<boolean>(false)
const { orderId } = props.location.query const { orderId, spam_id } = props.location.query
const [pageTitle, setPageTitle] = useState<string>() const [pageTitle, setPageTitle] = useState<string>()
const [payType] = useState<string | number>(PayWayType.bank) const [payType] = useState<string | number>(PayWayType.bank)
const [payInfo, setPayInfo] = useState<GetOrderOrderPayDetailsResponse>() const [payInfo, setPayInfo] = useState<GetOrderOrderPayDetailsResponse>()
const [errMsg, setErrMsg] = useState<string>('') const [errMsg, setErrMsg] = useState<string>('')
const OrderStore = useLocalStore(() => store.OrderStore)
const [orderInfo, setOrderInfo] = useState<any>({})
const { getOrderInfo } = OrderStore
useEffect(() => { useEffect(() => {
initOrderInfo()
if (orderId) { if (orderId) {
fetchOrderInfo() fetchOrderInfo()
} }
}, []) }, [])
const initOrderInfo = async () => {
if (spam_id) {
const sessionOrderInfo: any = await getOrderInfo(spam_id)
setOrderInfo(sessionOrderInfo)
}
}
const fetchOrderInfo = () => { const fetchOrderInfo = () => {
PublicApi.getOrderOrderPayDetails({ id: orderId }).then(res => { PublicApi.getOrderOrderPayDetails({ id: orderId }).then(res => {
message.destroy() message.destroy()
...@@ -88,7 +101,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => { ...@@ -88,7 +101,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
case PayWayType.balance: case PayWayType.balance:
return <BablancePayWay /> return <BablancePayWay />
case PayWayType.credit: case PayWayType.credit:
return <CreditPayWay payInfo={payInfo} orderId={orderId} onChange={(state) => handlePayChangge(state)} /> return <CreditPayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state) => handlePayChangge(state)} />
case PayWayType.wechat: case PayWayType.wechat:
return <WechatPayWay /> return <WechatPayWay />
case PayWayType.bank: case PayWayType.bank:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment