addloginbtn

Author: lisong

src/components/Login/Login.js

@@ -49,14 +49,15 @@ class Login extends Component {
           <h1>登录</h1>
           <div className={s.formGroup}>
             <label className={s.label} htmlFor="usernameOrEmail">
-              请输入用户名/邮箱地址:
+              请输入邮箱地址:
             </label>
             <input
               className={s.input}
               onChange={this.setInputAccount}
               id="usernameOrEmail"
               type="text"
               value={this.props.account}
+              placeholder="请输入邮箱地址"
               autoFocus
             />
           </div>
@@ -70,6 +71,7 @@ class Login extends Component {
               id="password"
               type="password"
               value={this.props.password}
+              placeholder="请输入登录密码"
             />
           </div>
           <div className={s.formGroup}>

src/components/Register/Register.js

@@ -28,8 +28,8 @@ class Register extends Component {
     //-----
     isSubmitStepThree: PropTypes.bool,
     password: PropTypes.string,
-    passwordInputChange: PropTypes.string,
-    passwordConfirm: PropTypes.func,
+    passwordInputChange: PropTypes.func,
+    passwordConfirm: PropTypes.string,
     passwordConfirmInputChange: PropTypes.func,
     submitStepThree: PropTypes.func,
   };

src/components/Register/StepOne/StepOne.css

@@ -49,3 +49,13 @@
 .errorTip {
   color: red;
 }
+
+.loginBtn {
+  margin-top: 40px;
+  width: 100%;
+  text-align: center;
+}
+.loginBtn a {
+  text-decoration: none;
+  color: #3CB371;
+}

src/components/Register/StepOne/StepOne.js

@@ -3,6 +3,7 @@ import _ from 'lodash';
 import withStyles from 'isomorphic-style-loader/lib/withStyles';
 import s from './StepOne.css';
 import Button from '../../Button';
+import Link from '../../Link';
 import validator from 'validator';
 
 class StepOne extends Component {
@@ -64,6 +65,11 @@ class StepOne extends Component {
                 self.props.submit();
               }}/>
           </div>
+          <div className={s.loginBtn}>
+            <Link to="/login">
+              已有帐号
+            </Link>
+          </div>
         </div>
       </div>
     );