Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/AppConfig.js

@@ -2,7 +2,7 @@ import React from "react";
 
 import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
-import { broadcastChannelOnmessage } from 'educoder'
+import { broadcastChannelOnmessage ,SetAppModel} from 'educoder';
 import {  notification } from 'antd';
 import './index.css'
 broadcastChannelOnmessage('refreshPage', () => {
@@ -10,11 +10,19 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 
 function locationurl(list){
-    if (window.location.port === "3007") {
+		if (window.location.port === "3007") {
 
-    } else {
+		} else {
-        window.location.replace(list)
+
-    }
+		if(list===402){
+			SetAppModel(402)
+		}else if(list===407){
+
+		}else{
+			window.location.replace(list)
+		}
+
+	}
 }
 
 // TODO 开发期多个身份切换
@@ -149,7 +157,7 @@ export function initAxiosInterceptors(props) {
           debugger
           console.log(response.data.status);
           console.log(response.data);
-          locationurl(response.data.message);
+          locationurl(402);
         }
 
 

public/react/src/common/components/Notcompleted.js

@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
+import {getImageUrl} from 'public/react/src/common/educoder';
 import { Modal} from 'antd';
 import axios from 'axios';
-import './common.css';
+import '../../modules/user/common.css';
 //完善个人资料
 class Notcompleted extends Component {
 
@@ -21,7 +21,7 @@ class Notcompleted extends Component {
 
 
 	render() {
-
+   console.log(this.props)
 		return(
 			<Modal
 				keyboard={false}

public/react/src/common/components/SetAppModel.js

@@ -0,0 +1,33 @@
+import React, { Component } from 'react';
+import { Modal } from 'antd';
+// import Notcompleted from './Notcompleted';
+
+export function SetAppModel(options = {}) {
+	return function wrap(WrappedComponent) {
+		return class Wrapper extends Component {
+			constructor(props) {
+				super(props);
+
+				this.state = {
+
+				}
+			}
+			componentDidMount(){
+				console.log(this.props)
+			}
+
+			render() {
+				const { titlemessage, Modallisttype, Modallist, singleButton } = this.state;
+
+				return (
+							<div>
+								{/*<Notcompleted*/}
+									{/*modalsType={this.state.Notcompleteds}*/}
+								{/*/>*/}
+							</div>
+				)
+			}
+		}
+	}
+}
+

public/react/src/common/educoder.js

@@ -30,6 +30,9 @@ export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CER
 export { themes, ThemeContext } from 	'./context/ThemeContext'
 
 export { ModalHOC } from 	'./components/ModalHOC'
+
+export { SetAppModel } from 	'./components/SetAppModel'
+
 export { default as Cropper } from 	'./components/Cropper'
 export { default as ConditionToolTip } from 	'./components/ConditionToolTip'
 export { default as DragValidator } from 	'./components/DragValidator'

public/react/src/modules/courses/busyWork/UseBank.js

@@ -252,7 +252,7 @@ class UseBank extends Component{
                 <div style={{"height":"230px"}} className="d_middle edu-txt-center">
                   <div>
                     <p className="font-16 mb20 color-grey-3">通过职业认证的教师才能访问公共题库</p>
-                    <a className="white-btn edu-orangeback-btn" target="_blank" href="/account/professional_certification">立即认证</a>
+                    <a className="white-btn edu-orangeback-btn" target="_blank" href="/account/certification">立即认证</a>
                   </div>
                 </div>
                 :

public/react/src/modules/page/main/CodeEvaluateView.js

@@ -135,7 +135,7 @@ class CodeEvaluateView extends Component {
 		})
 	}
 	goToCertification() {
-		window.open('/account/professional_certification', '_blank');
+		window.open('/account/certification', '_blank');
 	}
 	renderTestSets() {
 		const { output_sets, testSetsExpandedArray, power, allowed_unlock, testSetUnlock, showDialog, challenge, game, user } = this.props;

public/react/src/modules/page/main/LeftView.js

@@ -68,7 +68,7 @@ const styles = MUIDialogStyleUtil.getTwoButtonStyle(
 class LeftView extends Component {
 
 	goToCertification() {
-		window.open('/account/professional_certification', '_blank');
+		window.open('/account/certification', '_blank');
 	}
 //  /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
   	render() {

public/react/src/modules/page/main/Webssh.js

@@ -7,7 +7,7 @@ export function loadSshScript(callback) {
         prefix = ''
     } else {
         // _url_origin = `https://testeduplus2.educoder.net/`;
-			  _url_origin  = 'http://47.96.87.25:48080/';
+			  _url_origin  = '';
     }
     const $ = window.$;
     // 未加载过

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -18,7 +18,8 @@ import Trialapplication from "../login/Trialapplication";
 const $ = window.$;
 const versionNum = '0001';
 // let _url_origin = getUrl()
-let _url_origin=`http://47.96.87.25:48080`;
+console.log(this.props)
+let _url_origin='';
 // let _url_origin=`https://www.educoder.net`;
 
 if (!window['indexHOCLoaded']) {

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

@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 import {Button,notification} from 'antd';
 import {broadcastChannelPostMessage} from 'educoder';
 import MyEduCoderModal from './MyEduCoderModal';
-import Notcompleted from './Notcompleted';
+// import Notcompleted from '../../common/Notcompleted';
 import axios from 'axios';
 import './common.css';
 import mytc from './img/mytc.png';
@@ -31,7 +31,7 @@ class InterestpageComponent extends Component {
 			passmm:this.props.passmm,
 			homedatalist:undefined,
 			hometypepvisible: undefined,
-
+			MyEduCoderModals:false
 		}
 	}
 	openNotification = (messge) => {
@@ -249,9 +249,6 @@ class InterestpageComponent extends Component {
 					setNotcompleteds={()=>{this.setNotcompleteds()}}
 				/>
 
-				<Notcompleted
-					modalsType={this.state.Notcompleteds}
-				/>
 				<div className="ysllogin_section">
 					<div className="mt15"><span className="yslspans1">请选择你的职业</span></div>
 					<div className="ysldivhome1" >