From 72426e472f489bcc0ea1f1ffac58a3c49eaa9d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 15 Jul 2019 15:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.js | 5 +-
public/react/src/AppConfig.js | 2 +-
.../src/modules/login/EducoderInteresse.js | 128 ++++++++++++++++++
.../react/src/modules/login/EducoderLogin.js | 33 ++---
.../modules/user/LoginRegisterComponent.js | 4 +-
5 files changed, 149 insertions(+), 23 deletions(-)
create mode 100644 public/react/src/modules/login/EducoderInteresse.js
diff --git a/public/react/src/App.js b/public/react/src/App.js
index dfb8c89d0..c86498851 100644
--- a/public/react/src/App.js
+++ b/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 {
+
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 638ff98ab..f7a6615db 100644
--- a/public/react/src/AppConfig.js
+++ b/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);
}
diff --git a/public/react/src/modules/login/EducoderInteresse.js b/public/react/src/modules/login/EducoderInteresse.js
new file mode 100644
index 000000000..fefb0a65d
--- /dev/null
+++ b/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 (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
© 2019 EduCoder
湘ICP备17009477号Trustie & IntelliDE inside.
+
+
+
-
-
-
:
+//
+//
+//
+// :
\ No newline at end of file
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 8b2e6e546..18759f022 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/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) {
}