From b63474c860511b7844150127b54675c2a10ec741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 19 Jul 2019 21:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/Interestpage.js | 26 ++++++++++++++++++-
 .../react/src/modules/user/MyEduCoderModal.js |  3 ++-
 public/react/src/modules/user/Notcompleted.js |  4 +--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js
index 9c31abd1b..b00294b58 100644
--- a/public/react/src/modules/user/Interestpage.js
+++ b/public/react/src/modules/user/Interestpage.js
@@ -1,6 +1,8 @@
 import React, {Component} from 'react';
 import {Button,notification} from 'antd';
 import {broadcastChannelPostMessage} from 'educoder';
+import MyEduCoderModal from './MyEduCoderModal';
+import Notcompleted from './Notcompleted';
 import axios from 'axios';
 import './common.css'
 import mytc from './img/mytc.png';
@@ -155,6 +157,12 @@ class InterestpageComponent extends Component {
 
 	}
 
+   setMyEduCoderModals=()=>{
+		this.setState({
+			MyEduCoderModals:true
+		})
+	 }
+
 	//兴趣页面点击
 	Interestcompletionpage(){
 		if(this.state.gouxuans.length === 0){
@@ -179,7 +187,8 @@ class InterestpageComponent extends Component {
 		}).then((response) => {
 			if (response !== undefined) {
       // this.Jumptotheinterestpage();
-				window.location.href = "/"
+			// 	window.location.href = "/"
+				this.setMyEduCoderModals()
 			}
 
 
@@ -218,6 +227,13 @@ class InterestpageComponent extends Component {
 	// 		console.log(error);
 	// 	})
 	// }
+	setNotcompleteds=()=>{
+		this.setState({
+			Notcompleteds:true,
+			MyEduCoderModals:false
+		})
+	}
+
 	render() {
 		const {
 			gouxuans,
@@ -228,6 +244,14 @@ class InterestpageComponent extends Component {
 
 			<div className="ysllogin_register_contents" style={{width:"800px",height: "600px"}}>
 
+				<MyEduCoderModal
+					modalsType={this.state.MyEduCoderModals}
+					setNotcompleteds={()=>{this.setNotcompleteds()}}
+				/>
+
+				<Notcompleted
+					modalsType={this.state.Notcompleteds}
+				/>
 				<div className="ysllogin_section">
 					<div className="mt15"><span className="yslspans1">请选择你的职业</span></div>
 					<div className="ysldivhome1" >
diff --git a/public/react/src/modules/user/MyEduCoderModal.js b/public/react/src/modules/user/MyEduCoderModal.js
index cca6de622..b9d7c47e1 100644
--- a/public/react/src/modules/user/MyEduCoderModal.js
+++ b/public/react/src/modules/user/MyEduCoderModal.js
@@ -14,11 +14,12 @@ class MyEduCoderModal extends Component {
 	}
 
 	modalCancel=()=>{
-		//取消
+	 	window.location.href = "/"
 	}
 
 	setDownload=()=>{
     //立即联系
+		this.props.setNotcompleteds()
 	}
 
 
diff --git a/public/react/src/modules/user/Notcompleted.js b/public/react/src/modules/user/Notcompleted.js
index 99c85c543..8861e744a 100644
--- a/public/react/src/modules/user/Notcompleted.js
+++ b/public/react/src/modules/user/Notcompleted.js
@@ -12,11 +12,11 @@ class Notcompleted extends Component {
 	}
 
 	modalCancel=()=>{
-		//取消
+	 window.location.href = "/";
 	}
 
 	setDownload=()=>{
-		//立即联系
+		window.location.href ='/account/profile';
 	}