ws2z3gr2017 7 år sedan
förälder
incheckning
469e3a467f
5 ändrade filer med 7238 tillägg och 33 borttagningar
  1. 2 1
      css/sign.less
  2. 16 16
      js/component/sign/account.jsx
  3. 2 1
      js/component/sign/group.less
  4. 15 15
      js/component/sign/groupAccount.jsx
  5. 7203 0
      package-lock.json

+ 2 - 1
css/sign.less

@@ -34,4 +34,5 @@
             background: #fff;
         }
     }
-}
+}
+.group{margin-top: 0;}

+ 16 - 16
js/component/sign/account.jsx

@@ -174,6 +174,21 @@ const LoginContent = Form.create()(React.createClass({
             <div className="account-content clearfix">
                 <Spin spinning={this.state.loading} >
                     <Form className="account-left" horizontal onSubmit={this.handleSubmit}>
+                    	 <FormItem
+                            {...formItemLayout}
+                            label="手机号码"
+                            extra={<span><Icon type="exclamation-circle" /> 请输入正确的手机号码</span>}
+                            hasFeedback
+                        >
+                            {getFieldDecorator('phone', {
+                                rules: [{ required: true, message: '请输入手机号码!' },
+                                {
+                                    validator: this.checkPhone,
+                                }],
+                            })(
+                                <Input size="large" />
+                                )}
+                        </FormItem>
                         <FormItem
                             {...formItemLayout}
                             label="密码"
@@ -205,22 +220,7 @@ const LoginContent = Form.create()(React.createClass({
                             })(
                                 <Input type="password" />
                                 )}
-                        </FormItem>
-                        <FormItem
-                            {...formItemLayout}
-                            label="手机号码"
-                            extra={<span><Icon type="exclamation-circle" /> 请输入正确的手机号码</span>}
-                            hasFeedback
-                        >
-                            {getFieldDecorator('phone', {
-                                rules: [{ required: true, message: '请输入手机号码!' },
-                                {
-                                    validator: this.checkPhone,
-                                }],
-                            })(
-                                <Input size="large" />
-                                )}
-                        </FormItem>
+                        </FormItem>                       
                         <FormItem
                             {...formItemLayout}
                             label="验证码"

+ 2 - 1
js/component/sign/group.less

@@ -1,6 +1,7 @@
 .group {
-    margin: 50px 210px 0;
+    margin: 0px 210px 0;
     height: 680px;
+    padding-top: 50px;
     .account-left {
         width: 540px;
         .acc-getVcode {

+ 15 - 15
js/component/sign/groupAccount.jsx

@@ -167,6 +167,20 @@ const Group = Form.create()(React.createClass({
             <div className="group clearfix">
                 <Spin spinning={this.state.loading} >
                     <Form className="account-left" horizontal onSubmit={this.handleSubmit}>
+	                     <FormItem
+	                            {...formItemLayout}
+	                            label="手机号码"
+	                            hasFeedback
+	                            extra={<span><Icon type="exclamation-circle" /> 请输入正确的手机号码</span>}
+	                        >
+	                            {getFieldDecorator('phone', {
+	                                rules: [{ required: true, message: '请输入手机号码!' }, {
+	                                    validator: this.checkPhone,
+	                                }],
+	                            })(
+	                                <Input size="large" />
+	                                )}
+	                    </FormItem>
                         <FormItem
                             {...formItemLayout}
                             label="密码"
@@ -197,21 +211,7 @@ const Group = Form.create()(React.createClass({
                             })(
                                 <Input type="password" />
                                 )}
-                        </FormItem>
-                        <FormItem
-                            {...formItemLayout}
-                            label="手机号码"
-                            hasFeedback
-                            extra={<span><Icon type="exclamation-circle" /> 请输入正确的手机号码</span>}
-                        >
-                            {getFieldDecorator('phone', {
-                                rules: [{ required: true, message: '请输入手机号码!' }, {
-                                    validator: this.checkPhone,
-                                }],
-                            })(
-                                <Input size="large" />
-                                )}
-                        </FormItem>
+                        </FormItem>                       
                         <FormItem
                             {...formItemLayout}
                             label="验证码"

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 7203 - 0
package-lock.json