增加了从提现页面到提现账号管理页面的链接

This commit is contained in:
Xu Chang 2024-06-17 20:35:10 +08:00
parent 28c92f89e1
commit 5daa4bd0af
16 changed files with 57 additions and 11 deletions

View File

@ -5,5 +5,6 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps<
onNewWithdrawAccount: () => void;
onCreateWithdraw: (id: string) => void;
onGoToHistory: () => void;
onGoToWaManage: () => void;
}>) => React.ReactElement;
export default _default;

View File

@ -10,6 +10,7 @@ export default OakComponent({
onNewWithdrawAccount: () => undefined,
onCreateWithdraw: (id) => undefined,
onGoToHistory: () => undefined,
onGoToWaManage: () => undefined,
},
formData({ features }) {
const { accountId, withdrawAccountFilter } = this.props;
@ -220,6 +221,9 @@ export default OakComponent({
onGoToHistoryMp() {
const { onGoToHistory } = this.props;
onGoToHistory && onGoToHistory();
},
onGoToWaManageMp() {
this.props.onGoToWaManage();
}
},
});

View File

@ -105,6 +105,10 @@
<oak-icon name="coupons" size="18" color="@oak-color-primary" style="margin-right:8rpx;"/>
<span>{{t('gotoHistory')}}</span>
</view>
<view class="gotoHistory" bindtap="onGoToWaManageMp">
<oak-icon name="enterinto" size="18" color="@oak-color-primary" style="margin-right:8rpx;"/>
<span>{{t('gotoWaManage')}}</span>
</view>
<view class="footer">
<l-button
size="long"

View File

@ -30,5 +30,6 @@
"overflowManualAmount": "提现额度不能超过人工划款的额度"
},
"innerLogic": "自动运算",
"gotoHistory": "提现历史"
"gotoHistory": "提现历史",
"gotoWaManage": "提现账户管理"
}

View File

@ -21,6 +21,7 @@ export default function render(props: WebComponentProps<EntityDict, 'withdraw',
waFilter?: EntityDict['withdrawAccount']['Selection']['filter'];
userId: string;
onGoToHistory: () => void;
onGoToWaManage: () => void;
}, {
setValue: (v: string | number | null) => void;
switchHelp: (type: 'method' | 'loss') => void;

View File

@ -1,12 +1,12 @@
import React from 'react';
import { Button, Input, Result } from 'antd-mobile';
import { DownOutline, UpOutline, ReceiptOutline } from 'antd-mobile-icons';
import { DownOutline, UpOutline, ReceiptOutline, BankcardOutline } from 'antd-mobile-icons';
import Styles from './web.module.less';
import classNames from 'classnames';
import WithDrawAccountPicker from '../../withdrawAccount/list';
import WithdrawDisplay from '../display';
export default function render(props) {
const { account, value, refundAmount, manualAmount, avail, availYuan, valueYuan, manualAmountYuan, refundAmountYuan, showMethodHelp, showLossHelp, executale, withdrawCreate, withdrawable, withdrawLossText, chooseWa, waFilter, userId, onGoToHistory } = props.data;
const { account, value, refundAmount, manualAmount, avail, availYuan, valueYuan, manualAmountYuan, refundAmountYuan, showMethodHelp, showLossHelp, executale, withdrawCreate, withdrawable, withdrawLossText, chooseWa, waFilter, userId, onGoToHistory, onGoToWaManage } = props.data;
const { t, setValue, switchHelp, createWithdrawData, restartAll, createWithdraw, goBack, pickWithdrawChannel } = props.methods;
if (!withdrawable) {
return (<Result status='error' title={t('notSetYet')} description={<Button color="primary" onClick={() => goBack()}>
@ -85,6 +85,10 @@ export default function render(props) {
<ReceiptOutline scale={1.4}/>
{t('gotoHistory')}
</div>
<div className={Styles.gotoHistory} onClick={onGoToWaManage}>
<BankcardOutline scale={1.4}/>
{t('gotoWaManage')}
</div>
<div style={{ flex: 1 }}/>
<Button className={Styles.btn} block color="primary" disabled={!executale} onClick={() => createWithdrawData()}>
{t('common::confirm')}

View File

@ -21,6 +21,7 @@ export default function render(props: WebComponentProps<EntityDict, 'withdraw',
waFilter?: EntityDict['withdrawAccount']['Selection']['filter'];
userId: string;
onGoToHistory: () => void;
onGoToWaManage: () => void;
}, {
setValue: (v: number | null) => void;
switchHelp: (type: 'method' | 'loss') => void;

View File

@ -6,7 +6,7 @@ import classNames from 'classnames';
import WithDrawAccountPicker from '../../withdrawAccount/list';
import WithdrawDisplay from '../display';
export default function render(props) {
const { account, value, refundAmount, manualAmount, avail, availYuan, valueYuan, manualAmountYuan, refundAmountYuan, showMethodHelp, showLossHelp, executale, withdrawCreate, withdrawable, withdrawLossText, chooseWa, waFilter, userId, onGoToHistory } = props.data;
const { account, value, refundAmount, manualAmount, avail, availYuan, valueYuan, manualAmountYuan, refundAmountYuan, showMethodHelp, showLossHelp, executale, withdrawCreate, withdrawable, withdrawLossText, chooseWa, waFilter, userId, onGoToHistory, onGoToWaManage } = props.data;
const { t, setValue, switchHelp, createWithdrawData, restartAll, createWithdraw, goBack, pickWithdrawChannel } = props.methods;
if (!withdrawable) {
return (<Result status="500" title="500" subTitle={t('notSetYet')} extra={<Button type="primary" onClick={() => goBack()}>
@ -70,6 +70,9 @@ export default function render(props) {
<div className={Styles.gotoHistory} onClick={onGoToHistory}>
{t('gotoHistory')}
</div>
<div className={Styles.gotoHistory} onClick={onGoToWaManage}>
{t('gotoWaManage')}
</div>
<div style={{ flex: 1 }}/>
<Button className={Styles.btn} size="large" type="primary" disabled={!executale} onClick={() => createWithdrawData()}>
{t('common::confirm')}

View File

@ -461,7 +461,8 @@ const i18ns = [
"overflowManualAmount": "提现额度不能超过人工划款的额度"
},
"innerLogic": "自动运算",
"gotoHistory": "提现历史"
"gotoHistory": "提现历史",
"gotoWaManage": "提现账户管理"
}
},
{

View File

@ -463,7 +463,8 @@ const i18ns = [
"overflowManualAmount": "提现额度不能超过人工划款的额度"
},
"innerLogic": "自动运算",
"gotoHistory": "提现历史"
"gotoHistory": "提现历史",
"gotoWaManage": "提现账户管理"
}
},
{

View File

@ -12,6 +12,7 @@ export default OakComponent({
onNewWithdrawAccount: () => undefined as void,
onCreateWithdraw: (id: string) => undefined as void,
onGoToHistory: () => undefined as void,
onGoToWaManage: () => undefined as void,
},
formData({ features }) {
const { accountId, withdrawAccountFilter } = this.props;
@ -224,6 +225,9 @@ export default OakComponent({
onGoToHistoryMp() {
const { onGoToHistory } = this.props;
onGoToHistory && onGoToHistory();
},
onGoToWaManageMp() {
this.props.onGoToWaManage!();
}
},
})

View File

@ -105,6 +105,10 @@
<oak-icon name="coupons" size="18" color="@oak-color-primary" style="margin-right:8rpx;"/>
<span>{{t('gotoHistory')}}</span>
</view>
<view class="gotoHistory" bindtap="onGoToWaManageMp">
<oak-icon name="enterinto" size="18" color="@oak-color-primary" style="margin-right:8rpx;"/>
<span>{{t('gotoWaManage')}}</span>
</view>
<view class="footer">
<l-button
size="long"

View File

@ -30,5 +30,6 @@
"overflowManualAmount": "提现额度不能超过人工划款的额度"
},
"innerLogic": "自动运算",
"gotoHistory": "提现历史"
"gotoHistory": "提现历史",
"gotoWaManage": "提现账户管理"
}

View File

@ -28,6 +28,7 @@ export default function render(props: WebComponentProps<EntityDict, 'withdraw',
waFilter?: EntityDict['withdrawAccount']['Selection']['filter'];
userId: string;
onGoToHistory: () => void;
onGoToWaManage: () => void;
}, {
setValue: (v: number | null) => void;
switchHelp: (type: 'method' | 'loss') => void;
@ -40,7 +41,7 @@ export default function render(props: WebComponentProps<EntityDict, 'withdraw',
const { account, value, refundAmount, manualAmount, avail, availYuan, valueYuan,
manualAmountYuan, refundAmountYuan, showMethodHelp, showLossHelp, executale,
withdrawCreate, withdrawable, withdrawLossText, chooseWa, waFilter,
userId, onGoToHistory
userId, onGoToHistory, onGoToWaManage
} = props.data;
const { t, setValue, switchHelp, createWithdrawData,
restartAll, createWithdraw, goBack, pickWithdrawChannel } = props.methods;
@ -177,6 +178,12 @@ export default function render(props: WebComponentProps<EntityDict, 'withdraw',
>
{t('gotoHistory')}
</div>
<div
className={Styles.gotoHistory}
onClick={onGoToWaManage}
>
{t('gotoWaManage')}
</div>
<div style={{ flex: 1 }} />
<Button
className={Styles.btn}

View File

@ -2,7 +2,7 @@ import React from 'react';
import { EntityDict } from "../../../oak-app-domain";
import { RowWithActions, WebComponentProps } from "oak-frontend-base";
import { Button, Input, Result } from 'antd-mobile';
import { DownOutline, UpOutline, ReceiptOutline } from 'antd-mobile-icons';
import { DownOutline, UpOutline, ReceiptOutline, BankcardOutline } from 'antd-mobile-icons';
import Styles from './web.module.less';
import classNames from 'classnames';
import WithDrawAccountPicker from '../../withdrawAccount/list';
@ -28,6 +28,7 @@ export default function render(props: WebComponentProps<EntityDict, 'withdraw',
waFilter?: EntityDict['withdrawAccount']['Selection']['filter'];
userId: string;
onGoToHistory: () => void;
onGoToWaManage: () => void;
}, {
setValue: (v: string | number | null) => void;
switchHelp: (type: 'method' | 'loss') => void;
@ -40,7 +41,7 @@ export default function render(props: WebComponentProps<EntityDict, 'withdraw',
const { account, value, refundAmount, manualAmount, avail, availYuan, valueYuan,
manualAmountYuan, refundAmountYuan, showMethodHelp, showLossHelp, executale,
withdrawCreate, withdrawable, withdrawLossText, chooseWa, waFilter,
userId, onGoToHistory
userId, onGoToHistory, onGoToWaManage
} = props.data;
const { t, setValue, switchHelp, createWithdrawData,
restartAll, createWithdraw, goBack, pickWithdrawChannel } = props.methods;
@ -195,6 +196,13 @@ export default function render(props: WebComponentProps<EntityDict, 'withdraw',
<ReceiptOutline scale={1.4} />
{t('gotoHistory')}
</div>
<div
className={Styles.gotoHistory}
onClick={onGoToWaManage}
>
<BankcardOutline scale={1.4} />
{t('gotoWaManage')}
</div>
<div style={{ flex: 1 }} />
<Button
className={Styles.btn}

View File

@ -463,7 +463,8 @@ const i18ns: I18n[] = [
"overflowManualAmount": "提现额度不能超过人工划款的额度"
},
"innerLogic": "自动运算",
"gotoHistory": "提现历史"
"gotoHistory": "提现历史",
"gotoWaManage": "提现账户管理"
}
},
{