m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复

Browse Source
dev_forum
ysl 6 years ago
parent 683161b1ec
commit c73857c4a9
4 changed files with 513 additions and 471 deletions
Show Stats Download Patch File Download Diff File

3
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
Unescape View File

@ -84,6 +84,7 @@ class GraduationTasksSubmitnew extends Component{
handleSubmit=(e) => {
let {fileList,selectmemberslist,workslist}=this.state;
let userids=[];
@ -432,6 +433,8 @@ render(){
let graduation_id=workslist===undefined?"":workslist.graduation_id;
let task_id=workslist===undefined?"":workslist.task_id;
return(
<React.Fragment>

40
public/react/src/modules/login/EducoderLogin.js
Unescape View File

@ -60,21 +60,27 @@ class EducoderLogin extends Component {
if( props.match.url === "/changepassword" ){
this.state = {
showbool: false,
logini:3,
}
}else {
if(props.match.url === "/login"){
this.state = {
showbool: true,
loginstatus:true
loginstatus:true,
logini:1,
}
}else if(props.match.url === "/register"){
this.state = {
showbool: true,
loginstatus:false,
logini:2,
}
}else{
this.state = {
showbool: true,
logini:1,
}
}
@ -86,6 +92,14 @@ class EducoderLogin extends Component {
}
Setlogins=(i)=>{
console.log("96ye");
console.log(i)
this.setState({
logini:i
})
}
Setshowbool = () => {
if (this.state.showbool === true) {
@ -102,7 +116,7 @@ class EducoderLogin extends Component {
render() {
let {showbool} = this.state;
let {showbool,loginstatus,logini} = this.state;
return (
<div style={newContainer} >
<style>
@ -135,14 +149,12 @@ class EducoderLogin extends Component {
"align-items": "center",
"width": "100%",
}}>
<div style={{"margin-top": "40px"}}>
<div style={{"margin-top": "40px","height":"500px"}}>
<LoginRegisterComponent {...this.props} {...this.state}
Setshowbool={this.Setshowbool}></LoginRegisterComponent>
<div style={{"width":"100%","height":"350px"}}>
Setshowbool={this.Setshowbool} Setlogins={this.Setlogins}></LoginRegisterComponent>
</div>
</div>
</div>
:
<div style={{
@ -151,17 +163,23 @@ class EducoderLogin extends Component {
"align-items": "center",
"width": "100%",
}}>
<div style={{"margin-top": "40px"}}>
<div style={{"margin-top": "40px","height":"500px"}}>
<FindPasswordComponent {...this.props} {...this.state}
Setshowbool={this.Setshowbool}></FindPasswordComponent>
<div style={{"width":"100%","height":"250px"}}>
</div>
</div>
</div>
}
<div style={{"height":"250px",
"display": "flex",
"justify-content": "center",
"align-items": "center",
"width": "100%",
}}>
<div className="font-14 color-grey-9 " style={{marginTop:"15px"}}>© 2019 EduCoder湘ICP备17009477号Trustie & IntelliDE inside.</div>
</div>
</div>
</div>
)

36
public/react/src/modules/user/FindPasswordComponent.js
Unescape View File

@ -57,8 +57,8 @@ class LoginRegisterComponent extends Component {
}
//倒计时
getverificationcode = () => {
if (this.state.Phonenumberisnotcobool === false) {
if (this.state.login.length === 0) {
if (this.state.Phonenumberisnotcobool === false ||this.state.Phonenumberisnotcobool === undefined) {
if (this.state.login&&this.state.login.length === 0) {
this.openNotification("请输入手机号或邮箱");
return
} else {
@ -311,7 +311,7 @@ class LoginRegisterComponent extends Component {
// height: 346px;
return (
<div className="login_register_content">
<div className="login_register_content" style={{height: "482px"}}>
<Input type="text" name="username" value={"namename"}
style={{height: '0', width: '0', border: 'none', display: "none"}}/>
<Input type="password" name="password" id="password" value={"123123123"}
@ -324,9 +324,9 @@ class LoginRegisterComponent extends Component {
width: 100%;
text-align: center;
border-bottom: 1px solid rgb(234, 234, 234);
height: 72px;
height: 69px;
color: #05101A;
line-height: 73px;
line-height: 69px;
}
`}</style>
@ -366,31 +366,32 @@ class LoginRegisterComponent extends Component {
</style>
<Input style={loginInputsyl} type="text" autoComplete="off" onClick={this.changeTypey}
placeholder="输入注册手机号或邮箱" value={this.state.login} onBlur={(e) => this.inputOnBlur(e)}
onChange={this.loginInputonChange} style={{marginTop: '10px'}}></Input>
onChange={this.loginInputonChange} style={{marginTop: '10px',height: "38px"}}></Input>
{
Phonenumberisnotco && Phonenumberisnotco != "" ?
<p className="color-red mt5 mb5" style={{width: " 100%", height: "20px"}}>
<span>{Phonenumberisnotco}</span>
</p>
: <div className="mt10 mb10"></div>
: <div style={{height: "25px"}}></div>
}
<DragValidator
height={38} className="loginInput" successGreenColor="#45E15F"
height={38} successGreenColor="#45E15F"
style={{height:"38px",width:"100%"}}
dragOkCallback={this.dragOkCallback}
></DragValidator>
<Input className="loginInput mb20" type={classpass}
onClick={this.changeType} autoComplete="new-password" onChange={this.loginInputonChanges}
value={this.state.password} placeholder="输入8~16位密码，区分大小写"></Input>
<Input className="loginInput mb20" type={classpass}
<Input type={classpass}
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}
onClick={this.changeType} autoComplete="new-password"
onChange={this.loginInputonChangess} value={this.state.passwords}
style={{height:"38px",marginTop:'25px',width:"100%"}}
placeholder="再次输入新密码"></Input>
<div>
<div className={"mt25"}>
<Input className="fl mr5" type="text" autoComplete="off" style={{
"width": "210px",
"margin-bottom": "16px",
"height": "38px",
width: "210px",
height: "38px",
}} placeholder="请输入验证码"
onChange={this.codesonChange}
value={codes}
@ -405,7 +406,7 @@ class LoginRegisterComponent extends Component {
<Button className="fl ml5 "
style={{"width": "120px", "text-align": "center", "height": "38px"}}
type="primary"
onClick={() => this.getverificationcode()} size={"large"}>验证码</Button>
onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
:
<Button className="fl ml5 "
style={{"width": "120px", "text-align": "center", "height": "38px"}}
@ -417,6 +418,7 @@ class LoginRegisterComponent extends Component {
</div>
<Button className="login_btn" size={"large"} type="primary"
style={{height:"46px"}}
onClick={this.Retrievepassword}>完成</Button>
</div>
</div>

81
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -10,8 +10,12 @@ import axios from 'axios';
import './common.css'
const { TabPane } = Tabs;
const loginInputsyl = {
"width": " 100%",
"height": "40px",
"width":"434px",
"height": "462px",
"-webkit-box-shadow": "3px 10px 21px 0px rgba(76,76,76,0.15)",
"box-shadow": "3px 10px 21px 0px rgba(76,76,76,0.15)",
"border-radius": "6px",
"background": "#fff"
}
//父组件EducoderLogin.js
@ -135,6 +139,7 @@ class LoginRegisterComponent extends Component {
;
StudyMakeMoney = () => { // 调用父组件方法
this.props.Setshowbool();
// this.props.Setlogins(3);
this.setState({
login: "",
password: "",
@ -407,8 +412,9 @@ class LoginRegisterComponent extends Component {
//倒计时
getverificationcode = () => {
if (this.state.Phonenumberisnotcobool === false) {
if (this.state.logins.length === 0) {
debugger
if (this.state.Phonenumberisnotcobool === false ||this.state.Phonenumberisnotcobool === undefined) {
if (this.state.logins&&this.state.logins.length === 0) {
this.openNotification("请输入手机号或邮箱",2);
return
}else {
@ -503,6 +509,13 @@ class LoginRegisterComponent extends Component {
this.setState({
tab:e.key
})
// console.log(e.key);
// if(e.key === 0){
// this.props.Setlogins(1);
// }else{
// this.props.Setlogins(2);
//
// }
// this.props.history.push(`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/student_exercise_list?tab=`+e.key)
@ -532,7 +545,7 @@ class LoginRegisterComponent extends Component {
// console.log(activeKey);
return (
<div className="login_register_content">
<div className="login_register_content" style={ parseInt(tab[0])==0?{height: "346px"} :{height: "462px"}}>
<div>
@ -576,62 +589,65 @@ class LoginRegisterComponent extends Component {
<Input placeholder="请输入登录手机号码或邮箱" value={this.state.login}
onChange={this.loginInputonChange}
name="username"
style={{marginTop: '30px'}}></Input>
className="font-14 color-grey-9"
style={{marginTop: '30px', height: '38px'}}></Input>
{
Phonenumberisnotco && Phonenumberisnotco != "" ?
<p className="color-red mt5 mb5" style={{width: " 100%", height: "20px"}}>
<span>{Phonenumberisnotco}</span>
</p>
: <div className="mt15 mb15"></div>
: <div style={{height:"25px"}}></div>
}
<Input type="password" name="password" id="password" className="loginInput" value={this.state.password}
<Input type="password" name="password" id="password" value={this.state.password}
onChange={this.passwordonChange}
className="font-14 color-grey-9 loginInput"
placeholder="密码"></Input>
<div className="left_right mt20">
<div className="left_right mt25 font-12 " style={{color: '#676767'}}>
<Checkbox onChange={this.onAutoLoginChange} checked={autoLogin}>下次自动登录</Checkbox>
<a
onClick={this.StudyMakeMoney}
className="mr3 color-grey-9">找回密码</a>
<a onClick={this.StudyMakeMoney}
className="mr3 color-grey-9 mt3 font-12">找回密码</a>
</div>
<Button className="login_btn" type="primary" onClick={() => this.postLogin()}
<Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}
size={"large"}>登录</Button>
</div>
}
{
parseInt(tab[0])==1 &&
<div style={{width: '340px'}}>
<Input className={loginInputsyl} placeholder="请使用手机号/邮箱账号进行注册"
<Input className="loginInputsyl color-grey-9" placeholder="请使用手机号/邮箱账号进行注册"
value={this.state.logins}
type="text" autoComplete="off"
onChange={this.loginInputonChanges}
onBlur={(e) => this.inputOnBlur(e, 2)}
style={{marginTop: '30px'}}></Input>
style={{marginTop: '30px' , height: '38px',color:'#999999',fontSize:"14px"}}></Input>
{
Phonenumberisnotcos && Phonenumberisnotcos != "" ?
<p className="color-red mt5 mb5 " style={{width: " 100%", height: "20px"}}>
<p className="color-red mt5 mb5 " style={{width: " 100%", height: "20px"}}>
{/*<span className="fl">{Phonenumberisnotcos}</span>*/}
<span className="fl">{Phonenumberisnotcos}</span>
<span className="fl" style={{textAlign:"center",width: " 100%"}}>请输入手机号码</span>
</p>
: <div className=" mt15 mb15"></div>
: <div style={{height:"25px"}}></div>
}
<DragValidator
height={38} className="loginInput" successGreenColor="#45E15F"
style={{ height: '38px'}}
dragOkCallback={this.dragOkCallback}
></DragValidator>
<div>
<Input className="fl mr5" name="codes" type="text" autoComplete="off" readonly
<div className="mt25">
<Input className="fl mr5 font-14 color-grey-9" name="codes" type="text" autoComplete="off" readonly
onfocus="this.removeAttribute('readonly')" style={{
"width": "210px",
"margin-bottom": "16px",
"height": "38px",
width:'210px',
height:'38px',
}} placeholder="请输入验证码"
onChange={this.codesonChange}
value={codes}
@ -639,13 +655,13 @@ class LoginRegisterComponent extends Component {
</Input>
{
getverificationcodes === undefined ?
<Button className="fl ml5 " disabled style={{"width": "120px","text-align":"center", "height": "38px",}}
<Button className="fl ml5 font-14" disabled style={{"width": "120px","text-align":"center", "height": "38px",}}
size={"large"}>重新发送{seconds}s</Button>
: getverificationcodes === true ?
<Button className="fl ml5 " type="primary" style={{"width": "120px","text-align":"center", "height": "38px",}}
onClick={() => this.getverificationcode()} size={"large"}>验证码</Button>
<Button className="fl ml5 font-14" type="primary" style={{"width": "120px","text-align":"center", "height": "38px",}}
onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
:
<Button className="fl ml5 " 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": "38px",}}
onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
}
@ -655,8 +671,9 @@ 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" placeholder="输入8~16位密码，区分大小写"
<Input className="loginInput font-14 mt25 color-grey-9" placeholder="输入8~16位密码，区分大小写"
type={classpass}
autoComplete="new-password"
onClick={this.changeType}
value={this.state.passwords} onChange={this.passwordonChanges} suffix={
@ -665,9 +682,11 @@ class LoginRegisterComponent extends Component {
}></Input>
<Checkbox onChange={this.onChange}
value={Agreetotheterms}
>我已阅读并同意服务协议条款</Checkbox>
<Button className="login_btn" type="primary" onClick={() => this.postregistered()}
size={"large"}>完成</Button>
><span className="font-14 " style={{
color: '#676767',
}}>我已阅读并同意服务协议条款</span></Checkbox>
<Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postregistered()}
size={"large"}>注册</Button>
</div>

Write Preview
Loading…
Cancel
Save