diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 791110b0b..94319a819 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -95,7 +95,8 @@ class NewHeader extends Component { }); - + //获取游览器地址 + window.sessionStorage.setItem("yslgeturls",JSON.stringify(window.location.href)) } diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index 2e506af50..1377298a9 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -9,6 +9,7 @@ import passoff from '../../../src/images/login/passoff.png'; import axios from 'axios'; import CheckInputysl1 from './CheckInputysl'; import CheckInputysl2 from './CheckInputysl'; +import Notcompletedysl from './Notcompletedysl'; import './common.css' import './commontwo.css' const { TabPane } = Tabs; @@ -63,6 +64,7 @@ class LoginRegisterComponent extends Component { Phonenumberisnotcobool: false, Whethertoverify:false, pciphone:true, + MyEduCoderModals:false, } } @@ -98,6 +100,7 @@ class LoginRegisterComponent extends Component { Phonenumberisnotcodmm:undefined, Whethertoverify:false, pciphone:true, + MyEduCoderModals:false, } } @@ -350,7 +353,11 @@ class LoginRegisterComponent extends Component { this.setState({ isRender: false }) - window.location.href = "/" + var weekArray = JSON.parse(window.sessionStorage.getItem('yslgeturls')); + if(weekArray===undefined){ + weekArray="/"; + } + window.location.href = weekArray; } } @@ -458,7 +465,7 @@ class LoginRegisterComponent extends Component { passwords: "", Agreetotheterms: "", }) - this.props.history.push("/interesse"); + this.setMyEduCoderModals(); } } }).catch((error) => { @@ -870,7 +877,18 @@ class LoginRegisterComponent extends Component { return false; } - } + }; + setNotcompleteds=()=>{ + this.setState({ + Notcompleteds:true, + MyEduCoderModals:false + }) + }; + setMyEduCoderModals=()=>{ + this.setState({ + MyEduCoderModals:true + }) + }; render() { const { // 登录 @@ -1020,6 +1038,11 @@ class LoginRegisterComponent extends Component { :
} + {this.setNotcompleteds()}} + /> + { Whethertoverify===false&&pciphone===true?