Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
fdd06b41
Commit
fdd06b41
authored
Oct 31, 2022
by
李腾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 优化消息弹框样式
parent
8643c51e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
101 additions
and
25 deletions
+101
-25
index.jsx
src/components/MessageReminder/Complex/index.jsx
+26
-21
index.less
src/components/MessageReminder/Complex/index.less
+47
-3
index.less
src/components/MessageReminder/Simple/index.less
+11
-0
index.jsx
src/pages/AfterSaleManage/index.jsx
+1
-1
index.less
src/pages/AfterSaleManage/index.less
+16
-0
No files found.
src/components/MessageReminder/Complex/index.jsx
View file @
fdd06b41
...
@@ -239,11 +239,13 @@ const Complex = props => {
...
@@ -239,11 +239,13 @@ const Complex = props => {
display
:
'
flex
'
,
display
:
'
flex
'
,
flexWrap
:
'
wrap
'
,
flexWrap
:
'
wrap
'
,
padding
:
0
,
padding
:
0
,
backgroundColor
:
'
#f7f8f9
'
,
},
},
width
:
'
1000px
'
,
wrapClassName
:
'
complex-modal
'
,
height
:
'
600px
'
,
width
:
'
834px
'
,
height
:
'
650px
'
,
visible
,
visible
,
title
:
'
消息提醒
'
,
title
:
<
span
className=
"title-icon"
>
消息提醒
</
span
>
,
footer
:
null
,
footer
:
null
,
onCancel
:
close
,
onCancel
:
close
,
};
};
...
@@ -251,9 +253,9 @@ const Complex = props => {
...
@@ -251,9 +253,9 @@ const Complex = props => {
const
TabRender
=
tabProps
=>
{
const
TabRender
=
tabProps
=>
{
const
{
title
,
count
=
0
}
=
tabProps
;
const
{
title
,
count
=
0
}
=
tabProps
;
return
(
return
(
<
span
>
<
span
className=
{
styles
[
'
tab-render
'
]
}
>
{
title
}
{
title
}
<
Badge
size=
"small"
overflowCount=
{
999
}
count=
{
count
}
/>
<
Badge
overflowCount=
{
999
}
count=
{
count
}
/>
</
span
>
</
span
>
);
);
};
};
...
@@ -275,7 +277,7 @@ const Complex = props => {
...
@@ -275,7 +277,7 @@ const Complex = props => {
value=
"1"
value=
"1"
onChange=
{
onReadStatusChange
}
onChange=
{
onReadStatusChange
}
>
>
已读
读
已读
</
Checkbox
>
</
Checkbox
>
</
div
>
</
div
>
<
div
className=
{
styles
[
'
filter-box__actions
'
]
}
>
<
div
className=
{
styles
[
'
filter-box__actions
'
]
}
>
...
@@ -290,7 +292,11 @@ const Complex = props => {
...
@@ -290,7 +292,11 @@ const Complex = props => {
<
Tabs
<
Tabs
className=
{
styles
.
tabs
}
className=
{
styles
.
tabs
}
activeKey=
{
queryParams
.
type
}
activeKey=
{
queryParams
.
type
}
tabBarStyle=
{
{
width
:
'
150px
'
,
}
}
tabPosition=
"left"
tabPosition=
"left"
tabBarGutter=
{
0
}
onChange=
{
onTabChange
}
onChange=
{
onTabChange
}
>
>
<
Tabs
.
TabPane
tab=
{
<
TabRender
title=
"订单消息"
count=
{
orderUnReadCount
}
/>
}
key=
"0"
/>
<
Tabs
.
TabPane
tab=
{
<
TabRender
title=
"订单消息"
count=
{
orderUnReadCount
}
/>
}
key=
"0"
/>
...
@@ -310,22 +316,21 @@ const Complex = props => {
...
@@ -310,22 +316,21 @@ const Complex = props => {
)
}
)
}
</
div
>
</
div
>
</
Spin
>
</
Spin
>
{
dataTotal
>
0
?
(
<
div
className=
{
styles
.
pagination
}
>
<
Pagination
onChange=
{
onPageChange
}
total=
{
dataTotal
}
showTotal=
{
(
total
,
range
)
=>
`第${range[0]}-${range[1]}条 /总共${total}条`
}
showSizeChanger
pageSize=
{
queryParams
.
pageSize
}
current=
{
queryParams
.
pageNo
}
/>
</
div
>
)
:
(
''
)
}
</
div
>
</
div
>
{
dataTotal
>
0
?
(
<
div
className=
{
styles
.
pagination
}
>
<
Pagination
onChange=
{
onPageChange
}
total=
{
dataTotal
}
showTotal=
{
(
total
,
range
)
=>
`第${range[0]}-${range[1]}条 /总共${total}条`
}
showSizeChanger
pageSize=
{
queryParams
.
pageSize
}
current=
{
queryParams
.
pageNo
}
/>
</
div
>
)
:
(
''
)
}
</
Modal
>
</
Modal
>
);
);
};
};
...
...
src/components/MessageReminder/Complex/index.less
View file @
fdd06b41
.tab-pane {
.tab-pane {
flex: 1;
flex: 1;
}
}
.tabs {
:global .ant-tabs-tab {
height: 48px;
line-height: 48px;
border-bottom: 1px solid #efefef;
}
:global .ant-tabs-ink-bar {
height: 40px !important;
margin-top: 4px !important;
}
}
.tab-render {
display: flex;
align-items: center;
:global .ant-badge {
margin-left: 5px;
}
}
.filter-box {
.filter-box {
display: flex;
display: flex;
...
@@ -9,9 +28,22 @@
...
@@ -9,9 +28,22 @@
&__content {
&__content {
flex: 1;
flex: 1;
}
}
// &__actions{
}
// }
:global .complex-modal {
.ant-modal-header {
text-align: center;
background-color: #2d8cf0;
}
.ant-modal-title,
.ant-modal-close {
color: #fff;
.title-icon {
padding-left: 25px;
background: #1890ff url('https://img.lkbang.net/notice.94d42513.png') no-repeat 0 center;
background-size: 20px 20px;
}
}
}
}
.complex-list {
.complex-list {
...
@@ -24,6 +56,7 @@
...
@@ -24,6 +56,7 @@
}
}
&__item {
&__item {
margin-top: 15px;
margin-top: 15px;
background: #fff;
border: 1px solid #efefef;
border: 1px solid #efefef;
&--header {
&--header {
display: flex;
display: flex;
...
@@ -64,7 +97,7 @@
...
@@ -64,7 +97,7 @@
.actions {
.actions {
display: flex;
display: flex;
width: 100%;
width: 100%;
margin-left:
1
0px;
margin-left:
2
0px;
line-height: 40px;
line-height: 40px;
a {
a {
position: relative;
position: relative;
...
@@ -72,6 +105,17 @@
...
@@ -72,6 +105,17 @@
flex: 1;
flex: 1;
color: #ff1515;
color: #ff1515;
font-weight: 400;
font-weight: 400;
&::before {
display: inline-block;
width: 6px;
height: 6px;
margin-top: 17px;
margin-right: 6px;
vertical-align: top;
background: #ff1515;
border-radius: 50%;
content: '';
}
&::after {
&::after {
position: absolute;
position: absolute;
top: 50%;
top: 50%;
...
...
src/components/MessageReminder/Simple/index.less
View file @
fdd06b41
...
@@ -129,6 +129,17 @@
...
@@ -129,6 +129,17 @@
position: relative;
position: relative;
display: block;
display: block;
color: #ff1515;
color: #ff1515;
&::before {
display: inline-block;
width: 6px;
height: 6px;
margin-top: 8px;
margin-right: 6px;
vertical-align: top;
background: #ff1515;
border-radius: 50%;
content: '';
}
&::after {
&::after {
position: absolute;
position: absolute;
top: 50%;
top: 50%;
...
...
src/pages/AfterSaleManage/index.jsx
View file @
fdd06b41
...
@@ -319,7 +319,7 @@ const AfterSale = props => {
...
@@ -319,7 +319,7 @@ const AfterSale = props => {
const
TabCountElement
=
({
count
,
text
})
=>
(
const
TabCountElement
=
({
count
,
text
})
=>
(
<
span
>
<
span
>
{
text
}
{
text
}
{
count
}
<
span
className=
"count"
>
{
count
}
</
span
>
</
span
>
</
span
>
);
);
...
...
src/pages/AfterSaleManage/index.less
View file @
fdd06b41
...
@@ -41,4 +41,20 @@
...
@@ -41,4 +41,20 @@
:global .ant-tabs-nav::before {
:global .ant-tabs-nav::before {
display: none;
display: none;
}
}
:global .ant-tabs-tab {
.count {
padding-left: 5px;
color: #888;
transition: 0.3s ease;
}
&:hover .count {
color: #1890ff;
transition: 0.3s ease;
}
}
:global .ant-tabs-tab-active {
.count {
color: #1890ff;
}
}
}
}
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