From 90c935f68c8d1e80e25591504060bc4a7dc3415c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 22 Jun 2019 18:39:39 +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

---
 .../tasks/GraduationTasksSubmitedit.js        | 10 +-
 .../src/modules/user/FindPasswordComponent.js | 66 +++++++------
 .../modules/user/LoginRegisterComponent.js    | 96 ++++++++++++-------
 public/react/src/modules/user/common.css      |  6 +-
 4 files changed, 112 insertions(+), 66 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index cad289855..97eebc59e 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -650,10 +650,12 @@ class GraduationTasksSubmitedit extends Component{
                             height: '30px',
                             display:item.user_name===undefined?"none":""
                           }}>
-                            <div className={"fl ml5"} style={{width: '50px'}}>{item.user_name}</div>
-                            <div className={"fl ml40 color-grey-9"}>{item.group_name}</div>
-                            <div className={"fl ml40 color-grey-9"}>{item.student_id}</div>
-                            {key>0?<div className={"fr"}><i className={"iconfont icon-shanchudiao fl "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
+														<Tooltip placement="bottom" title={item.user_name}>
+															<div className={"fl ml5 fonthidden width87"} style={{width: '50px'}}>{item.user_name}</div>
+														</Tooltip>
+                            <div className={"fl ml5 fonthidden width87 color-grey-9"}>{item.group_name}</div>
+                            <div className={"fl ml5 color-grey-9 fonthidden width87"}>{item.student_id}</div>
+                            {key>0?<div className={"fl ml20"}><i className={"iconfont icon-shanchudiao fl "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
                           </div>
                         )
                       })}
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index 8dea3e521..ae2b427d8 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -329,8 +329,17 @@ class LoginRegisterComponent extends Component {
                 color: #05101A;
                 line-height: 69px;
               }
+								.loginInputzhuche{
+									width: 100%;
+									background-color: #fff!important;
+									height: 45px !important;
+									padding: 5px;
+
+								}
           `}</style>
 
+
+
                 <div className="login_section">
                     <div className="section_header">
                         找回密码
@@ -340,32 +349,33 @@ class LoginRegisterComponent extends Component {
                             {
                                 `
                                 .ant-input {
-    font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    position: relative;
-    display: inline-block;
-    padding: 4px 11px;
-    width: 100%;
-    height: 38px;
-    font-size: 14px;
-    line-height: 1.5;
-    color: rgba(0, 0, 0, 0.65);
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #d9d9d9;
-    border-radius: 4px;
-    -webkit-transition: all .3s;
-    -o-transition: all .3s;
-    transition: all .3s;
-}
-                                `
+																		font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
+																		-webkit-box-sizing: border-box;
+																		box-sizing: border-box;
+																		margin: 0;
+																		padding: 0;
+																		list-style: none;
+																		position: relative;
+																		display: inline-block;
+																		padding: 4px 11px;
+																		width: 100%;
+																		height: 38px;
+																		font-size: 14px;
+																		line-height: 1.5;
+																		color: rgba(0, 0, 0, 0.65);
+																		background-color: #fff;
+																		background-image: none;
+																		border: 1px solid #d9d9d9;
+																		border-radius: 4px;
+																		-webkit-transition: all .3s;
+																		-o-transition: all .3s;
+																		transition: all .3s;
+																}
+																	`
                             }
                         </style>
                         <Input style={loginInputsyl} type="text" autoComplete="off" onClick={this.changeTypey}
+															 className={"loginInputzhuche"}
                                placeholder="输入注册手机号或邮箱" value={this.state.login} onBlur={(e) => this.inputOnBlur(e)}
                                onChange={this.loginInputonChange} style={{marginTop: '10px',height: "38px"}}></Input>
                         {
@@ -381,16 +391,18 @@ class LoginRegisterComponent extends Component {
                             dragOkCallback={this.dragOkCallback}
                         ></DragValidator>
                         <Input type={classpass}
+															 className={"loginInputzhuche"}
                                onClick={this.changeType} autoComplete="new-password"  onChange={this.loginInputonChanges}
                                value={this.state.password}   style={{width:"100%",height:"38px",marginTop:'25px'}}  placeholder="输入8~16位密码，区分大小写"></Input>
                         <Input  type={classpass}
+																className={"loginInputzhuche"}
                                onClick={this.changeType} autoComplete="new-password"
                                onChange={this.loginInputonChangess} value={this.state.passwords}
                                style={{height:"38px",marginTop:'25px',width:"100%"}}
                                placeholder="再次输入新密码"></Input>
 
                         <div className={"mt25"}>
-                            <Input className="fl mr5" type="text" autoComplete="off" style={{
+                            <Input className="fl mr5 loginInputzhuche" type="text" autoComplete="off" style={{
                                 width: "210px",
                                 height: "38px",
                             }} placeholder="请输入验证码"
@@ -401,16 +413,16 @@ class LoginRegisterComponent extends Component {
                             {
                                 getverificationcodes === undefined ?
                                     <Button className="fl ml5 " disabled
-                                            style={{"width": "120px", "text-align": "center", "height": "38px",}}
+                                            style={{"width": "120px", "text-align": "center", "height": "45px",}}
                                             size={"large"}>重新发送{seconds}s</Button>
                                     : getverificationcodes === true ?
                                     <Button className="fl ml5 "
-                                            style={{"width": "120px", "text-align": "center", "height": "38px"}}
+                                            style={{"width": "120px", "text-align": "center", "height": "45px"}}
                                             type="primary"
                                             onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
                                     :
                                     <Button className="fl ml5 "
-                                            style={{"width": "120px", "text-align": "center", "height": "38px"}}
+                                            style={{"width": "120px", "text-align": "center", "height": "45px"}}
                                             type="primary"
                                             onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
                             }
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 5627890ee..587d77375 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -563,36 +563,45 @@ class LoginRegisterComponent extends Component {
                             <style>
                                 {
                                     `
-                                .ant-input {
-    font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    position: relative;
-    display: inline-block;
-    padding: 4px 11px;
-    width: 100%;
-    height: 38px;
-    font-size: 14px;
-    line-height: 1.5;
-    color: rgba(0, 0, 0, 0.65);
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #d9d9d9;
-    border-radius: 4px;
-    -webkit-transition: all .3s;
-    -o-transition: all .3s;
-    transition: all .3s;
-}
+														.ant-input {
+																		font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
+																		-webkit-box-sizing: border-box;
+																		box-sizing: border-box;
+																		margin: 0;
+																		padding: 0;
+																		list-style: none;
+																		position: relative;
+																		display: inline-block;
+																		padding: 4px 11px;
+																		width: 100%;
+																		height: 38px;
+																		font-size: 14px;
+																		line-height: 1.5;
+																		color: rgba(0, 0, 0, 0.65);
+																		background-color: #fff;
+																		background-image: none;
+																		border: 1px solid #d9d9d9;
+																		border-radius: 4px;
+																		-webkit-transition: all .3s;
+																		-o-transition: all .3s;
+																		transition: all .3s;
+																}
+														  .loginInputzhuche{
+																	width: 100%;
+																	background-color: #fff!important;
+																	height: 45px !important;
+																	padding: 5px;
+
+																}
+
                                 `
                                 }
                             </style>
+
                             <Input placeholder="请输入登录手机号码或邮箱" value={this.state.login}
                                    onChange={this.loginInputonChange}
                                    name="username"
-                                   className="font-14 color-grey-9 loginInput"
+                                   className="font-14 color-grey-9 loginInputzhuche"
                                    onBlur={(e) => this.inputOnBlur(e, 1)}
                                    style={{marginTop: '30px', height: '38px'}}></Input>
 
@@ -606,7 +615,7 @@ class LoginRegisterComponent extends Component {
 
                             <Input type="password" name="password" id="password"   value={this.state.password}
                                    onChange={this.passwordonChange}
-                                   className="font-14 color-grey-9 loginInput"
+                                   className="font-14 color-grey-9 loginInputzhuche"
 
                                    placeholder="密码"></Input>
 
@@ -621,10 +630,33 @@ class LoginRegisterComponent extends Component {
                                     size={"large"}>登录</Button>
                         </div>
                     }
+									<style>
+										{
+											`
+											.loginInputzhuche{
+													width: 100%;
+													background-color: #fff!important;
+													height: 45px !important;
+													padding: 5px;
+
+												}
+										 .loginInputzhuche .ant-input{
+													width: 100%;
+													background-color: #fff!important;
+													height: 45px !important;
+													padding: 5px;
+													position: relative;
+													right: 5px;
+													width: 103%;
+												}
+												`
+										}
+									</style>
+
                     {
                         parseInt(tab[0])==1 &&
                         <div style={{width: '340px'}}>
-                            <Input className="loginInputsyl color-grey-9 loginInput" placeholder="请使用手机号/邮箱账号进行注册"
+                            <Input className="loginInputsyl color-grey-9 loginInputzhuche" placeholder="请使用手机号/邮箱账号进行注册"
                                    value={this.state.logins}
                                    type="text" autoComplete="off"
                                    onChange={this.loginInputonChanges}
@@ -646,7 +678,7 @@ class LoginRegisterComponent extends Component {
                             ></DragValidator>
 
                             <div className="mt25">
-                                <Input className="fl mr5 font-14 color-grey-9" name="codes" type="text" autoComplete="off" readonly
+                                <Input className="fl mr5 font-14 color-grey-9 loginInputzhuche" name="codes" type="text" autoComplete="off" readonly
                                        onfocus="this.removeAttribute('readonly')" style={{
                                     width:'210px',
                                     height:'38px',
@@ -657,13 +689,13 @@ class LoginRegisterComponent extends Component {
                                 </Input>
                                 {
                                     getverificationcodes === undefined ?
-                                        <Button className="fl ml5 font-14" disabled style={{"width": "120px","text-align":"center", "height": "38px",}}
+                                        <Button className="fl ml5 font-14" disabled style={{"width": "120px","text-align":"center", "height": "45px",}}
                                                 size={"large"}>重新发送{seconds}s</Button>
                                         : getverificationcodes === true ?
-                                        <Button className="fl ml5 font-14" type="primary" style={{"width": "120px","text-align":"center", "height": "38px",}}
+                                        <Button className="fl ml5 font-14" type="primary" style={{"width": "120px","text-align":"center", "height": "45px",}}
                                                 onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
                                         :
-                                        <Button className="fl ml5 font-14 " type="primary" style={{"width": "120px","text-align":"center", "height": "38px",}}
+                                        <Button className="fl ml5 font-14 " type="primary" style={{"width": "120px","text-align":"center", "height": "45px",}}
                                                 onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
                                 }
 
@@ -673,13 +705,13 @@ 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"}}/>*/}
-                            <Input className="loginInput  font-14 mt25  color-grey-9" placeholder="输入8~16位密码，区分大小写"
+                            <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={
-                                <img src={passopens} onClick={(key) => this.Showandhide(key)}>
+                                <img className={"mt5"} src={passopens} onClick={(key) => this.Showandhide(key)}>
                                 </img>
                             }></Input>
                             <Checkbox onChange={this.onChange}
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index 2fd37604d..762738f70 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -29,11 +29,11 @@
   .loginInput {
     width: 100%;
     margin-bottom: 16px;
-    background-color: #fff!important;
-      height: 45px;
-      padding: 5px;
+    height: 45px;
   }
 
+
+
   .left_right {
     width: 100%;
     display: flex;