Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/login/EducoderInteresse.js

@@ -59,8 +59,8 @@ class EducoderInteresse extends Component {
 								display: "flex",
 								justifyContent: "center",
 								width: "100%",
-								height: "630px",
-								marginTop: "44px",
+								height: "600px",
+								marginTop: "20px",
 							}}>
 								<InterestpageComponent {...this.props} {...this.state}>
 								</InterestpageComponent>

public/react/src/modules/user/Interestpage.js

@@ -226,7 +226,7 @@ class InterestpageComponent extends Component {
 		// height: 346px;
 		return (
 
-			<div className="ysllogin_register_contents" style={{width:"800px",height: "620px"}}>
+			<div className="ysllogin_register_contents" style={{width:"800px",height: "600px"}}>
 
 				<div className="ysllogin_section">
 					<div className="mt15"><span className="yslspans1">请选择你的职业</span></div>
@@ -244,7 +244,7 @@ class InterestpageComponent extends Component {
 						<div className="ysldivhomedivimg"><img src={zyrs1} className="ysldivhomedivimg"/></div>
           </div>
 					</div>
-					<div className="mt5"><span className="yslspans2">选择你可能感兴趣的内容</span></div>
+					<div><span className="yslspans2">选择你可能感兴趣的内容</span></div>
 
 					<div ><span className="yslspans3">基于你关注的内容推荐</span></div>
 					<div className="ysldivhome2">
@@ -259,9 +259,8 @@ class InterestpageComponent extends Component {
 								)
 							})}
 					</div>
-					<Button className="yslbutton" size={"large"} type="primary"onClick={()=>this.Interestcompletionpage()} style={{width:"255px",height: "36px",background: "#4CACFF"} }>完成</Button>
-
-					</div>
+					<Button className="yslbutton" size={"large"} type="primary"onClick={()=>this.Interestcompletionpage()} style={{width:"255px",height: "36px",background: "#4CACFF",marginTop: "30px"} }>完成</Button>
+				</div>
 
 			</div>
 		);

public/react/src/modules/user/LoginRegisterComponent.js

@@ -730,12 +730,23 @@ class LoginRegisterComponent extends Component {
                             {/*       style={{height: '0', width: '0', border: 'none', display: "none"}}/>*/}
                             {/*<Input type="password" name="password" id="password" autoComplete="new-password"*/}
                             {/*       style={{height: '0', width: '0', border: 'none', display: "none"}}/>*/}
+                            <style>
+                                {
+                                    `
+                                    .ant-input-affix-wrapper .ant-input-suffix {
+                                        right: 12px;
+                                        height: 20px;
+                                    }
+                                    `
+                                }
+                            </style>
                             <Input className="loginInput  font-14 mt25  color-grey-9 loginInputzhuche" placeholder="输入8~16位密码，区分大小写"
                                    type={classpass}
 
                                    autoComplete="new-password"
                                    onClick={this.changeType}
-                                   value={this.state.passwords} onChange={this.passwordonChanges} suffix={
+                                   value={this.state.passwords} onChange={this.passwordonChanges}
+                                suffix={
                                 <img className={"mt5"} src={passopens} onClick={(key) => this.Showandhide(key)}>
                                 </img>
                             }></Input>

public/react/src/modules/user/common.css

@@ -58,7 +58,6 @@
     display: flex;
     flex-flow: row wrap;
     align-content:stretch;
-    margin-top: 10px;
   }
   .ysldivhomediv{
     width: 101px;
@@ -90,14 +89,14 @@
   .ysldivhomedivtxt{
     width:101px;
     height:27px;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
     font-size: 14px;
     text-align: center;
 
   }
   .ysldivhomedivimg{
-    width: 101px;
-    height: 101px;
+    width: 90px;
+    height: 90px;
   }
   .ysllogin_register_contents{
     display: flex;
@@ -108,7 +107,7 @@
   }
   .ysllogin_section {
     width:800px;
-    height: 620px;
+    height: 600px;
     display: flex;
     align-items: center;
     flex-direction: column;
@@ -131,8 +130,8 @@
   .yslbutton{
     width:255px;
     height: 36px;
-    margin-top:30px;
-    margin-bottom: 19px;
+    margin-top: 20px;
+
   }
   .mt22{
     margin-top: 22px;