Commit f8ca2a8d authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:处理资金账户区块时间筛选异

parent 934de27a
......@@ -117,10 +117,10 @@ const AccountLists: React.FC<{}> = () => {
const res = await PublicApi.getMemberManagePageitems()
if (res.code === 1000) {
const { data = {} }: any = res
const {
memberTypes = [],
roles = [],
levels = [],
const {
memberTypes = [],
roles = [],
levels = [],
} = data
return {
......@@ -189,9 +189,9 @@ const AccountLists: React.FC<{}> = () => {
layout="vertical"
form={checkForm}
>
<Form.Item
name="remark"
label={currentRecord?.accountStatus === 1 ? '会员冻结原因' : '会员解冻原因'}
<Form.Item
name="remark"
label={currentRecord?.accountStatus === 1 ? '会员账户冻结原因' : '会员账户解冻原因'}
rules={[
{
required: true,
......
......@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { searchSchema } from './schema'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import EyePreview from '@/components/EyePreview'
import { DatePicker } from '@formily/antd-components'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import StatusTag from '@/components/StatusTag'
import { statusMap } from '../constant'
import moment from 'moment'
......@@ -86,14 +86,14 @@ const CheckWithdraw: React.FC<{}> = () => {
}
const clickUp = (r: any) => {
let params = {
let params = {
tradeCode: r.tradeCode,
id: r.memberAssetAccount.id,
tradeId: r.id,
amount: r.tradeMoney,
preview: r.preview,
status: r.status,
}
}
history.push(`/capitalAccount/checkWithdraw/details?detailinfo=${btoa(JSON.stringify(params))}`)
}
......@@ -139,7 +139,7 @@ const CheckWithdraw: React.FC<{}> = () => {
controlRender={
<NiceForm
components={{
RangePicker: DatePicker.RangePicker
DateRangePickerUnix,
}}
actions={formActions}
onSubmit={values => ref.current.reload(values)}
......
......@@ -75,7 +75,7 @@ export const searchSchema: ISchema = {
},
"[startTime,endTime]": {
type: 'array',
"x-component": 'RangePicker',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
},
......@@ -94,4 +94,4 @@ export const searchSchema: ISchema = {
},
},
},
};
\ No newline at end of file
};
......@@ -3,14 +3,16 @@
*/
// 交易记录状态
export const statusMap = {
export const statusMap = {
'1': { title: '申请提现', type: 'warning' },
'2': { title: '审核通过', type: 'success' },
'3': { title: '审核不通过', type: 'default' },
'4': { title: '提现成功', type: 'success' },
'5': { title: '提现失败', type: 'danger' },
'6': { title: '支付中', type: 'processing' },
'7': { title: '确认到账', type: 'success' },
'7': { title: '支付失败', type: 'danger' },
'8': { title: '确认到账', type: 'success' },
'9': { title: '支付成功', type: 'success' },
}
// 流转状态
......@@ -50,7 +52,7 @@ export const operationMap = {
// 会员类型
export const accountMemberType = {
'1': '企业会员',
'2': '企业个人会员',
'2': '个人会员',
'3': '渠道会员',
'4': '渠道个人会员',
}
\ No newline at end of file
}
......@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { searchSchema } from './schema'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import EyePreview from '@/components/EyePreview'
import { DatePicker } from '@formily/antd-components'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import StatusTag from '@/components/StatusTag'
import { statusMap } from '../constant'
import moment from 'moment'
......@@ -80,17 +80,17 @@ const PaymentWithdraw: React.FC<{}> = () => {
}
const clickUp = (r: any) => {
let params = {
let params = {
tradeCode: r.tradeCode,
id: r.memberAssetAccount.id,
payId: r.id,
amount: r.tradeMoney,
preview: r.preview,
status: r.status,
}
}
history.push(`/capitalAccount/paymentWithdraw/details?detailinfo=${btoa(JSON.stringify(params))}`)
}
return (
<PageHeaderWrapper>
<Card>
......@@ -102,7 +102,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
controlRender={
<NiceForm
components={{
RangePicker: DatePicker.RangePicker
DateRangePickerUnix,
}}
actions={formActions}
onSubmit={values => ref.current.reload(values)}
......
......@@ -61,7 +61,7 @@ export const searchSchema: ISchema = {
},
"[startTime,endTime]": {
type: 'array',
"x-component": 'RangePicker',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
},
......@@ -80,4 +80,4 @@ export const searchSchema: ISchema = {
},
},
},
};
\ No newline at end of file
};
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