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
7ff704a6
Commit
7ff704a6
authored
Dec 24, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改翻译
parent
7f77e82f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
168 additions
and
151 deletions
+168
-151
index.less
src/components/AnchorPage/index.less
+100
-97
HeaderDropdown.tsx
src/layouts/components/HeaderDropdown.tsx
+1
-1
commodity.ts
src/locales/en-US/commodity.ts
+1
-1
index.tsx
src/pages/authConfig/memberSystem/index.tsx
+15
-1
info.tsx
src/pages/contract/funds/editbill/components/info.tsx
+41
-41
table.tsx
src/pages/contract/funds/editbill/components/table.tsx
+10
-10
No files found.
src/components/AnchorPage/index.less
View file @
7ff704a6
@import '~antd/es/style/themes/default.less';
@import '~antd/es/style/themes/default.less';
.anchor-page {
.anchor-page {
&-header {
&-header {
background: #FFFFFF;
background: #FFFFFF;
&-main {
&-main {
padding: 0 16px;
padding: 0 16px;
display: flex;
display: flex;
}
}
&-left {
&-left {
flex: 1;
flex: 1;
overflow: hidden;
overflow: hidden;
}
}
&-right {
&-right {
padding-top: 14px;
padding-top: 14px;
flex-shrink: 0;
flex-shrink: 0;
margin-left: 12px;
margin-left: 12px;
}
}
&-heading {
&-heading {
padding: 14px 0 9px 0;
padding: 14px 0 9px 0;
display: flex;
display: flex;
align-items: center;
align-items: center;
&-title {
&-title {
margin-bottom: 0;
margin-bottom: 0;
color: rgba(0, 0, 0, 0.85);
color: rgba(0, 0, 0, 0.85);
font-weight: 600;
font-weight: 600;
font-size: 18px;
font-size: 18px;
line-height: 32px;
line-height: 32px;
min-height: 32px;
min-height: 32px;
overflow: hidden;
overflow: hidden;
white-space: nowrap;
white-space: nowrap;
text-overflow: ellipsis;
text-overflow: ellipsis;
}
}
}
}
&-back {
&-back {
margin-right: 12px;
margin-right: 12px;
font-size: 16px;
font-size: 16px;
cursor: pointer;
cursor: pointer;
&:hover {
&:hover {
color: @primary-color;
color: @primary-color;
}
}
}
}
&-anchors {
&-anchors {
display: flex;
display: flex;
align-items: center;
align-items: center;
}
&:hover {
:global {
overflow-x: auto;
.ant-anchor {
}
background-color: #FFFFFF;
}
&-wrapper {
:global {
margin-left: 0;
.ant-anchor {
}
background-color: #FFFFFF;
&-link {
&-wrapper {
padding: 0 16px;
margin-left: 0;
font-size: 14px;
}
font-weight: 400;
color: @text-color;
&-link {
padding: 0 16px;
&-title {
font-size: 14px;
padding: 16px 0;
font-weight: 400;
border-bottom: 2px solid transparent;
color: @text-color;
}
&-title {
&-active,
padding: 16px 0;
&:hover {
border-bottom: 2px solid transparent;
font-weight: 500;
}
color: @text-color;
&-active,
.ant-anchor-link-title {
&:hover {
border-bottom: 2px solid @primary-color;
font-weight: 500;
}
color: @text-color;
}
}
.ant-anchor-link-title {
border-bottom: 2px solid @primary-color;
&-ink {
}
display: none;
}
}
}
}
}
&-ink {
}
display: none;
}
&-content {
}
padding: 16px;
}
}
}
}
\ No newline at end of file
&-content {
padding: 16px;
}
}
src/layouts/components/HeaderDropdown.tsx
View file @
7ff704a6
...
@@ -78,12 +78,12 @@ const HeaderDropdown: React.FC = () => {
...
@@ -78,12 +78,12 @@ const HeaderDropdown: React.FC = () => {
console
.
log
(
getLocale
(),
"locale"
)
console
.
log
(
getLocale
(),
"locale"
)
if
(
locales
)
{
if
(
locales
)
{
setLocale
(
locales
as
any
,
true
);
setLocale
(
locales
as
any
,
true
);
removeCookie
(
'locales'
,
{
path
:
'/'
,
domain
:
getTopDomainByHost
(
TOP_DOMAIN_NO_PORT
,
true
)
})
}
}
setCurrentLangKey
(
getLocale
())
setCurrentLangKey
(
getLocale
())
},
[])
},
[])
const
setLang
=
(
langItem
:
countryItem
)
=>
{
const
setLang
=
(
langItem
:
countryItem
)
=>
{
removeCookie
(
'locales'
,
{
path
:
'/'
,
domain
:
getTopDomainByHost
(
TOP_DOMAIN_NO_PORT
,
true
)
})
setLocale
(
langItem
.
key
,
true
)
setLocale
(
langItem
.
key
,
true
)
}
}
...
...
src/locales/en-US/commodity.ts
View file @
7ff704a6
...
@@ -9,7 +9,7 @@ export default {
...
@@ -9,7 +9,7 @@ export default {
'commodity.goods.columns.brand'
:
'Brand'
,
'commodity.goods.columns.brand'
:
'Brand'
,
'commodity.goods.columns.unit'
:
'Unit'
,
'commodity.goods.columns.unit'
:
'Unit'
,
'commodity.goods.columns.costPrice'
:
'Into unit price'
,
'commodity.goods.columns.costPrice'
:
'Into unit price'
,
'commodity.goods.columns.currency'
:
'
¥
'
,
'commodity.goods.columns.currency'
:
'
$
'
,
'commodity.goods.columns.batch'
:
'Import batch'
,
'commodity.goods.columns.batch'
:
'Import batch'
,
'commodity.goods.columns.option'
:
'Operation'
,
'commodity.goods.columns.option'
:
'Operation'
,
'commodity.goods.columns.option.button.1'
:
'Modify'
,
'commodity.goods.columns.option.button.1'
:
'Modify'
,
...
...
src/pages/authConfig/memberSystem/index.tsx
View file @
7ff704a6
...
@@ -14,7 +14,6 @@ import { IButtonFilter, IFormFilter } from 'god/dist/src/standard-table/TableCon
...
@@ -14,7 +14,6 @@ import { IButtonFilter, IFormFilter } from 'god/dist/src/standard-table/TableCon
import
{
getMemberRolePage
,
postMemberRoleDelete
,
postMemberRoleUpdatestatus
}
from
'@/services/MemberV2Api'
;
import
{
getMemberRolePage
,
postMemberRoleDelete
,
postMemberRoleUpdatestatus
}
from
'@/services/MemberV2Api'
;
import
StatusSwitch
from
'@/components/StatusSwitch'
;
import
StatusSwitch
from
'@/components/StatusSwitch'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
STATUS_ENUM
}
from
'@/constants'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
PopConfirmControl
from
'@/components/PopConfirmControl'
;
import
PopConfirmControl
from
'@/components/PopConfirmControl'
;
...
@@ -94,6 +93,21 @@ const MemberSystem: React.FC<{}> = () => {
...
@@ -94,6 +93,21 @@ const MemberSystem: React.FC<{}> = () => {
}
}
];
];
const
STATUS_ENUM
=
[
{
label
:
intl
.
formatMessage
({
id
:
'common.text.all'
}),
value
:
null
},
{
label
:
intl
.
formatMessage
({
id
:
'common.status.effective'
}),
value
:
1
},
{
label
:
intl
.
formatMessage
({
id
:
'common.status.invalid'
}),
value
:
0
}
]
return
(
return
(
<
PageHeaderWrapper
>
<
PageHeaderWrapper
>
...
...
src/pages/contract/funds/editbill/components/info.tsx
View file @
7ff704a6
This diff is collapsed.
Click to expand it.
src/pages/contract/funds/editbill/components/table.tsx
View file @
7ff704a6
...
@@ -66,13 +66,13 @@ const table = (props: any) => {
...
@@ -66,13 +66,13 @@ const table = (props: any) => {
title
:
(
title
:
(
<
Space
direction=
'vertical'
>
<
Space
direction=
'vertical'
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.danjujine'
})
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.danjujine'
})
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.heji'
})
}
:
¥
{
toorderAmount
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.heji'
})
}
:
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
toorderAmount
}
</
Text
>
</
Space
>
</
Space
>
),
),
dataIndex
:
'orderAmount'
,
align
:
'center'
,
dataIndex
:
'orderAmount'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
render
:
(
text
,
record
)
=>
<
div
>
<
div
>
<
div
>
¥
{
record
.
orderType
==
2
?
`-${text}`
:
text
}
</
div
>
<
div
>
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
record
.
orderType
==
2
?
`-${text}`
:
text
}
</
div
>
</
div
>
</
div
>
},
},
...
@@ -90,12 +90,12 @@ const table = (props: any) => {
...
@@ -90,12 +90,12 @@ const table = (props: any) => {
title
:
(
title
:
(
<
Space
direction=
'vertical'
>
<
Space
direction=
'vertical'
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.yifukuan'
})
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.yifukuan'
})
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.heji'
})
}
:
¥
{
topayAmount
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.heji'
})
}
:
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
topayAmount
}
</
Text
>
</
Space
>
</
Space
>
),
),
render
:
(
text
)
=>
render
:
(
text
)
=>
<
div
>
<
div
>
<
div
>
¥
{
text
?
text
:
0
}
</
div
>
<
div
>
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
text
?
text
:
0
}
</
div
>
</
div
>
</
div
>
},
},
{
{
...
@@ -103,12 +103,12 @@ const table = (props: any) => {
...
@@ -103,12 +103,12 @@ const table = (props: any) => {
title
:
(
title
:
(
<
Space
direction=
'vertical'
>
<
Space
direction=
'vertical'
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.yiqingkuandaifukuan'
})
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.yiqingkuandaifukuan'
})
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.heji'
})
}
:
¥
{
tounPayApplyAmount
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.heji'
})
}
:
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
tounPayApplyAmount
}
</
Text
>
</
Space
>
</
Space
>
),
),
render
:
(
text
,
record
)
=>
render
:
(
text
,
record
)
=>
<
div
>
<
div
>
<
div
>
¥
{
text
?
text
:
0
}
</
div
>
<
div
>
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
text
?
text
:
0
}
</
div
>
</
div
>
</
div
>
},
},
{
{
...
@@ -116,13 +116,13 @@ const table = (props: any) => {
...
@@ -116,13 +116,13 @@ const table = (props: any) => {
title
:
(
title
:
(
<
Space
direction=
'vertical'
>
<
Space
direction=
'vertical'
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.qingkuanjine'
})
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.qingkuanjine'
})
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.heji'
})
}
:
¥
{
applyAmount
}
</
Text
>
<
Text
>
{
intl
.
formatMessage
({
id
:
'contract.heji'
})
}
:
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
applyAmount
}
</
Text
>
</
Space
>
</
Space
>
),
),
render
:
(
_
,
item
,
index
)
=>
render
:
(
_
,
item
,
index
)
=>
<
Input
<
Input
addonBefore=
"¥"
addonBefore=
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
style=
{
{
style=
{
{
width
:
130
,
width
:
130
,
}
}
}
}
...
@@ -257,7 +257,7 @@ const table = (props: any) => {
...
@@ -257,7 +257,7 @@ const table = (props: any) => {
align
:
'center'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
render
:
(
text
,
record
)
=>
<
div
>
<
div
>
<
div
>
¥
{
text
}
</
div
>
<
div
>
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
text
}
</
div
>
</
div
>
</
div
>
},
},
{
{
...
@@ -266,7 +266,7 @@ const table = (props: any) => {
...
@@ -266,7 +266,7 @@ const table = (props: any) => {
align
:
'center'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
render
:
(
text
,
record
)
=>
<
div
>
<
div
>
<
div
>
¥
{
text
}
</
div
>
<
div
>
{
intl
.
formatMessage
({
id
:
'commodity.products.directChannel.columns.currency'
})
}
{
text
}
</
div
>
</
div
>
</
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