调整

public/react/src/App.js

@@ -209,7 +209,7 @@ const UsersInfo = Loadable({
 
 // 兴趣页面
 const Interestpage = Loadable({
-	loader: () => import('./modules/user/Interestpage'),
+	loader: () => import('./modules/login/EducoderInteresse'),
 	loading: Loading,
 })
 
@@ -301,7 +301,10 @@ class App extends Component {
 							<Route
 								path="/changepassword" component={EducoderLogin}
 							/>
+              <Route
+							  path="/interesse" component={Interestpage}
 
+							/>
 
 							<Route path="/shixuns/new" component={Newshixuns}>
 							</Route>

public/react/src/AppConfig.js

@@ -149,7 +149,7 @@ export function initAxiosInterceptors(props) {
           debugger
           console.log(response.data.status);
           console.log(response.data);
-          // locationurl(response.data.message);
+          locationurl(response.data.message);
         }
 
 

public/react/src/modules/login/EducoderInteresse.js

@@ -0,0 +1,128 @@
+import React, {Component} from "react";
+import {
+	Form,
+	Select,
+	Input,
+	Button,
+	Checkbox,
+	Upload,
+	Icon,
+	message,
+	Modal,
+	Table,
+	Divider,
+	InputNumber,
+	Tag,
+	DatePicker,
+	Radio,
+	Tooltip,
+	notification
+} from "antd";
+import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import '../courses/css/members.css';
+import "../courses/common/formCommon.css"
+import '../courses/css/Courses.css';
+import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
+import educodernet from '../../../src/images/login/educodernet.png';
+import LoginRegisterComponent from '../user/LoginRegisterComponent';
+import InterestpageComponent from '../user/Interestpage'
+import FindPasswordComponent from '../user/FindPasswordComponent';
+import passopen from "../../images/login/passopen.png";
+//educoder登入页面
+var sectionStyle = {
+	"height": "100%",
+	"width": "100%",
+	"min-width": "1000px",
+// makesure here is String确保这里是一个字符串，以下是es6写法
+
+
+};
+var imgback = {
+	" background-size":"cover",
+	"background-repeat":"no-repeat",
+	backgroundImage: `url(${beijintulogontwo})`,
+}
+var imgmian ={
+	width: "100%",
+	background: `url(${beijintulogontwo})`,
+	position: "relative",
+
+}
+
+var newContainer={
+	background: `url(${beijintulogontwo})`,
+	backgroundPosition: "center" ,
+	backgroundRepeat: "no-repeat",
+	backgroundAttachment: "fixed",
+	backgroundSize: "100% 100%",
+	height:" 100%",
+	width:" 100%",
+	position: "absolute",
+	top: "0px",
+	bottom: "0px",
+	minHeight: "100%",
+	overflow:"hidden",
+	paddingTop: "40px",
+
+}
+class EducoderInteresse extends Component {
+	constructor(props) {
+		super(props);
+
+	}
+
+	componentDidMount() {
+
+	}
+
+
+
+
+
+	render() {
+		return (
+			<div style={newContainer} className=" clearfix" >
+
+				<div >
+					<div style={{
+						"display": "flex",
+						"justify-content": "center",
+						"align-items": "center",
+						"width": "100%"
+					}}>
+						<div >
+							<img src={educodernet}/>
+						</div>
+
+
+					</div>
+
+				  <div style={{
+								display: "flex",
+								justifyContent: "center",
+								width: "100%",
+								height: "630px",
+								marginTop: "44px",
+							}}>
+								<InterestpageComponent {...this.props} {...this.state}>
+								</InterestpageComponent>
+							</div>
+
+					<div style={{
+						display: "flex",
+						justifyContent: "center",
+						width: "100%",
+						bottom:"0",
+						position: "fixed"
+
+					}}>
+						<div className="font-14 color-grey-9 " style={{  bottom:"0",position: "absolute",marginBottom: "20px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+					</div>
+				</div>
+			</div>
+		)
+	}
+
+}
+
+export default EducoderInteresse;

public/react/src/modules/login/EducoderLogin.js

@@ -125,13 +125,7 @@ class EducoderLogin extends Component {
             this.setState({
                 showbool: 1
             })
-        } else if(e===2) {
-            this.setState({
-                namezh:name,
-                passmm:pass,
-							  showbool: 2,
-            })
-        }else if(e===3){
+        } else if(e===3){
             this.setState({
                 showbool: 3
             })
@@ -174,17 +168,6 @@ class EducoderLogin extends Component {
                                 </div>
 
                             </div>
-                        :showbool === 2 ?
-                          <div style={{
-                              display: "flex",
-                              justifyContent: "center",
-                              width: "100%",
-                              height: "630px",
-                              marginTop: "44px",
-                          }}>
-                              <InterestpageComponent {...this.props} {...this.state}>
-                              </InterestpageComponent>
-                          </div>
                         :
                           <div style={{
                               display: "flex",
@@ -217,4 +200,16 @@ class EducoderLogin extends Component {
 
 }
 
-export default EducoderLogin;
+export default EducoderLogin;
+// showbool === 2 ?
+//   <div style={{
+//       display: "flex",
+//       justifyContent: "center",
+//       width: "100%",
+//       height: "630px",
+//       marginTop: "44px",
+//   }}>
+//       <InterestpageComponent {...this.props} {...this.state}>
+//       </InterestpageComponent>
+//   </div>
+//   :

public/react/src/modules/user/LoginRegisterComponent.js

@@ -327,8 +327,8 @@ class LoginRegisterComponent extends Component {
                     passwords: "",
                     Agreetotheterms: "",
                 })
-             // this.props.history.push(result.data.redirect_uri);
-             this.props.Setshowbool(2,this.state.logins,this.state.passwords);
+             this.props.history.push("/interesse");
+             // this.props.Setshowbool(2,this.state.logins,this.state.passwords);
             } catch (e) {
 
             }