Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
pro-blocks
Commits
a949a3c2
Commit
a949a3c2
authored
Oct 10, 2017
by
ddcat1115
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
视觉调整
parent
3cf2fea9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
51 additions
and
30 deletions
+51
-30
src/components/DescriptionList/index.less
src/components/DescriptionList/index.less
+1
-1
src/components/PageHeader/demo/standard.md
src/components/PageHeader/demo/standard.md
+3
-2
src/components/PageHeader/index.less
src/components/PageHeader/index.less
+14
-3
src/routes/Profile/AdvancedProfile.js
src/routes/Profile/AdvancedProfile.js
+16
-17
src/routes/Profile/AdvancedProfile.less
src/routes/Profile/AdvancedProfile.less
+1
-1
src/routes/Profile/BasicProfile.js
src/routes/Profile/BasicProfile.js
+7
-4
src/routes/Profile/BasicProfile.less
src/routes/Profile/BasicProfile.less
+9
-2
No files found.
src/components/DescriptionList/index.less
View file @
a949a3c2
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
.title {
.title {
color: @heading-color;
color: @heading-color;
font-weight:
6
00;
font-weight:
5
00;
margin-bottom: 16px;
margin-bottom: 16px;
}
}
...
...
src/components/PageHeader/demo/standard.md
View file @
a949a3c2
...
@@ -19,13 +19,14 @@ const menu = (
...
@@ -19,13 +19,14 @@ const menu = (
const
action
=
(
const
action
=
(
<
div
>
<
div
>
<
Button
type
=
"primary"
>
主
操作
</
Button
>
<
Button
>
操作
</
Button
>
<
Button
>
次
操作
</
Button
>
<
Button
>
操作
</
Button
>
<
Dropdown
overlay
=
{
menu
}
>
<
Dropdown
overlay
=
{
menu
}
>
<
Button
>
<
Button
>
更多
<
Icon
type
=
"down"
/>
更多
<
Icon
type
=
"down"
/>
</
Button
>
</
Button
>
</
Dropdown
>
</
Dropdown
>
<
Button
type
=
"primary"
>
主操作
</
Button
>
</
div
>
</
div
>
);
);
...
...
src/components/PageHeader/index.less
View file @
a949a3c2
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.pageHeader {
.pageHeader {
background: @component-background;
background: @component-background;
padding: 1
8px 28px 0 36
px;
padding: 1
6px 32px 0 32
px;
border-bottom: @border-width-base @border-style-base @border-color-split;
border-bottom: @border-width-base @border-style-base @border-color-split;
.detail {
.detail {
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
}
}
.breadcrumb {
.breadcrumb {
margin-bottom: 1
8
px;
margin-bottom: 1
6
px;
}
}
.tabs {
.tabs {
...
@@ -42,6 +42,17 @@
...
@@ -42,6 +42,17 @@
.action {
.action {
margin-left: 56px;
margin-left: 56px;
min-width: 266px;
min-width: 266px;
:global {
.ant-btn-group:not(:last-child),
.ant-btn:not(:last-child) {
margin-right: 8px;
}
.ant-btn-group > .ant-btn {
margin-right: 0;
}
}
}
}
.title, .action, .content, .extraContent, .main {
.title, .action, .content, .extraContent, .main {
...
@@ -107,7 +118,7 @@
...
@@ -107,7 +118,7 @@
.pageHeader {
.pageHeader {
.action {
.action {
:global {
:global {
.ant-btn-group, :not(.ant-btn-group) .ant-b
utto
n {
.ant-btn-group, :not(.ant-btn-group) .ant-b
t
n {
display: block;
display: block;
margin-bottom: 8px;
margin-bottom: 8px;
}
}
...
...
src/routes/Profile/AdvancedProfile.js
View file @
a949a3c2
...
@@ -7,7 +7,6 @@ import EditableItem from '../../components/EditableItem';
...
@@ -7,7 +7,6 @@ import EditableItem from '../../components/EditableItem';
import
styles
from
'
./AdvancedProfile.less
'
;
import
styles
from
'
./AdvancedProfile.less
'
;
const
{
Step
}
=
Steps
;
const
{
Step
}
=
Steps
;
const
ButtonGroup
=
Button
.
Group
;
const
{
Description
}
=
DescriptionList
;
const
{
Description
}
=
DescriptionList
;
const
menu
=
(
const
menu
=
(
...
@@ -20,15 +19,13 @@ const menu = (
...
@@ -20,15 +19,13 @@ const menu = (
const
action
=
(
const
action
=
(
<
div
>
<
div
>
<
ButtonGroup
style
=
{{
marginRight
:
8
}}
>
<
Button
>
操作
<
/Button
>
<
Button
>
操作
<
/Button
>
<
Button
>
操作
<
/Button
>
<
Button
>
操作
<
/Button
>
<
Dropdown
overlay
=
{
menu
}
>
<
Dropdown
overlay
=
{
menu
}
>
<
Button
>
<
Button
>
更多
<
Icon
type
=
"
down
"
/>
更多操作
<
Icon
type
=
"
down
"
/>
<
/Button
>
<
/Button
>
<
/Dropdown
>
<
/Dropdown
>
<
/ButtonGroup
>
<
Button
type
=
"
primary
"
>
主操作
<
/Button
>
<
Button
type
=
"
primary
"
>
主操作
<
/Button
>
<
/div
>
<
/div
>
);
);
...
@@ -66,9 +63,10 @@ const tabList = [{
...
@@ -66,9 +63,10 @@ const tabList = [{
}];
}];
const
desc1
=
(
const
desc1
=
(
<
div
style
=
{{
fontSize
:
14
}}
>
<
div
style
=
{{
fontSize
:
14
}}
className
=
{
styles
.
textSecondary
}
>
<
div
style
=
{{
marginTop
:
4
,
marginBottom
:
8
}}
>
<
div
style
=
{{
marginTop
:
8
,
marginBottom
:
4
}}
>
曲丽丽
<
Icon
type
=
"
dingding-o
"
/>
曲丽丽
<
Icon
type
=
"
dingding-o
"
style
=
{{
marginLeft
:
8
}}
/
>
<
/div
>
<
/div
>
<
div
>
2016
-
12
-
12
12
:
32
<
/div
>
<
div
>
2016
-
12
-
12
12
:
32
<
/div
>
<
/div
>
<
/div
>
...
@@ -76,8 +74,9 @@ const desc1 = (
...
@@ -76,8 +74,9 @@ const desc1 = (
const
desc2
=
(
const
desc2
=
(
<
div
style
=
{{
fontSize
:
14
}}
>
<
div
style
=
{{
fontSize
:
14
}}
>
<
div
style
=
{{
marginTop
:
4
,
marginBottom
:
8
}}
>
<
div
style
=
{{
marginTop
:
8
,
marginBottom
:
4
}}
>
周毛毛
<
Icon
type
=
"
dingding-o
"
style
=
{{
color
:
'
#00A0E9
'
}}
/
>
周毛毛
<
Icon
type
=
"
dingding-o
"
style
=
{{
color
:
'
#00A0E9
'
,
marginLeft
:
8
}}
/
>
<
/div
>
<
/div
>
<
div
><
a
href
=
""
>
催一下
<
/a></
div
>
<
div
><
a
href
=
""
>
催一下
<
/a></
div
>
<
/div
>
<
/div
>
...
@@ -89,12 +88,12 @@ const popoverContent = (
...
@@ -89,12 +88,12 @@ const popoverContent = (
<
span
className
=
{
styles
.
textSecondary
}
style
=
{{
float
:
'
right
'
}}
>
<
span
className
=
{
styles
.
textSecondary
}
style
=
{{
float
:
'
right
'
}}
>
<
Badge
status
=
"
default
"
text
=
"
未响应
"
/>
<
Badge
status
=
"
default
"
text
=
"
未响应
"
/>
<
/span
>
<
/span
>
<
p
className
=
{
styles
.
textSecondary
}
style
=
{{
marginTop
:
8
}}
>
耗时
:
2
小时25分钟
<
/p
>
<
p
className
=
{
styles
.
textSecondary
}
style
=
{{
marginTop
:
4
}}
>
耗时
:
2
小时25分钟
<
/p
>
<
/div
>
<
/div
>
);
);
const
customDot
=
(
dot
,
{
status
})
=>
(
status
===
'
process
'
?
const
customDot
=
(
dot
,
{
status
})
=>
(
status
===
'
process
'
?
<
Popover
content
=
{
popoverContent
}
>
<
Popover
placement
=
"
topLeft
"
arrowPointAtCenter
content
=
{
popoverContent
}
>
{
dot
}
{
dot
}
<
/Popover
>
<
/Popover
>
:
dot
:
dot
...
...
src/routes/Profile/AdvancedProfile.less
View file @
a949a3c2
...
@@ -23,5 +23,5 @@
...
@@ -23,5 +23,5 @@
border: 0;
border: 0;
border-top: 1px solid @border-color-split;
border-top: 1px solid @border-color-split;
height: 1px;
height: 1px;
margin: 0 0
24
px 0;
margin: 0 0
16
px 0;
}
}
src/routes/Profile/BasicProfile.js
View file @
a949a3c2
...
@@ -99,11 +99,13 @@ export default class BasicProfile extends Component {
...
@@ -99,11 +99,13 @@ export default class BasicProfile extends Component {
title
:
'
单价
'
,
title
:
'
单价
'
,
dataIndex
:
'
price
'
,
dataIndex
:
'
price
'
,
key
:
'
price
'
,
key
:
'
price
'
,
className
:
'
col-money
'
,
render
:
renderContent
,
render
:
renderContent
,
},
{
},
{
title
:
'
数量(件)
'
,
title
:
'
数量(件)
'
,
dataIndex
:
'
num
'
,
dataIndex
:
'
num
'
,
key
:
'
num
'
,
key
:
'
num
'
,
className
:
'
col-money
'
,
render
:
(
text
,
row
,
index
)
=>
{
render
:
(
text
,
row
,
index
)
=>
{
if
(
index
<
basicGoods
.
length
)
{
if
(
index
<
basicGoods
.
length
)
{
return
text
;
return
text
;
...
@@ -114,6 +116,7 @@ export default class BasicProfile extends Component {
...
@@ -114,6 +116,7 @@ export default class BasicProfile extends Component {
title
:
'
金额
'
,
title
:
'
金额
'
,
dataIndex
:
'
amount
'
,
dataIndex
:
'
amount
'
,
key
:
'
amount
'
,
key
:
'
amount
'
,
className
:
'
col-money
'
,
render
:
(
text
,
row
,
index
)
=>
{
render
:
(
text
,
row
,
index
)
=>
{
if
(
index
<
basicGoods
.
length
)
{
if
(
index
<
basicGoods
.
length
)
{
return
text
;
return
text
;
...
@@ -124,19 +127,19 @@ export default class BasicProfile extends Component {
...
@@ -124,19 +127,19 @@ export default class BasicProfile extends Component {
return
(
return
(
<
PageHeaderLayout
title
=
"
基础详情页
"
>
<
PageHeaderLayout
title
=
"
基础详情页
"
>
<
Card
bordered
=
{
false
}
>
<
Card
bordered
=
{
false
}
>
<
DescriptionList
title
=
"
退款申请
"
style
=
{{
marginBottom
:
24
}}
>
<
DescriptionList
title
=
"
退款申请
"
style
=
{{
marginBottom
:
32
}}
>
<
Description
term
=
"
取货单号
"
>
1000000000
<
/Description
>
<
Description
term
=
"
取货单号
"
>
1000000000
<
/Description
>
<
Description
term
=
"
状态
"
>
已取货
<
/Description
>
<
Description
term
=
"
状态
"
>
已取货
<
/Description
>
<
Description
term
=
"
销售单号
"
>
1234123421
<
/Description
>
<
Description
term
=
"
销售单号
"
>
1234123421
<
/Description
>
<
Description
term
=
"
子订单
"
>
3214321432
<
/Description
>
<
Description
term
=
"
子订单
"
>
3214321432
<
/Description
>
<
/DescriptionList
>
<
/DescriptionList
>
<
div
className
=
{
styles
.
divider
}
/
>
<
div
className
=
{
styles
.
divider
}
/
>
<
DescriptionList
title
=
"
用户信息
"
style
=
{{
marginBottom
:
24
}}
>
<
DescriptionList
title
=
"
用户信息
"
style
=
{{
marginBottom
:
32
}}
>
<
Description
term
=
"
用户姓名
"
>
付小小
<
/Description
>
<
Description
term
=
"
用户姓名
"
>
付小小
<
/Description
>
<
Description
term
=
"
联系电话
"
>
18100000000
<
/Description
>
<
Description
term
=
"
联系电话
"
>
18100000000
<
/Description
>
<
Description
term
=
"
常用快递
"
>
菜鸟仓储
<
/Description
>
<
Description
term
=
"
常用快递
"
>
菜鸟仓储
<
/Description
>
<
Description
term
=
"
取货地址
"
>
浙江省杭州市西湖区万塘路18号
<
/Description
>
<
Description
term
=
"
取货地址
"
>
浙江省杭州市西湖区万塘路18号
<
/Description
>
<
Description
term
=
"
备注
"
>
没啥
<
/Description
>
<
Description
term
=
"
备注
"
>
无
<
/Description
>
<
/DescriptionList
>
<
/DescriptionList
>
<
div
className
=
{
styles
.
divider
}
/
>
<
div
className
=
{
styles
.
divider
}
/
>
<
div
className
=
{
styles
.
title
}
>
退货商品
<
/div
>
<
div
className
=
{
styles
.
title
}
>
退货商品
<
/div
>
...
@@ -150,7 +153,7 @@ export default class BasicProfile extends Component {
...
@@ -150,7 +153,7 @@ export default class BasicProfile extends Component {
/>
/>
<
div
className
=
{
styles
.
title
}
>
退货进度
<
/div
>
<
div
className
=
{
styles
.
title
}
>
退货进度
<
/div
>
<
Table
<
Table
style
=
{{
marginBottom
:
24
}}
style
=
{{
marginBottom
:
16
}}
pagination
=
{
false
}
pagination
=
{
false
}
loading
=
{
basicLoading
}
loading
=
{
basicLoading
}
dataSource
=
{
basicProgress
}
dataSource
=
{
basicProgress
}
...
...
src/routes/Profile/BasicProfile.less
View file @
a949a3c2
...
@@ -4,11 +4,18 @@
...
@@ -4,11 +4,18 @@
border: 0;
border: 0;
border-top: 1px solid @border-color-split;
border-top: 1px solid @border-color-split;
height: 1px;
height: 1px;
margin: 0 0
24
px 0;
margin: 0 0
32
px 0;
}
}
.title {
.title {
color: rgba(0, 0, 0, 0.85);
color: rgba(0, 0, 0, 0.85);
font-weight:
6
00;
font-weight:
5
00;
margin-bottom: 16px;
margin-bottom: 16px;
}
}
:global {
.col-money {
text-align: right!important;
}
}
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