diff --git a/src/modules/user/FindPasswordComponent.js b/src/modules/user/FindPasswordComponent.js
index 85f0285a8..c753c66e8 100644
--- a/src/modules/user/FindPasswordComponent.js
+++ b/src/modules/user/FindPasswordComponent.js
@@ -699,7 +699,7 @@ class LoginRegisterComponent extends Component {
{/*onBlur={(e) => this.inputOnBlur(e)}*/}
this.inputOnBlurzhuche(e)}
onChange={this.loginInputonChange} style={{marginTop: '10px', height: "38px"}}>
{
diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js
index 8dc05405e..41b674337 100644
--- a/src/modules/user/LoginRegisterComponent.js
+++ b/src/modules/user/LoginRegisterComponent.js
@@ -7,6 +7,7 @@ import axios from 'axios';
import CheckInputysl1 from './CheckInputysl';
import CheckInputysl2 from './CheckInputysl';
import Notcompletedysl from './Notcompletedysl';
+import Educoder from '../login/educoder.png';
import './common.css'
import './commontwo.css'
const { TabPane } = Tabs;
@@ -64,8 +65,8 @@ class LoginRegisterComponent extends Component {
MyEduCoderModals:false,
registered:undefined,
Phonenumberisnotcodmms:undefined,
- weixinlogin:false,
- qqlogin:false
+ weixinlogin:false,
+ qqlogin:false
}
}
if(props.loginstatus === false){
@@ -103,8 +104,8 @@ class LoginRegisterComponent extends Component {
MyEduCoderModals:false,
registered:undefined,
Phonenumberisnotcodmms:undefined,
- weixinlogin:false,
- qqlogin:false
+ weixinlogin:false,
+ qqlogin:false
}
}
}
@@ -128,25 +129,25 @@ class LoginRegisterComponent extends Component {
changeType = () => {
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
- })
+ let flag = this.IsPC(); //true为PC端，false为手机端
+ this.setState({
+ isphone:flag
+ })
// console.log("componentDidUpdate");
// console.log(this.props);
let pcipns=this.IsPC();
@@ -921,33 +922,33 @@ class LoginRegisterComponent extends Component {
})
};
- openweixinlogin=()=>{
- this.setState({
- weixinlogin:true
- })
- }
- hideweixinlogin=()=>{
- this.setState({
- weixinlogin:false,
- qqlogin:false,
+ openweixinlogin=()=>{
+ this.setState({
+ weixinlogin:true
+ })
+ }
+ hideweixinlogin=()=>{
+ this.setState({
+ weixinlogin:false,
+ qqlogin:false,
tab:["0"]
- })
- }
+ })
+ }
- openqqlogin=()=>{
- this.setState({
- qqlogin:true
- })
- //window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code`
- window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
- // window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code`
- }
+ openqqlogin=()=>{
+ this.setState({
+ qqlogin:true
+ })
+ //window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code`
+ window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
+ // window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code`
+ }
- openphoneqqlogin=()=>{
- window.open(
- `https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
- )
- }
+ openphoneqqlogin=()=>{
+ window.open(
+ `https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
+ )
+ }
render() {
const {
// 登录
@@ -972,7 +973,7 @@ class LoginRegisterComponent extends Component {
readAgreement,
pciphone,
Phonenumberisnotcodmms,
- weixinlogin
+ weixinlogin
} = this.state
// height: 346px;
if (this.state.seconds === 0) {
@@ -983,8 +984,8 @@ class LoginRegisterComponent extends Component {
return (
+ // style={ parseInt(tab[0])==0?{height: "366px"} :{height: "510px"}}
+ >
- {weixinlogin===false&&this.props.weixinlogin===undefined?
}
- {weixinlogin===true?
:""}
- {weixinlogin===true?
- this.hideweixinlogin()}>返回登录注册
-
:""}
+ {weixinlogin===true?
:""}
+ {weixinlogin===true?
+ this.hideweixinlogin()}>返回登录注册
+
:""}
@@ -1310,3 +1282,4 @@ class LoginRegisterComponent extends Component {
}
export default (LoginRegisterComponent);
+
diff --git a/src/modules/user/usersInfo/Infos.js b/src/modules/user/usersInfo/Infos.js
index 759a9b71b..cd1cb76bd 100644
--- a/src/modules/user/usersInfo/Infos.js
+++ b/src/modules/user/usersInfo/Infos.js
@@ -239,63 +239,63 @@ class Infos extends Component {
{/* --------------------------------------------------------------------- */}
{/* 题库 */}
-