Merge remote-tracking branch 'origin/bww-v1' into wxl-guide

src/pages/login/index.js

@@ -231,7 +231,7 @@ class LoginForm extends React.Component {
                   </Form>
                   <div className={LoginStyles.registerbox}>
                     <div className={LoginStyles.noaccount}>还没有账号？</div>
-                    <Link className={LoginStyles.goregister} to="/newregister" target="_blank">去注册</Link>
+                    <Link className={LoginStyles.goregister} to="/register" target="_blank">去注册</Link>
                     {/* <div className={LoginStyles.goregister} onClick={this.goRegister}>去注册</div> */}
                   </div>
                 </div>}

src/router.js

@@ -297,9 +297,8 @@ function RouterConfig({ history }) {
           <Route path="/resetpsd" exact component={ResetPsd} />
           <Route path="/" exact render={() => (<Redirect to="/login" />)} />
           <Route path="/login" exact component={Login} />
-          <Route path="/register" exact component={Register} />
+          <Route path="/register" exact component={NewRegister} />
           <Route path="/rechargedesc" exact component={RechargeDesc} />
-          <Route path="/newregister" exact component={NewRegister} />
           <Route path="/deploySchool" exact component={DeploySchool} />
           <Route path="/404" render={() => (<Errorpage />)} />
         </Switch>