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

public/react/src/AppConfig.js

@@ -111,6 +111,7 @@ export function initAxiosInterceptors(props) {
         if(response===undefined){
            return
        }
+      // locationurl(402);
        const config = response.config
         if (response.data.status === -1) {
         //     console.error('error:', response.data.message)

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

@@ -1,8 +1,6 @@
 import React, { Component } from 'react';
 import { Modal } from 'antd';
-// import Notcompleted from './Notcompleted';
+export function SetAppModel(options) {
-
-export function SetAppModel(options = {}) {
 	return function wrap(WrappedComponent) {
 		return class Wrapper extends Component {
 			constructor(props) {
@@ -11,6 +9,16 @@ export function SetAppModel(options = {}) {
 				this.state = {
 
 				}
+				console.log("SetAppModel");
+				console.log("13");
+				console.log(options);
+			}
+			modalCancel=()=>{
+				window.location.href = "/";
+			}
+
+			setDownload=()=>{
+				window.location.href ='/account/profile';
 			}
 			componentDidMount(){
 				console.log(this.props)
@@ -18,13 +26,27 @@ export function SetAppModel(options = {}) {
 
 			render() {
 				const { titlemessage, Modallisttype, Modallist, singleButton } = this.state;
-
+				console.log(this.state.Notcompleteds);
 				return (
-							<div>
+					<Modal
-								{/*<Notcompleted*/}
+						keyboard={false}
-									{/*modalsType={this.state.Notcompleteds}*/}
+						closable={false}
-								{/*/>*/}
+						footer={null}
+						destroyOnClose={true}
+						title="提示"
+						centered={true}
+						visible={this.props.modalsType===undefined?false:this.props.modalsType}
+						width="530px"
+					>
+						<div className="educouddiv">
+							<div className={"tabeltext-alignleft mt10"}><p>您尚未完善个人资料</p></div>
+							<div className={"tabeltext-alignleft mt10"}><p>请在完成资料后，提交试用申请</p></div>
+							<div className="clearfix mt30 edu-txt-center">
+								<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
+								<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即完善资料</a>
 							</div>
+						</div>
+					</Modal>
 				)
 			}
 		}

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -906,8 +906,11 @@ class Listofworksstudentone extends Component {
 		console.log("componentDidMount");
 		if(this.props.isAdmin() === true){
 			this.tearchar();
+			console.log("909");
 		}else{
 			this.student();
+			console.log("911");
+
 		}
 	}
 	student=()=>{
@@ -1482,7 +1485,7 @@ class Listofworksstudentone extends Component {
 		}
 		axios.post(urll, data).then((result) => {
 			debugger
-				if (result !== undefined) {
+				if (result) {
 					// console.log(url)
 					// console.log("作品列表6789077")
 					// console.log(JSON.stringify(result))
@@ -1582,6 +1585,7 @@ class Listofworksstudentone extends Component {
 		let columns = this.state.columns;
 		var  columns2=[];
 		if (teacherdata !== undefined) {
+			console.log("1588");
 			for (var i = 0; i < student_works.length; i++) {
 				var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
 				datalist.push({
@@ -1605,6 +1609,8 @@ class Listofworksstudentone extends Component {
 					user_name: student_works[i].user_name,
 					user_login: student_works[i].user_login,
 				})
+				console.log(datalist);
+				console.log("1612");
 
 			}
 
@@ -1701,6 +1707,9 @@ class Listofworksstudentone extends Component {
 
 		} else {
 		}
+
+		console.log(datalist);
+		console.log("1712");
 		this.setState({
 			data: datalist,
 			columns: columns2,

public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js

@@ -141,8 +141,9 @@ class ShixunHomeworkPage extends Component {
 
 	render() {
 		let {tab, teacherdata,  jobsettingsdata} = this.state;
-
 		const isAdmin = this.props.isAdmin();
+		console.log(tab);
+		console.log("147147147147147147147");
 		return (
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20"} style={{width: "1200px"}}>
@@ -279,13 +280,13 @@ class ShixunHomeworkPage extends Component {
 
 					/>
 
-					{parseInt(tab) === 0 &&<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>}
+					{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
 
-					{parseInt(tab) === 1 &&<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>}
+					{parseInt(tab) === 1 ?<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>:""}
 
-					{parseInt(tab) === 2 &&<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>}
+					{parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""}
 
-					{parseInt(tab) === 3 &&<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>}
+					{parseInt(tab) === 3 ?<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
 
 				</div>
 			</div>

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

@@ -171,7 +171,7 @@ class NewHeader extends Component {
       submitapplications:false,
       isRender:false,
       // isRenders:false,
-      // showTrial:false,
+      showTrial:false,
     }
     // console.log("176")
     // console.log(props);

public/react/src/modules/user/common.css

@@ -159,7 +159,7 @@
     display: flex;
     justify-content:center;
     width: 60px;
-    margin-left: 21px;
+    margin-left: 26px;
 
   }
 .yslgouxuanimg{