Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
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
黄庭坚
jinfa-platform
Commits
c4e44f8c
Commit
c4e44f8c
authored
Dec 24, 2021
by
xiexiuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:营销能力-商家优惠劵管理-商家优惠劵执行按钮权限
parent
b8c20cfe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
13 deletions
+14
-13
coupon.tsx
...marketingAbility/merchantCoupon/common/columns/coupon.tsx
+6
-5
index.tsx
...ngAbility/merchantCoupon/merchantCouponAnalysis/index.tsx
+8
-8
No files found.
src/pages/transaction/marketingAbility/merchantCoupon/common/columns/coupon.tsx
View file @
c4e44f8c
...
...
@@ -9,16 +9,16 @@ import React from 'react';
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
moment
from
'moment'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
getIntl
}
from
'umi'
import
{
getIntl
}
from
'umi'
import
{
AuthUrl
}
from
'@/components/AuthButton/AuthUrl'
/**
*
* @param target string 会员详情路径前缀
* @returns Table Columns
*/
const
intl
=
getIntl
();
const
columns
=
(
target
=
'/memberCenter/marketingAbility/merchantCoupon/unsubmitted/detail'
):
ColumnType
<
any
>
[]
=>
([
const
intl
=
getIntl
();
const
columns
=
(
target
=
'/memberCenter/marketingAbility/merchantCoupon/unsubmitted/detail'
):
ColumnType
<
any
>
[]
=>
([
{
title
:
'ID'
,
dataIndex
:
'id'
,
...
...
@@ -30,6 +30,7 @@ import { getIntl} from 'umi'
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<
EyePreview
type=
{
AuthUrl
(
'deliver.see'
,
'marketingAbility'
)
?
'link'
:
'button'
}
url=
{
`${target}?id=${record.id}`
}
>
{
text
}
...
...
@@ -63,7 +64,7 @@ import { getIntl} from 'umi'
title
:
intl
.
formatMessage
({
id
:
'merchantCoupon.effectiveTimeEnd'
}),
dataIndex
:
'effectiveTimeEnd'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
text
?
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.receive'
})
+
record
.
invalidDay
+
intl
.
formatMessage
({
id
:
'merchantCoupon.failureAfterDays'
})}
`
,
render
:
(
text
,
record
)
=>
text
?
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.receive'
})
+
record
.
invalidDay
+
intl
.
formatMessage
({
id
:
'merchantCoupon.failureAfterDays'
})}
`
,
},
{
title
:
intl
.
formatMessage
({
id
:
'merchantCoupon.getWayName'
}),
...
...
src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponAnalysis/index.tsx
View file @
c4e44f8c
...
...
@@ -28,7 +28,7 @@ import {
}
from
'@/constants/marketing'
;
import
verifySchema
from
'../common/schemas/verify'
;
import
commonColumn
from
'../common/columns/coupon'
;
import
{
useIntl
}
from
'umi'
import
{
useIntl
}
from
'umi'
const
formActions
=
createFormActions
();
...
...
@@ -82,27 +82,27 @@ const MerchantCouponAnalysis: React.FC = () => {
return
res
.
data
;
};
const
baseColumns
:
ColumnType
<
GetMarketingCouponWaiteExecutePageResponseDetail
>
[]
=
commonColumn
(
'/memberCenter/marketingAbility/merchantCoupon/analysis/detail'
);
const
baseColumns
:
ColumnType
<
GetMarketingCouponWaiteExecutePageResponseDetail
>
[]
=
commonColumn
(
'/memberCenter/marketingAbility/merchantCoupon/analysis/detail'
);
baseColumns
.
pop
();
const
defaultColumns
=
baseColumns
.
concat
([
{
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.Havereceived'
})}
`
,
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.Havereceived'
})}
`
,
dataIndex
:
'obtainQuantity'
,
},
{
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.Used'
})}
`
,
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.Used'
})}
`
,
dataIndex
:
'useQuantity'
,
},
{
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.expired'
})}
`
,
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.expired'
})}
`
,
dataIndex
:
'dueQuantity'
,
},
{
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.innerState'
})}
`
,
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.innerState'
})}
`
,
dataIndex
:
'statusName'
,
},
{
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.operation'
})}
`
,
title
:
`
${
intl
.
formatMessage
({
id
:
'merchantCoupon.operation'
})}
`
,
dataIndex
:
'option'
,
align
:
'center'
,
render
:
(
_
,
record
)
=>
(
...
...
@@ -111,7 +111,7 @@ const MerchantCouponAnalysis: React.FC = () => {
<
Button
type=
"link"
onClick=
{
()
=>
history
.
push
(
`/memberCenter/marketingAbility/merchantCoupon/analysis/deliver?id=${record.id}`
)
}
>
{
intl
.
formatMessage
({
id
:
'merchantCoupon.Shuttlecoupon'
})
}
</
Button
>
>
{
intl
.
formatMessage
({
id
:
'merchantCoupon.Shuttlecoupon'
})
}
</
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