From cacd4319da0f5eae088d6841d6f2428c57e5e6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 15 Jul 2019 15:14:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                 |  6 +++---
 .../react/src/modules/login/EducoderLogin.js  | 15 ++++++++-------
 .../modules/user/LoginRegisterComponent.js    | 19 ++-----------------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 8ef347e32..f7a6615db 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -146,9 +146,9 @@ export function initAxiosInterceptors(props) {
         }
 
         if (response.data.status === 402) {
-          // debugger
-          // console.log(response.data.status);
-          // console.log(response.data.url);
+          debugger
+          console.log(response.data.status);
+          console.log(response.data);
           locationurl(response.data.message);
         }
 
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index c062578d7..008d1717e 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -62,6 +62,7 @@ var newContainer={
     bottom: "0px",
      minHeight: "100%",
     overflow:"hidden",
+    paddingTop: "40px",
 
 }
 class EducoderLogin extends Component {
@@ -87,7 +88,7 @@ class EducoderLogin extends Component {
             }else if(props.match.url === "/register"){
                 // showbool: 1,
                   this.state = {
-                    showbool: 1,
+                    showbool: 2,
                     loginstatus:false,
                     logini:2,
                     namezh:"",
@@ -141,7 +142,7 @@ class EducoderLogin extends Component {
     render() {
         let {showbool,loginstatus,logini} = this.state;
         return (
-            <div style={newContainer} className="newMain clearfix" >
+            <div style={newContainer} className=" clearfix" >
 
                 <div >
                     <div style={{
@@ -163,9 +164,9 @@ class EducoderLogin extends Component {
                                 justifyContent: "center",
                                 width: "100%",
                                 height: "550px",
-                                marginTop: "54px",
+                                marginTop: "44px",
                             }}>
-                                <div style={{}}>
+                                <div>
 
                                     <LoginRegisterComponent {...this.props} {...this.state}
                                                             Setshowbool={(e,name,pass)=>this.Setshowbool(e,name,pass)} ></LoginRegisterComponent>
@@ -179,7 +180,7 @@ class EducoderLogin extends Component {
                               justifyContent: "center",
                               width: "100%",
                               height: "630px",
-                              marginTop: "54px",
+                              marginTop: "44px",
                           }}>
                               <InterestpageComponent {...this.props} {...this.state}>
                               </InterestpageComponent>
@@ -190,7 +191,7 @@ class EducoderLogin extends Component {
                               justifyContent: "center",
                               width: "100%",
                               height: "550px",
-                              marginTop: "54px",
+                              marginTop: "44px",
                           }}>
                               <div >
                                   <FindPasswordComponent {...this.props} {...this.state}
@@ -207,7 +208,7 @@ class EducoderLogin extends Component {
                         position: "fixed"
 
                     }}>
-                        <div className="font-14 color-grey-9 " style={{  bottom:"0",position: "fixed",marginBottom: "59px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+                        <div className="font-14 color-grey-9 " style={{  bottom:"0",position: "absolute",marginBottom: "20px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
                     </div>
                 </div>
             </div>
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 3aba8259d..8b2e6e546 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -116,23 +116,6 @@ class LoginRegisterComponent extends Component {
                 console.log('Notification Clicked!');
             },
         });
-        // if(type === 1){
-        //     notification['success']({
-        //         message: "提示",
-        //         description: messge,
-        //     });
-        // }else if(type === 2){
-        //     notification['warning']({
-        //         message: "提示",
-        //         description: messge,
-        //     });
-        //
-        // }else{
-        //     notification['error']({
-        //         message: "提示",
-        //         description: messge,
-        //     });
-        // }
     }
 
 
@@ -464,6 +447,8 @@ class LoginRegisterComponent extends Component {
             this.SMSverification();
         }
     }
+    //滑动验证手机号
+
     //获取登入
     loginInputonChange = (e) => {
         // console.log(e.target.value);