From aab5375f3b045ac54d6f2d55434a7f5def731ba1 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 12:46:58 +0800
Subject: [PATCH] b

---
 .../react/src/modules/login/EducoderLogin.js  | 78 ++++++++++---------
 .../modules/user/LoginRegisterComponent.js    |  4 +-
 public/react/src/modules/user/common.css      |  1 -
 3 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index b46435fe7..116a98c6a 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -43,17 +43,26 @@ var imgback = {
     backgroundImage: `url(${beijintulogontwo})`,
 }
 var imgmian ={
-    "width": "100%",
-     "background": `url(${beijintulogontwo})`,
-     "height": "100%",
-     "position": "relative",
+     width: "100%",
+     background: `url(${beijintulogontwo})`,
+     position: "relative",
+
 }
 
 var newContainer={
-   "min-height": "100%",
-    "background": `url(${beijintulogontwo})`,
-    "height": "auto !important",
-     "position": "relative",
+    background: `url(${beijintulogontwo})`,
+    backgroundPosition: "center" ,
+    backgroundRepeat: "no-repeat",
+    backgroundAttachment: "fixed",
+    backgroundSize: "100% 100%",
+    height:" 100%",
+    width:" 100%",
+    position: "absolute",
+    top: "0px",
+    bottom: "0px",
+     minHeight: "100%",
+    overflow:"hidden",
+
 }
 class EducoderLogin extends Component {
     constructor(props) {
@@ -76,7 +85,8 @@ class EducoderLogin extends Component {
 
                 }
             }else if(props.match.url === "/register"){
-                this.state = {
+                // showbool: 1,
+                  this.state = {
                     showbool: 1,
                     loginstatus:false,
                     logini:2,
@@ -131,24 +141,16 @@ class EducoderLogin extends Component {
     render() {
         let {showbool,loginstatus,logini} = this.state;
         return (
-            <div style={newContainer} >
-                <style>
-                    {
-                        `
-                        html, body, {
-  height: 100%;
-}
-                        `
-                    }
-                </style>
-                <div style={imgmian}>
+            <div style={newContainer} className="newMain clearfix" >
+
+                <div >
                     <div style={{
                         "display": "flex",
                         "justify-content": "center",
                         "align-items": "center",
                         "width": "100%"
                     }}>
-                        <div style={{"margin-top": "20px"}}>
+                        <div >
                             <img src={educodernet}/>
                         </div>
 
@@ -157,12 +159,13 @@ class EducoderLogin extends Component {
                     {
                         showbool === 1 ?
                             <div style={{
-                                "display": "flex",
-                                "justify-content": "center",
-                                "align-items": "center",
-                                "width": "100%",
+                                display: "flex",
+                                justifyContent: "center",
+                                width: "100%",
+                                height: "550px",
+                                marginTop: "54px",
                             }}>
-                                <div style={{"margin-top": "40px","height":"580px"}}>
+                                <div style={{}}>
 
                                     <LoginRegisterComponent {...this.props} {...this.state}
                                                             Setshowbool={(e,name,pass)=>this.Setshowbool(e,name,pass)} ></LoginRegisterComponent>
@@ -172,29 +175,31 @@ class EducoderLogin extends Component {
                             </div>
                         :showbool === 2 ?
                           <div style={{
-                              "display": "flex",
-                              "justify-content": "center",
-                              "align-items": "center",
-                              "width": "100%",
+                              display: "flex",
+                              justifyContent: "center",
+                              width: "100%",
+                              height: "630px",
+                              marginTop: "54px",
                           }}>
                               <InterestpageComponent {...this.props} {...this.state}>
                               </InterestpageComponent>
                           </div>
                         :
                           <div style={{
-                              "display": "flex",
-                              "justify-content": "center",
-                              "align-items": "center",
-                              "width": "100%",
+                              display: "flex",
+                              justifyContent: "center",
+                              width: "100%",
+                              height: "550px",
+                              marginTop: "54px",
                           }}>
-                              <div style={{"margin-top": "40px","height":"580px"}}>
+                              <div >
                                   <FindPasswordComponent {...this.props} {...this.state}
                                                          Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
 
                               </div>
                           </div>
                     }
-                    <div style={{"height":"125px",
+                    <div style={{
                         "display": "flex",
                         "justify-content": "center",
                         "align-items": "center",
@@ -202,7 +207,6 @@ class EducoderLogin extends Component {
                     }}>
                         <div className="font-14 color-grey-9 " style={{marginTop:"15px"}}><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 style={{"height":"100px"}}></div>
                 </div>
             </div>
         )
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 5b8fc025b..3aba8259d 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -593,8 +593,8 @@ class LoginRegisterComponent extends Component {
 
                 <div>
                     <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
-                        <Menu.Item key="0" className="font-18"  style={{color:"#05101A"}}> 登录</Menu.Item>
-                        <Menu.Item key="1" className="font-18"  style={{color:"#05101A"}}>注册</Menu.Item>
+                        <Menu.Item key="0" className={tab===0?"active font-18":"font-18"}   > 登录</Menu.Item>
+                        <Menu.Item key="1" className={tab===1?"active font-18":"font-18"}  >注册</Menu.Item>
                     </Menu>
 
                     {
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index d60f59ef0..949fd8def 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -101,7 +101,6 @@
   }
   .ysllogin_register_contents{
     display: flex;
-    margin-top: 30px;
     justify-content: center;
     box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
     border-radius:6px;