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
b9f735c9
Commit
b9f735c9
authored
Dec 06, 2021
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改装修翻译
parent
4a013cdf
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
12 deletions
+13
-12
BasicLayout.tsx
src/layouts/BasicLayout.tsx
+2
-2
index.tsx
...ty/marketingActivitiesManagement/activePage/add/index.tsx
+2
-2
index.tsx
...esManagement/activePage/components/ActivityItem/index.tsx
+1
-1
index.tsx
...ePage/fixtures/components/Layouts/Advertisement/index.tsx
+2
-2
index.tsx
...t/activePage/fixtures/components/Layouts/Coupon/index.tsx
+2
-2
index.tsx
...e/fixtures/components/Layouts/WrapCommodityList/index.tsx
+3
-2
index.tsx
...bility/marketingActivitiesManagement/activePage/index.tsx
+1
-1
No files found.
src/layouts/BasicLayout.tsx
View file @
b9f735c9
...
...
@@ -152,8 +152,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
minWidth
:
'1280px'
,
}
:
{}
//
console.log(currentRouter)
return
currentRouter
.
noLayout
?
props
.
children
:
(
console
.
log
(
currentRouter
)
return
currentRouter
?
.
noLayout
?
props
.
children
:
(
<
ProLayout
pageTitleRender=
{
()
=>
currentRouter
?
currentRouter
.
name
:
window
.
location
.
href
}
// contentStyle={{minWidth: '1280px'}}
...
...
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/add/index.tsx
View file @
b9f735c9
...
...
@@ -86,7 +86,7 @@ const Add = () => {
okText
:
intl
.
formatMessage
({
id
:
'activityPage.decorationImmediate'
}),
cancelText
:
intl
.
formatMessage
({
id
:
'activityPage.waitMin'
}),
onOk
:
()
=>
{
history
.
push
(
`/memberCenter/marketingAbility/activityPage/management/fixtures?id=
${
data
}
`
);
history
.
push
(
`/memberCenter/marketingAbility/activityPage
s
/management/fixtures?id=
${
data
}
`
);
},
onCancel
:
()
=>
{
history
.
goBack
();
...
...
@@ -174,7 +174,7 @@ const Add = () => {
<
Space
>
{
isEdit
&&
(
<
Link
to=
{
`/memberCenter/marketingAbility/activityPage/management/fixtures?id=${id}`
}
>
<
Link
to=
{
`/memberCenter/marketingAbility/activityPage
s
/management/fixtures?id=${id}`
}
>
<
Button
icon=
{
<
BgColorsOutlined
/>
}
>
{
intl
.
formatMessage
({
id
:
'activityPage.activityPageDecorate'
})
}
</
Button
>
</
Link
>
)
||
null
...
...
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/components/ActivityItem/index.tsx
View file @
b9f735c9
...
...
@@ -82,7 +82,7 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
</
div
>
{
[
PENDIGN_ONLINE
,
OFFLINE
].
includes
(
status
)
&&
(
<
Link
to=
{
`/memberCenter/marketingAbility/activityPage/management/edit?id=${id}`
}
>
<
Link
to=
{
`/memberCenter/marketingAbility/activityPage
s
/management/edit?id=${id}`
}
>
<
Button
icon=
{
<
EditOutlined
/>
}
></
Button
>
</
Link
>
)
||
null
...
...
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/Advertisement/index.tsx
View file @
b9f735c9
import
React
,
{
CSSProperties
,
useMemo
}
from
'react'
;
import
cx
from
'classnames'
;
import
{
Tooltip
}
from
'antd'
;
import
{
useIntl
}
from
'umi'
import
{
getIntl
}
from
'umi'
const
intl
=
getIntl
();
interface
Iprops
{
imageUrl
:
string
,
width
:
number
|
string
,
...
...
@@ -12,7 +13,6 @@ interface Iprops {
}
const
Advertisement
:
React
.
FC
<
Iprops
>
=
(
props
:
Iprops
)
=>
{
const
intl
=
useIntl
();
const
{
imageUrl
,
width
=
"100%"
,
height
=
176
,
style
=
{},
className
,
...
other
}
=
props
;
const
cacheWidth
=
useMemo
(()
=>
typeof
width
===
'number'
?
`
${
width
}
px`
:
width
,
[
width
]);
const
cacheHeight
=
useMemo
(()
=>
typeof
height
===
'number'
?
`
${
height
}
px`
:
height
,
[
height
]);
...
...
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/Coupon/index.tsx
View file @
b9f735c9
...
...
@@ -3,8 +3,9 @@ import { MarketingCard } from '@lingxi-design/ui';
import
cx
from
'classnames'
;
import
styles
from
'./index.less'
;
import
{
Tooltip
}
from
'antd'
;
import
{
useIntl
}
from
'umi'
import
{
getIntl
}
from
'umi'
const
intl
=
getIntl
();
const
{
CouponsItem
}
=
MarketingCard
;
interface
Iprops
{
...
...
@@ -21,7 +22,6 @@ interface Iprops {
}
const
Coupon
:
React
.
FC
<
Iprops
>
&
{
Item
:
typeof
CouponItem
}
=
(
props
:
Iprops
)
=>
{
const
intl
=
useIntl
();
const
{
children
,
className
,
visible
=
true
,
...
other
}
=
props
;
const
classNameStr
=
cx
(
styles
.
container
,
...
...
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/WrapCommodityList/index.tsx
View file @
b9f735c9
...
...
@@ -2,15 +2,16 @@
import
React
,
{
useState
}
from
'react'
;
import
cx
from
'classnames'
;
import
{
Tooltip
}
from
'antd'
;
import
{
useIntl
}
from
'umi'
import
{
getIntl
}
from
'umi'
const
intl
=
getIntl
();
interface
Iprops
{
className
:
any
,
children
:
any
}
const
WrapCommodityList
:
React
.
FC
<
Iprops
>
=
(
props
:
Iprops
)
=>
{
const
intl
=
useIntl
();
//
const intl = useIntl();
const
{
children
,
className
,
...
other
}
=
props
;
const
classNameStr
=
cx
(
className
);
...
...
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/index.tsx
View file @
b9f735c9
...
...
@@ -103,7 +103,7 @@ const ActivePage = () => {
<
div
className=
{
styles
.
search
}
>
<
Search
placeholder=
{
intl
.
formatMessage
({
id
:
'activityPage.searchshousuo'
})
}
onChange=
{
(
e
)
=>
onChange
(
e
.
target
.
value
)
}
onSearch=
{
handleSearch
}
/>
</
div
>
<
Link
to=
'/memberCenter/marketingAbility/activityPage/management/add'
>
<
Link
to=
'/memberCenter/marketingAbility/activityPage
s
/management/add'
>
<
Button
icon=
{
<
PlusOutlined
/>
}
type=
"primary"
>
{
intl
.
formatMessage
({
id
:
'activityPage.add'
})
}
</
Button
>
</
Link
>
</
div
>
...
...
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