diff --git a/src/components/Result/demo/classic.md b/src/components/Result/demo/classic.md index 9d371a2f652e0efea0f9b872ae09e71493ab8c87..3988d95888d87a7af16d5c0cff0071361529c7c9 100644 --- a/src/components/Result/demo/classic.md +++ b/src/components/Result/demo/classic.md @@ -12,28 +12,41 @@ import { Button, Row, Col, Icon, Steps } from 'antd'; const { Step } = Steps; const desc1 = ( -
-
曲丽丽
+
+
+ 曲丽丽 +
2016-12-12 12:32
); const desc2 = ( -
-
周毛毛
+
+
+ 周毛毛 +
催一下
); const extra = (
-
+
项目名称
- - 项目 ID:23421 - 负责人:曲丽丽 - 生效时间:2016-12-12 ~ 2017-12-12 + + + 项目 ID: + 23421 + + + 负责人: + 曲丽丽 + + + 生效时间: + 2016-12-12 ~ 2017-12-12 + @@ -59,6 +72,7 @@ ReactDOM.render( description="提交结果页用于反馈一系列操作任务的处理结果,如果仅是简单操作,使用 Message 全局提示反馈即可。本文字区域可以展示简单的补充说明,如果有类似展示“单据”的需求,下面这个灰色区域可以呈现比较复杂的内容。" extra={extra} actions={actions} + style={{ width: '100%' }} /> , mountNode); ```` diff --git a/src/components/Result/demo/error.md b/src/components/Result/demo/error.md index d6f3a0e3d4bb883c950f433c62951413db15d2a7..d668b8b1a4acf60b7ee15bbcb5d8a4c8cb335be3 100644 --- a/src/components/Result/demo/error.md +++ b/src/components/Result/demo/error.md @@ -11,16 +11,16 @@ import { Button, Icon } from 'antd'; const extra = (
-
+
您提交的内容有如下错误:
-
- 您的账户已被冻结 - 立即解冻 +
+ 您的账户已被冻结 + 立即解冻
- 您的账户还不具备申请资格 - 立即升级 + 您的账户还不具备申请资格 + 立即升级
); diff --git a/src/components/Result/index.less b/src/components/Result/index.less index 68652a9ebea4c0b103d68ff7f00d6ba4c89cb5a9..661b4af1b7862a8259c091e0163dfed81c249581 100644 --- a/src/components/Result/index.less +++ b/src/components/Result/index.less @@ -34,8 +34,8 @@ } .extra { - background: rgba(245, 245, 245, 0.5); - padding: 16px 40px; + background: #fafafa; + padding: 24px 40px; margin-top: 24px; border-radius: @border-radius-sm; text-align: left; diff --git a/src/routes/Result/Error.js b/src/routes/Result/Error.js index 371d4e3b83db32f2892d2772d0c497742ae45db7..f633c34080b481451232fe4fb03592cca2906f82 100644 --- a/src/routes/Result/Error.js +++ b/src/routes/Result/Error.js @@ -5,16 +5,16 @@ import PageHeaderLayout from '../../layouts/PageHeaderLayout'; const extra = (
-
+
您提交的内容有如下错误:
-
+
您的账户已被冻结 - 立即解冻 + 立即解冻
您的账户还不具备申请资格 - 立即升级 + 立即升级
); @@ -30,7 +30,7 @@ export default () => ( description="请核对并修改以下信息后,再重新提交。" extra={extra} actions={actions} - style={{ marginTop: 30, marginBottom: 30 }} + style={{ marginTop: 48, marginBottom: 16 }} /> diff --git a/src/routes/Result/Success.js b/src/routes/Result/Success.js index 2e461460802f12bf4f4911a2c77d20d7338ffa1c..75a2e2f6b875df875ad49debca794dc1ccc77f00 100644 --- a/src/routes/Result/Success.js +++ b/src/routes/Result/Success.js @@ -6,8 +6,8 @@ import PageHeaderLayout from '../../layouts/PageHeaderLayout'; const { Step } = Steps; const desc1 = ( -
-
+
+
曲丽丽
2016-12-12 12:32
@@ -15,8 +15,8 @@ const desc1 = ( ); const desc2 = ( -
-
+
+
周毛毛
@@ -25,13 +25,22 @@ const desc2 = ( const extra = (
-
+
项目名称
- - 项目 ID:23421 - 负责人:曲丽丽 - 生效时间:2016-12-12 ~ 2017-12-12 + + + 项目 ID: + 23421 + + + 负责人: + 曲丽丽 + + + 生效时间: + 2016-12-12 ~ 2017-12-12 + @@ -62,7 +71,7 @@ export default () => ( “单据”的需求,下面这个灰色区域可以呈现比较复杂的内容。" extra={extra} actions={actions} - style={{ marginTop: 30, marginBottom: 30 }} + style={{ marginTop: 48, marginBottom: 16 }} />