Skip to content

J
jinfa-platform
Commit b867f854 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

fix:

parent 317be9e8
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 30 deletions
src/pages/payandSettle/amountAccountManage/paymentWithdraw/paymentDetail.tsx
View file @ b867f854
......@@ -107,8 +107,10 @@ const PaymentDetail: React.FC<{}> = () => {
// 1-1 支付成功 1-2确认是否已转账 1-other支付失败
if(!payParam?.payType){
setErrorTips({...errorTips, tipMethod: true})
setPayConfirmLoading(false)
}else if(!payParam?.payChannel){
setErrorTips({...errorTips, tipChannel: true})
setPayConfirmLoading(false)
}else{
setErrorTips({tipMethod: false, tipChannel: false})
PublicApi.postPayMemberAssetAccountPayCashOut({ id: urlParams.payId, ...payParam },{ctlType: 'none'}).then(res => {
......@@ -378,6 +380,7 @@ const PaymentDetail: React.FC<{}> = () => {
onOk={handleOK}
onCancel={handleCancel}
footer={renderModalFooter()}
destroyOnClose={true}
>
{
currentStep
......
src/pages/payandSettle/capitalAccounts/accountLists/accountDetail.tsx
View file @ b867f854
......@@ -178,7 +178,12 @@ const AccountDetail: React.FC<{}> = () => {
<Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title="账户信息">
<Row gutter={100}>
<Col span={8}>
<Col
// span={8}
xxl={8}
xl={9}
lg={9}
>
<div className={cx(styles.repayment, styles.repayinfo)}>
<div className={styles['repayment-left']}>
<div className={styles.statistic}>
......@@ -195,37 +200,79 @@ const AccountDetail: React.FC<{}> = () => {
</div>
</div>
</Col>
<Col span={10}>
<Col
// span={10}
xxl={10}
xl={8}
lg={8}
>
<div className={styles.infoRight}>
<Row>
<Col span={4}>
<Col
// span={4}
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>账户归属：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{details?.parentMemberName}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<Col
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>账户余额(元)：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{details?.accountBalance?.toFixed(2)}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<Col
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>锁定金额(元)：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{details?.lockBalance?.toFixed(2)}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<Col
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>账户状态：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>
{
details?.accountStatus &&
......@@ -236,7 +283,12 @@ const AccountDetail: React.FC<{}> = () => {
</Row>
</div>
</Col>
<Col span={6}>
<Col
// span={20}
xxl={6}
xl={7}
lg={7}
>
<div className={styles.rightActions}>
<Button className={styles.rightAction} type="primary" onClick={handleRecharge}>充值</Button>
<Button className={styles.rightAction} onClick={() => history.push(`/memberCenter/payandSettle/capitalAccounts/accountLists/applyWithdraw?id=${details?.id}`)}>申请提现</Button>
......
src/pages/payandSettle/capitalAccounts/accountLists/applyWithdraw.tsx
View file @ b867f854
......@@ -131,7 +131,12 @@ const AccountDetail: React.FC<{}> = () => {
<Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title="账户提现">
<Row gutter={100}>
<Col span={8}>
<Col
// span={8}
xxl={8}
xl={12}
lg={12}
>
<div className={styles.repayment}>
<div className={styles['repayment-left']}>
<div className={styles.statistic}>
......@@ -168,29 +173,64 @@ const AccountDetail: React.FC<{}> = () => {
</div>
</div>
</Col>
<Col span={16}>
<Col
// span={16}
xxl={16}
xl={12}
lg={12}
>
<div className={styles.infoRight}>
<Row>
<Col span={4}>
<Col
// span={4}
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>账户归属：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{bankDetail?.name}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<Col
// span={4}
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>银行账号：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{bankDetail?.bankAccount}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<Col
// span={4}
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>开户行：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{bankDetail?.bankDeposit}</p>
</Col>
</Row>
......@@ -202,7 +242,12 @@ const AccountDetail: React.FC<{}> = () => {
<Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title="账户信息">
<Row gutter={100}>
<Col span={8}>
<Col
// span={8}
xxl={8}
xl={12}
lg={12}
>
<div className={cx(styles.repayment, styles.repayinfo)}>
<div className={styles['repayment-left']}>
<div className={styles.statistic}>
......@@ -219,37 +264,82 @@ const AccountDetail: React.FC<{}> = () => {
</div>
</div>
</Col>
<Col span={16}>
<Col
// span={16}
xxl={16}
xl={12}
lg={12}
>
<div className={styles.infoRight}>
<Row>
<Col span={4}>
<Col
// span={4}
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>账户归属：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{details?.parentMemberName}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<Col
// span={4}
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>账户余额(元)：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{details?.accountBalance?.toFixed(2)}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<Col
// span={4}
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>锁定金额(元)：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
<p className={styles.rightInfo}>{details?.lockBalance?.toFixed(2)}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<Col
// span={4}
xxl={4}
xl={10}
lg={10}
>
<p className={styles.rightTitle}>账户状态：</p>
</Col>
<Col span={20}>
<Col
// span={20}
xxl={20}
xl={14}
lg={14}
>
{
details?.accountStatus &&
<StatusTag title={memberStatusMap[details.accountStatus]['title']} type={memberStatusMap[details.accountStatus]['type']} />
......
src/pages/payandSettle/capitalAccounts/accountLists/schema/index.tsx
View file @ b867f854
......@@ -114,7 +114,7 @@ export const rechargeSchema: ISchema = {
title: '充值金额',
'x-component-props': {
addonBefore: "￥",
suffix: "RMB"
// suffix: "RMB"
},
"x-rules": [
{
......
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