From 10bf79843d182aec02e51a686fe7457bcbd0ce5d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 29 Jun 2020 16:32:39 +0800 Subject: [PATCH 01/14] bug --- src/forge/Component/Component.scss | 2 +- src/forge/Component/layout.jsx | 34 +++++++++-- src/forge/Merge/NewMerge.js | 4 +- src/forge/Newfile/index.css | 2 +- src/forge/Order/order.js | 52 +++++++++++----- src/forge/Settings/Collaborator.js | 2 +- src/forge/Settings/setting.scss | 7 +++ src/forge/Team/Group/GroupDetailSetting.jsx | 39 +++++++----- src/forge/Team/Group/SettingCommon.jsx | 67 +++++++++++++++++++++ src/forge/Team/Index.scss | 17 ++++++ src/forge/Team/Sub/Detail.jsx | 6 +- 11 files changed, 186 insertions(+), 46 deletions(-) create mode 100644 src/forge/Team/Group/SettingCommon.jsx diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index 1040f54d..b39e0952 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -14,7 +14,7 @@ li.ant-menu-item{ align-items: center; padding:20px 34px; background-color: #fff; - margin:18px 0px; + margin-bottom:18px; .img{ margin-right: 20px; width: 190px; diff --git a/src/forge/Component/layout.jsx b/src/forge/Component/layout.jsx index 6d4e2365..64b4b377 100644 --- a/src/forge/Component/layout.jsx +++ b/src/forge/Component/layout.jsx @@ -48,8 +48,8 @@ export const WhiteBack = styled.div`{ border-radius:5px; }` export const Blueline = styled.a`{ - height:32px; - line-height:30px; + height:30px; + line-height:28px; border-radius:2px; border:1px solid rgba(80,145,255,1); color:rgba(80,145,255,1); @@ -57,8 +57,8 @@ export const Blueline = styled.a`{ display:inline-block; }` export const Redline = styled.a`{ - height:32px; - line-height:32px; + height:30px; + line-height:28px; border-radius:2px; border:1px solid #F73030; color:#F73030; @@ -68,8 +68,8 @@ export const Redline = styled.a`{ text-align:center; }` export const Greenline = styled.a`{ - height:32px; - line-height:32px; + height:30px; + line-height:28px; border-radius:2px; border:1px solid #28BD6C; color:#28BD6C; @@ -78,6 +78,28 @@ export const Greenline = styled.a`{ min-width:80px; text-align:center; }` +export const Greenback = styled.a`{ + height:30px; + line-height:30px; + border-radius:2px; + background-color:#28BD6C; + color:#fff; + padding:0px 12px; + display:inline-block; + min-width:80px; + text-align:center; +}` +export const Redback = styled.a`{ + height:30px; + line-height:30px; + border-radius:2px; + background-color:#F73030; + color:#fff; + padding:0px 12px; + display:inline-block; + min-width:80px; + text-align:center; +}` export const NumUl = styled.ul`{ padding-left: 20px; & > li{ diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 6e8ad7f3..b11a7f02 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -163,7 +163,7 @@ class NewMerge extends Component { {show_message ? ( -