Skip to content

J
jinfa-platform
Commit 8c6f2c7c authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

对接授信申请单查询中

parent fa3bacad
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 35 deletions
config/routes/tranactionRoute/index.ts
View file @ 8c6f2c7c
......@@ -411,7 +411,7 @@ const TranactionRoute: RouterChild = {
// 销售订单
...saleOrder,
// 交易规则
// 交易规则列表
{
path: '/memberCenter/tranactionAbility/transactionRules',
name: 'transactionRules',
......@@ -420,12 +420,28 @@ const TranactionRoute: RouterChild = {
// 新增交易规则
{
path: '/memberCenter/tranactionAbility/transactionRules/addRule',
path: '/memberCenter/tranactionAbility/transactionRules/add',
name: 'addRule',
hideInMenu: true,
component: '@/pages/transaction/transactionRules/addRule',
},
// 编辑交易规则
{
path: '/memberCenter/tranactionAbility/transactionRules/edit',
name: 'editRule',
hideInMenu: true,
component: '@/pages/transaction/transactionRules/addRule',
},
// 交易规则详情
{
path: '/memberCenter/tranactionAbility/transactionRules/detail',
name: 'ruleDetail',
hideInMenu: true,
component: '@/pages/transaction/transactionRules/addRule',
},
// 供应会员评价管理
{
path: '/memberCenter/tranactionAbility/supplierEvaluation',
......
src/pages/payandSettle/capitalAccounts/accountLists/accountDetail.tsx
View file @ 8c6f2c7c
......@@ -119,25 +119,21 @@ const AccountDetail: React.FC<{}> = () => {
];
const handleConfirm = () => {
schemaActions.submit()
}
const handleCannel = () => {
}
const handleSubmit = () => {
schemaActions.submit()
const handleSubmit = (value) => {
console.log(value)
}
const handleRecharge = () => {
console.log(modalRef)
modalRef.current.setVisible(true)
}
// 前缀币制符号
// const characters = '$'
return (
<PageHeaderWrapper
title="账户详情"
......@@ -232,7 +228,7 @@ const AccountDetail: React.FC<{}> = () => {
confirm={handleConfirm}
onSubmit={handleSubmit}
cancel={handleCannel}
effects={($, {setFieldState}) => {
// effects={($, {setFieldState}) => {
// $('onFieldInputChange', 'money').subscribe(parentState => {
// console.log(parentState.value)
// setFieldState('money', state => {
......@@ -240,7 +236,7 @@ const AccountDetail: React.FC<{}> = () => {
// })
// })
// useAsyncSelect('addresId', async () => (await PublicApi.getLogisticsSelectListShipperAddress()).data, ['fullAddress', 'id'])
}}
// }}
/>
</PageHeaderWrapper>
)
......
src/pages/payandSettle/capitalAccounts/accountLists/applyWithdraw.tsx
View file @ 8c6f2c7c
......@@ -16,6 +16,7 @@ const { Step } = Steps;
const AccountDetail: React.FC<{}> = () => {
const [ details, setDetails ] = useState<any>({ accountBalance: 0, lockBalance: 0})
const [dealRecord, setDealRecord] = useState<any>()
const [withdrawAmount, setWidthdrawAmount] = useState<number>(0)
useEffect(() => {
getAccountInfo()
......@@ -72,6 +73,10 @@ const AccountDetail: React.FC<{}> = () => {
},
];
const handleAllCharge = () => {
setWidthdrawAmount(details.accountBalance - details.lockBalance)
}
return (
<PageHeaderWrapper
title="申请提现"
......@@ -98,12 +103,18 @@ const AccountDetail: React.FC<{}> = () => {
<div className={styles['statistic-title']}>提现金额(元)：</div>
<div style={{display: 'flex',alignItems:'flex-end'}}>
<InputNumber
defaultValue={0}
defaultValue={withdrawAmount}
value={withdrawAmount}
formatter={value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
parser={value => value.replace(/\$\s?|(,*)/g, '')}
className={styles['statistic-input']}
/>
<Button type="text" size="small" style={{marginLeft:24, color:'#fff'}}>
<Button
type="text"
size="small"
style={{marginLeft:24, color:'#fff'}}
onClick={handleAllCharge}
>
全部提现
</Button>
</div>
......
src/pages/payandSettle/capitalAccounts/accountLists/schema/index.tsx
View file @ 8c6f2c7c
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import alipay from '@/assets/imgs/alipay_icon.png';
import wxpay from '@/assets/imgs/wechat_icon.png';
export const searchSchema: ISchema = {
type: 'object',
......@@ -107,27 +109,12 @@ export const rechargeSchema: ISchema = {
wrapperCol: 24
},
properties: {
// money: {
// type: 'number',
// title: '充值金额',
// "x-component-props": {
// style: {
// width: '100%'
// },
// },
// "x-rules": [
// {
// required: true,
// message: '请输入充值金额'
// },
// ]
// },
money: {
type: "string",
title: '充值金额',
'x-component-props': {
addonBefore: "￥"
addonBefore: "￥",
suffix: "RMB"
},
"x-rules": [
{
......@@ -141,7 +128,12 @@ export const rechargeSchema: ISchema = {
type: "array:number",
"x-component": 'CardCheckBox',
"x-component-props": {
dataSource: [],
dataSource: [
// {id: 1, name: '支付宝', logo: 'https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/66bf577211624304947938a2afde771b1603682420367.png'},
// {id: 2, name: '微信', logo: 'https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/733815c243ce4cec8a8cb10e0e92876f1603682449715.png'}
{id: 1, name: '支付宝', logoUrl: alipay},
{id: 2, name: '微信', logoUrl: wxpay}
],
type: 'radio' // CardCheckBox 单选模式
},
"title": "充值方式",
......@@ -152,7 +144,6 @@ export const rechargeSchema: ISchema = {
}
],
}
}
}
}
......
src/pages/payandSettle/creditManage/constant.tsx 0 → 100644
View file @ 8c6f2c7c
import {
MEMBER_STATUS_NORMAL,
MEMBER_STATUS_FROZEN,
MEMBER_INNER_STATUS_REGISTERED,
MEMBER_INNER_STATUS_UNCOMMITTED,
MEMBER_INNER_STATUS_UNREVIEWED_1,
MEMBER_INNER_STATUS_UNREVIEWED_2,
MEMBER_INNER_STATUS_FAILED,
MEMBER_INNER_STATUS_SUCCESS,
MEMBER_OUTER_STATUS_UNCOMMITTED,
MEMBER_OUTER_STATUS_UNREVIEWED,
MEMBER_OUTER_STATUS_FAILED,
MEMBER_OUTER_STATUS_SUCCESS,
} from '@/constants';
export const STATUS_COLOR_MAP = {
0: '#669EDE',
1: '#41CC9E',
2: '#EF6260',
};
export const STATUS_COLOR_TXT = {
0: '待审核',
1: '审核通过',
2: '冻结',
};
// 会员状态 StatusTag map
export const MEMBER_STATUS_TAG_MAP = {
[MEMBER_STATUS_NORMAL]: 'success',
[MEMBER_STATUS_FROZEN]: 'default'
};
// 会员内部状态 StatusTag map
export const MEMBER_INNER_STATUS_TYPE = {
[MEMBER_INNER_STATUS_REGISTERED]: 'default',
[MEMBER_INNER_STATUS_UNCOMMITTED]: 'primary',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: 'warnning',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: 'warnning',
[MEMBER_INNER_STATUS_FAILED]: 'danger',
[MEMBER_INNER_STATUS_SUCCESS]: 'success',
};
// 会员外部状态 StatusTag map
export const MEMBER_OUTER_STATUS_TYPE = {
[MEMBER_OUTER_STATUS_UNCOMMITTED]: 'primary',
[MEMBER_OUTER_STATUS_UNREVIEWED]: 'warnning',
[MEMBER_OUTER_STATUS_FAILED]: 'danger',
[MEMBER_OUTER_STATUS_SUCCESS]: 'success',
};
// 会员内部状态 Tag badge map
export const MEMBER_INNER_STATUS_BADGE_COLOR = {
[MEMBER_INNER_STATUS_REGISTERED]: '#606266',
[MEMBER_INNER_STATUS_UNCOMMITTED]: '#669EDE',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: '#FFC400',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: '#FFC400',
[MEMBER_INNER_STATUS_FAILED]: '#EF6260',
[MEMBER_INNER_STATUS_SUCCESS]: '#41CC9E',
};
// 会员外部状态 Tag badge map
export const MEMBER_OUTER_STATUS_BADGE_COLOR = {
[MEMBER_OUTER_STATUS_UNCOMMITTED]: '#669EDE',
[MEMBER_OUTER_STATUS_UNREVIEWED]: '#FFC400',
[MEMBER_OUTER_STATUS_FAILED]: '#EF6260',
[MEMBER_OUTER_STATUS_SUCCESS]: '#41CC9E',
};
\ No newline at end of file
src/pages/transaction/transactionRules/index.tsx
View file @ 8c6f2c7c
......@@ -41,7 +41,7 @@ const TransactionRules: React.FC<{}> = () => {
key: 'name',
className: 'commonPickColor',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/transactionRules/addRule?id=${record.id}&preview=1`}
url={`/memberCenter/tranactionAbility/transactionRules/detail?id=${record.id}&preview=1`}
>
{text}
</EyePreview>
......@@ -96,7 +96,7 @@ const TransactionRules: React.FC<{}> = () => {
>
<Button type='link'>删除</Button>
</Popconfirm>
<Button type='link' onClick={()=>history.push(`/memberCenter/tranactionAbility/transactionRules/addRule?id=${record.id}`)}>修改</Button>
<Button type='link' onClick={()=>history.push(`/memberCenter/tranactionAbility/transactionRules/add?id=${record.id}`)}>修改</Button>
</> : ''
}
</>
......@@ -168,7 +168,7 @@ const TransactionRules: React.FC<{}> = () => {
},
children: (
<>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push('/memberCenter/tranactionAbility/transactionRules/addRule')}>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push('/memberCenter/tranactionAbility/transactionRules/add')}>
新建
</Button>
</>
......
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