From 281746e02f9a3f918718251752f6a816b48a220d Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 26 Oct 2017 19:51:08 +0800
Subject: [PATCH] Fix form style

---
 src/routes/Forms/AdvancedForm.js     | 5 ++---
 src/routes/Forms/StepForm/Step1.js   | 2 +-
 src/routes/Forms/StepForm/style.less | 6 +++---
 src/routes/Forms/style.less          | 9 ---------
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/routes/Forms/AdvancedForm.js b/src/routes/Forms/AdvancedForm.js
index ab8b4c82..ce450fd8 100644
--- a/src/routes/Forms/AdvancedForm.js
+++ b/src/routes/Forms/AdvancedForm.js
@@ -222,16 +222,15 @@ function AdvancedForm({ form, dispatch, submitting }) {
                 )}
               </Form.Item>
             </Col>
-            <Col id="timepicker-container" xl={{ span: 6, offset: 2 }} lg={{ span: 8 }} md={{ span: 12 }} sm={24}>
+            <Col xl={{ span: 6, offset: 2 }} lg={{ span: 8 }} md={{ span: 12 }} sm={24}>
               <Form.Item label={fieldLabels.dateRange2}>
                 {getFieldDecorator('dateRange2', {
                   rules: [{ required: true, message: '请输入' }],
                 })(
                   <TimePicker
-                    popupClassName={styles.popup}
                     placeholder="提醒时间"
                     style={{ width: '100%' }}
-                    getPopupContainer={() => document.getElementById('timepicker-container')}
+                    getPopupContainer={trigger => trigger.parentNode}
                   />
                 )}
               </Form.Item>
diff --git a/src/routes/Forms/StepForm/Step1.js b/src/routes/Forms/StepForm/Step1.js
index d5703341..c12110eb 100644
--- a/src/routes/Forms/StepForm/Step1.js
+++ b/src/routes/Forms/StepForm/Step1.js
@@ -41,7 +41,7 @@ export default ({ formItemLayout, form, dispatch }) => {
           <Input.Group compact>
             <Select defaultValue="alipay" style={{ width: 80 }}>
               <Option value="alipay">支付宝</Option>
-              <Option value="wepay">微信</Option>
+              <Option value="bank">银行账户</Option>
             </Select>
             {getFieldDecorator('receiverAccount', {
               initialValue: 'test@example.com',
diff --git a/src/routes/Forms/StepForm/style.less b/src/routes/Forms/StepForm/style.less
index 4217da6c..c97e6026 100644
--- a/src/routes/Forms/StepForm/style.less
+++ b/src/routes/Forms/StepForm/style.less
@@ -22,6 +22,8 @@
 }
 
 .desc {
+  padding: 0 56px;
+  color: @text-color-secondary;
   h3 {
     font-size: 16px;
     margin: 0 0 12px 0;
@@ -39,8 +41,6 @@
     margin-bottom: 12px;
     line-height: 22px;
   }
-  padding: 0 48px;
-  color: @text-color-secondary;
 }
 
 @media screen and (max-width: @screen-md) {
@@ -57,7 +57,7 @@
     }
   }
   .label {
-    font-weight: 500;
+    color: @heading-color;
     text-align: right;
     padding-right: 8px;
   }
diff --git a/src/routes/Forms/style.less b/src/routes/Forms/style.less
index 9a05bf4f..722aca80 100644
--- a/src/routes/Forms/style.less
+++ b/src/routes/Forms/style.less
@@ -88,12 +88,3 @@
   color: @text-color-secondary;
   font-style: normal;
 }
-
-.popup {
-  width: ~"calc(100% - 16px)";
-  :global {
-    .ant-time-picker-panel-select {
-      width: 33.33%;
-    }
-  }
-}
-- 
GitLab