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
0af0578b
Commit
0af0578b
authored
Oct 14, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 交易规则会员显示异常
parent
4b5a5d37
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
15 deletions
+11
-15
global.d.ts
src/global/config/global.d.ts
+7
-11
RuleSetting.tsx
...SettingManage/transactionRules/components/RuleSetting.tsx
+4
-4
No files found.
src/global/config/global.d.ts
View file @
0af0578b
export
interface
MemberType
{
id
:
number
;
typeName
:
string
;
}
export
interface
BusinessType
{
i
d
:
number
;
t
ypeName
:
string
;
businessTypeI
d
:
number
;
businessT
ypeName
:
string
;
}
export
interface
UseType
{
memberType
:
MemberType
[];
businessType
:
BusinessType
[];
memberTypeId
:
number
;
memberTypeName
:
string
;
businessTypes
:
BusinessType
[];
}
export
interface
UserRegister
{
useType
:
UseType
;
useType
:
UseType
[]
;
}
export
interface
RuleConfiguration
{
...
...
@@ -37,8 +33,8 @@ export interface PayInitializeConfig {
export
interface
PayPlatformPayConfig
{
id
:
number
;
payType
:
number
;
way
:
string
;
payType
:
number
;
isPitchOn
:
number
;
}
...
...
src/pages/ruleSettingManage/transactionRules/components/RuleSetting.tsx
View file @
0af0578b
...
...
@@ -57,7 +57,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
const
handleAddMemberBtn
=
()
=>
{
const
checkBoxs
=
addSchemaAction
.
getFieldValue
(
'memberIds'
)
memberRowCtl
.
setSelectedRowKeys
(
checkBoxs
.
map
(
v
=>
v
.
product
Id
))
memberRowCtl
.
setSelectedRowKeys
(
checkBoxs
.
map
(
v
=>
v
.
member
Id
))
memberRowCtl
.
setSelectRow
(
checkBoxs
)
setVisibleChannelRroduct
(
true
)
}
...
...
@@ -72,9 +72,9 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
key
:
'memberId'
},
{
dataIndex
:
'
memberN
ame'
,
dataIndex
:
'
n
ame'
,
title
:
'会员名称'
,
key
:
'
memberN
ame'
,
key
:
'
n
ame'
,
// render: (_, record) => <EyePreview url={`/memberCenter/commodityAbility/commodity/products/viewProducts?id=${record.id}`}>{_}</EyePreview>
},
{
...
...
@@ -96,7 +96,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
{
dataIndex
:
'ctl'
,
title
:
'操作'
,
render
:
(
_
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleDeleteTable
(
record
.
i
d
)
}
>
删除
</
Button
>
render
:
(
_
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleDeleteTable
(
record
.
memberI
d
)
}
>
删除
</
Button
>
}
]
...
...
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