diff --git a/src/components/DescriptionList/index.less b/src/components/DescriptionList/index.less
index a8f88a3df10f710346b9b00d1f07892f2df91554..a98559518f9361ca3659034efa6ba348b99dda3d 100644
--- a/src/components/DescriptionList/index.less
+++ b/src/components/DescriptionList/index.less
@@ -11,7 +11,7 @@
.title {
color: @heading-color;
- font-weight: 600;
+ font-weight: 500;
margin-bottom: 16px;
}
diff --git a/src/components/PageHeader/demo/standard.md b/src/components/PageHeader/demo/standard.md
index 41c5d892dc88178969038e5dad7f387d7af03bb1..478182197aade67f140b4ce6b8d01ce1396832db 100644
--- a/src/components/PageHeader/demo/standard.md
+++ b/src/components/PageHeader/demo/standard.md
@@ -19,13 +19,14 @@ const menu = (
const action = (
-
-
+
+
+
);
diff --git a/src/components/PageHeader/index.less b/src/components/PageHeader/index.less
index 6f84a1c1d4728932ac810c9d4a07d5b6a638c101..ce2329d149567b5d45e79b8826ad8695702e73bb 100644
--- a/src/components/PageHeader/index.less
+++ b/src/components/PageHeader/index.less
@@ -2,7 +2,7 @@
.pageHeader {
background: @component-background;
- padding: 18px 28px 0 36px;
+ padding: 16px 32px 0 32px;
border-bottom: @border-width-base @border-style-base @border-color-split;
.detail {
@@ -14,7 +14,7 @@
}
.breadcrumb {
- margin-bottom: 18px;
+ margin-bottom: 16px;
}
.tabs {
@@ -42,6 +42,17 @@
.action {
margin-left: 56px;
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 {
@@ -107,7 +118,7 @@
.pageHeader {
.action {
:global {
- .ant-btn-group, :not(.ant-btn-group) .ant-button {
+ .ant-btn-group, :not(.ant-btn-group) .ant-btn {
display: block;
margin-bottom: 8px;
}
diff --git a/src/routes/Profile/AdvancedProfile.js b/src/routes/Profile/AdvancedProfile.js
index eba10d476a0653e19176a25b94bfdc615cf04057..6a82ef0c531f3a8a3aa1ce7415a539e8ec2c718b 100644
--- a/src/routes/Profile/AdvancedProfile.js
+++ b/src/routes/Profile/AdvancedProfile.js
@@ -7,7 +7,6 @@ import EditableItem from '../../components/EditableItem';
import styles from './AdvancedProfile.less';
const { Step } = Steps;
-const ButtonGroup = Button.Group;
const { Description } = DescriptionList;
const menu = (
@@ -20,15 +19,13 @@ const menu = (
const action = (
-
-
-
-
-
-
-
+
+
+
+
+
);
@@ -66,9 +63,10 @@ const tabList = [{
}];
const desc1 = (
-
-
- 曲丽丽
+
+
+ 曲丽丽
+
2016-12-12 12:32
@@ -76,8 +74,9 @@ const desc1 = (
const desc2 = (
-
@@ -89,12 +88,12 @@ const popoverContent = (
-
耗时:2小时25分钟
+
耗时:2小时25分钟
);
const customDot = (dot, { status }) => (status === 'process' ?
-
+
{dot}
: dot
diff --git a/src/routes/Profile/AdvancedProfile.less b/src/routes/Profile/AdvancedProfile.less
index f33e342fce6eb4b886b22a186f6a1a400bae7f4a..6c8a2ab56f7a88097742bc426bf9a4529327246b 100644
--- a/src/routes/Profile/AdvancedProfile.less
+++ b/src/routes/Profile/AdvancedProfile.less
@@ -23,5 +23,5 @@
border: 0;
border-top: 1px solid @border-color-split;
height: 1px;
- margin: 0 0 24px 0;
+ margin: 0 0 16px 0;
}
diff --git a/src/routes/Profile/BasicProfile.js b/src/routes/Profile/BasicProfile.js
index 7e98c32b65bb078c0fdf3d6616a98eb089d68b2c..1e76f9a723d827ad2f38b053485bfa0d68c282a0 100644
--- a/src/routes/Profile/BasicProfile.js
+++ b/src/routes/Profile/BasicProfile.js
@@ -99,11 +99,13 @@ export default class BasicProfile extends Component {
title: '单价',
dataIndex: 'price',
key: 'price',
+ className: 'col-money',
render: renderContent,
}, {
title: '数量(件)',
dataIndex: 'num',
key: 'num',
+ className: 'col-money',
render: (text, row, index) => {
if (index < basicGoods.length) {
return text;
@@ -114,6 +116,7 @@ export default class BasicProfile extends Component {
title: '金额',
dataIndex: 'amount',
key: 'amount',
+ className: 'col-money',
render: (text, row, index) => {
if (index < basicGoods.length) {
return text;
@@ -124,19 +127,19 @@ export default class BasicProfile extends Component {
return (
-
+
1000000000
已取货
1234123421
3214321432
-
+
付小小
18100000000
菜鸟仓储
浙江省杭州市西湖区万塘路18号
- 没啥
+ 无
退货商品
@@ -150,7 +153,7 @@ export default class BasicProfile extends Component {
/>
退货进度