diff --git a/src/modules/login/EducoderLogin.js b/src/modules/login/EducoderLogin.js
index 578c260cd..59e6cc628 100644
--- a/src/modules/login/EducoderLogin.js
+++ b/src/modules/login/EducoderLogin.js
@@ -137,9 +137,9 @@ class EducoderLogin extends Component {
{this.props.mygetHelmetapi === null ? ""
:
this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined?
- this.gohome()} src={educodernet}/>
+
this.gohome()} src={educodernet} width="80px"/>
:
-
this.gohome()} src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
+
this.gohome()} width="80px" src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
}
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index 441975249..f00088a90 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -1,13 +1,7 @@
import React, { Component } from 'react';
-import { Redirect } from 'react-router';
+import Dialog from 'material-ui/Dialog';
+import { notification } from 'antd';
-import Dialog, {
- DialogActions,
- DialogContent,
- DialogContentText,
- DialogTitle,
-} from 'material-ui/Dialog';
-import { notification, Modal } from 'antd';
import axios from 'axios';
diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js
index db369458b..c2c01df75 100644
--- a/src/modules/user/LoginRegisterComponent.js
+++ b/src/modules/user/LoginRegisterComponent.js
@@ -1,6 +1,6 @@
-import React, {Component} from 'react';
-import {setmiyah,broadcastChannelPostMessage} from 'educoder';
-import {Tabs, Input, Checkbox, Button, notification,Menu} from 'antd';
+import React, { Component } from 'react';
+import { setmiyah, broadcastChannelPostMessage } from 'educoder';
+import { Tabs, Input, Checkbox, Button, notification, Menu } from 'antd';
import passopen from '../../../src/images/login/passopen.png';
import passoff from '../../../src/images/login/passoff.png';
import axios from 'axios';
@@ -11,7 +11,7 @@ import './common.css'
import './commontwo.css'
const { TabPane } = Tabs;
const loginInputsyl = {
- "width":"434px",
+ "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)",
@@ -24,15 +24,9 @@ class LoginRegisterComponent extends Component {
constructor(props) {
super(props)
-
- //
- // console.log("LoginRegisterComponent");
- // console.log("29");
- // console.log(props.loginstatus);
- if(props.loginstatus === true){
- // console.log(props.loginstatus);
+ if (props.loginstatus === true) {
this.state = {
- tab:["0"],
+ tab: ["0"],
classpass: "text",
// 登录
passopens: passoff,
@@ -53,25 +47,25 @@ class LoginRegisterComponent extends Component {
codes: "",
Phonenumberisnotco: undefined,
Phonenumberisnotcos: undefined,
- Phonenumberisnotcosyzm:undefined,
- Phonenumberisnotcosymmm:undefined,
- Phonenumberisnotcosytdhk:undefined,
- Phonenumberisnotcosyfwtk:undefined,
- Phonenumberisnotcodmm:undefined,
+ Phonenumberisnotcosyzm: undefined,
+ Phonenumberisnotcosymmm: undefined,
+ Phonenumberisnotcosytdhk: undefined,
+ Phonenumberisnotcosyfwtk: undefined,
+ Phonenumberisnotcodmm: undefined,
Phonenumberisnotcobool: false,
- Whethertoverify:false,
- pciphone:true,
- MyEduCoderModals:false,
- registered:undefined,
- Phonenumberisnotcodmms:undefined,
- weixinlogin:false,
- qqlogin:false
+ Whethertoverify: false,
+ pciphone: true,
+ MyEduCoderModals: false,
+ registered: undefined,
+ Phonenumberisnotcodmms: undefined,
+ weixinlogin: false,
+ qqlogin: false
}
}
- if(props.loginstatus === false){
+ if (props.loginstatus === false) {
// console.log(props.loginstatus);
this.state = {
- tab:["1"],
+ tab: ["1"],
classpass: "text",
// 登录
passopens: passoff,
@@ -92,25 +86,25 @@ class LoginRegisterComponent extends Component {
codes: "",
Phonenumberisnotco: undefined,
Phonenumberisnotcos: undefined,
- Phonenumberisnotcosyzm:undefined,
- Phonenumberisnotcosymmm:undefined,
- Phonenumberisnotcosytdhk:undefined,
- Phonenumberisnotcosyfwtk:undefined,
+ Phonenumberisnotcosyzm: undefined,
+ Phonenumberisnotcosymmm: undefined,
+ Phonenumberisnotcosytdhk: undefined,
+ Phonenumberisnotcosyfwtk: undefined,
Phonenumberisnotcobool: false,
- Phonenumberisnotcodmm:undefined,
- Whethertoverify:false,
- pciphone:true,
- MyEduCoderModals:false,
- registered:undefined,
- Phonenumberisnotcodmms:undefined,
- weixinlogin:false,
- qqlogin:false
+ Phonenumberisnotcodmm: undefined,
+ Whethertoverify: false,
+ pciphone: true,
+ MyEduCoderModals: false,
+ registered: undefined,
+ Phonenumberisnotcodmms: undefined,
+ weixinlogin: false,
+ qqlogin: false
}
}
}
//判断是否是手机端
- IsPC=()=> {
+ IsPC = () => {
var userAgentInfo = navigator.userAgent;
var Agents = ["Android", "iPhone",
"SymbianOS", "Windows Phone",
@@ -124,58 +118,48 @@ class LoginRegisterComponent extends Component {
}
return flag;
}
-// 点击表单后,改变type
+ // 点击表单后,改变type
changeType = () => {
- this.setState({classpass: 'password'});
+ this.setState({ classpass: 'password' });
+ }
+ IsPC = () => {
+ var userAgentInfo = navigator.userAgent;
+ var Agents = ["Android", "iPhone",
+ "SymbianOS", "Windows Phone",
+ "iPad", "iPod"];
+ var flag = true;
+ for (var v = 0; v < Agents.length; v++) {
+ if (userAgentInfo.indexOf(Agents[v]) > 0) {
+ flag = false;
+ break;
+ }
+ }
+ return flag;
}
- IsPC=()=>{
- var userAgentInfo = navigator.userAgent;
- var Agents = ["Android", "iPhone",
- "SymbianOS", "Windows Phone",
- "iPad", "iPod"];
- var flag = true;
- for (var v = 0; v < Agents.length; v++) {
- if (userAgentInfo.indexOf(Agents[v]) > 0) {
- flag = false;
- break;
- }
- }
- return flag;
- }
componentDidMount = () => {
- let flag = this.IsPC(); //true为PC端,false为手机端
- this.setState({
- isphone:flag
- })
- // console.log("componentDidUpdate");
- // console.log(this.props);
- let pcipns=this.IsPC();
+ let flag = this.IsPC(); //true为PC端,false为手机端
+ this.setState({
+ isphone: flag
+ })
+ let pcipns = this.IsPC();
if (this.props.match.url === "/login") {
- // this.state = {
- // tab:["0"],
- //
- // }
this.setState({
- tab:["0"]
+ tab: ["0"]
})
} else if (this.props.match.url === "/register") {
- // this.state = {
- // tab:["1"],
- //
- // }
this.setState({
- tab:["1"]
+ tab: ["1"]
})
}
this.setState({
- pciphone:pcipns,
+ pciphone: pcipns,
})
}
- openNotification = (messge,type) => {
+ openNotification = (messge, type) => {
// type 1 成功提示绿色 2提醒颜色黄色 3错误提示红色
notification.open({
message: "提示",
@@ -209,7 +193,7 @@ class LoginRegisterComponent extends Component {
});
try {
this.props.Setshowbool(3);
- }catch (e) {
+ } catch (e) {
}
}
@@ -219,7 +203,7 @@ class LoginRegisterComponent extends Component {
// -------------------- LOGIN START
//下次自动登入
onAutoLoginChange = (e) => {
- this.setState({autoLogin: e.target.checked})
+ this.setState({ autoLogin: e.target.checked })
}
// -------------------- LOGIN END
@@ -248,19 +232,19 @@ class LoginRegisterComponent extends Component {
}
// -------------------- REGISTER START
onReadAgreementChange = (e) => {
- this.setState({readAgreement: e.target.checked})
+ this.setState({ readAgreement: e.target.checked })
}
//是否验证通过
dragOkCallback = () => {
this.setState({
- Phonenumberisnotcosytdhk:undefined,
+ Phonenumberisnotcosytdhk: undefined,
})
if (this.state.logins.length === 0) {
this.setState({
- Phonenumberisnotcos:"账号不能为空",
+ Phonenumberisnotcos: "账号不能为空",
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
@@ -278,14 +262,14 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
})
} else {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
});
this.Emailphonenumberverification(this.state.logins, 2);
return
@@ -301,8 +285,8 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotcos: stringdata,
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
});
@@ -312,14 +296,14 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
})
this.Emailphonenumberverification(this.state.logins, 2);
return
}
this.setState({
- Phonenumberisnotcosytdhk:undefined,
+ Phonenumberisnotcosytdhk: undefined,
})
this.Emailphonenumberverification(this.state.logins, 2)
@@ -338,12 +322,12 @@ class LoginRegisterComponent extends Component {
if (this.state.login === undefined || this.state.login == "") {
this.setState({
- Phonenumberisnotco:"账号不能为空",
+ Phonenumberisnotco: "账号不能为空",
})
return
} else if (this.state.password === undefined || this.state.password == "") {
this.setState({
- Phonenumberisnotcodmm:"密码不能为空",
+ Phonenumberisnotcodmm: "密码不能为空",
})
return
}
@@ -357,38 +341,38 @@ class LoginRegisterComponent extends Component {
return
}
- if(response.data.status === -2){
- if(response.data.message==="该手机号尚未注册" || response.data.message==="该邮箱尚未注册"){
+ if (response.data.status === -2) {
+ if (response.data.message === "该手机号尚未注册" || response.data.message === "该邮箱尚未注册") {
this.setState({
- Phonenumberisnotco:response.data.message,
+ Phonenumberisnotco: response.data.message,
})
return;
}
- else if(response.data.message==="错误的账号或密码"){
+ else if (response.data.message === "错误的账号或密码") {
this.setState({
- Phonenumberisnotcodmms:response.data.message,
+ Phonenumberisnotcodmms: response.data.message,
})
return;
}
- else if(response.data.message==="违反平台使用规范,账号已被锁定"){
+ else if (response.data.message === "违反平台使用规范,账号已被锁定") {
this.setState({
- Phonenumberisnotco:response.data.message,
+ Phonenumberisnotco: response.data.message,
})
return;
} else if (response.data.message === "登录密码出错已达上限,账号已被锁定, 请10分钟后重新登录或找回密码") {
const messge = (
-
- {Phonenumberisnotco} -
- : - } - - this.postLogin()} - className={Phonenumberisnotcodmm && Phonenumberisnotcodmm !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"} - placeholder="密码"> - { - Phonenumberisnotcodmm && Phonenumberisnotcodmm != "" ? -- {Phonenumberisnotcodmm} -
- : (Phonenumberisnotcodmms=== undefined?:"") - } - { - Phonenumberisnotcodmms && Phonenumberisnotcodmms != "" ? -- {Phonenumberisnotcodmms} -
- : "" - } - - - - - {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?- - ———————— 快速登录 ———————— -
- :- ———————— 快速登录 ———————— -
- :""} -- {Phonenumberisnotcos} -
- : - - } - {this.state.MyEduCoderModals===true?- {Phonenumberisnotcosytdhk} -
- : - - ) - :"" - } -- {Phonenumberisnotcosyzm} -
- : - - } -- {Phonenumberisnotcosymmm} + } + ` + } + + this.Showandhide(key)}> + + }> + { + Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ? +
+ {Phonenumberisnotcosymmm}
- : + : - } - {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?- - ———————— 快速登录 ———————— -
- :- ———————— 快速登录 ———————— -
- :"" - } -