Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project
jinfa-admin
Commits
f8ca2a8d
Commit
f8ca2a8d
authored
Jan 11, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理资金账户区块时间筛选异
parent
934de27a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
27 deletions
+26
-27
index.tsx
src/pages/capitalAccount/accountLists/index.tsx
+7
-7
index.tsx
src/pages/capitalAccount/checkWithdraw/index.tsx
+4
-4
index.tsx
src/pages/capitalAccount/checkWithdraw/schema/index.tsx
+2
-3
constant.ts
src/pages/capitalAccount/constant.ts
+6
-5
index.tsx
src/pages/capitalAccount/paymentWithdraw/index.tsx
+5
-5
index.tsx
src/pages/capitalAccount/paymentWithdraw/schema/index.tsx
+2
-3
No files found.
src/pages/capitalAccount/accountLists/index.tsx
View file @
f8ca2a8d
...
...
@@ -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
,
...
...
src/pages/capitalAccount/checkWithdraw/index.tsx
View file @
f8ca2a8d
...
...
@@ -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
)
}
...
...
src/pages/capitalAccount/checkWithdraw/schema/index.tsx
View file @
f8ca2a8d
...
...
@@ -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
};
src/pages/capitalAccount/constant.ts
View file @
f8ca2a8d
...
...
@@ -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
}
src/pages/capitalAccount/paymentWithdraw/index.tsx
View file @
f8ca2a8d
...
...
@@ -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
)
}
...
...
src/pages/capitalAccount/paymentWithdraw/schema/index.tsx
View file @
f8ca2a8d
...
...
@@ -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
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment