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

public/react/src/context/TPIContextProvider.js

@@ -892,6 +892,7 @@ pop_box_new(htmlvalue, 480, 182);
 					<Dialog
 						id="tpi-dialog"
 			          	open={this.state.gDialogOpen}
+						disableEscapeKeyDown={true}
 			          	onClose={() => this.handleGdialogClose()}
 			        >	
 				       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>

public/react/src/modules/comment/Comments.js

@@ -505,6 +505,7 @@ class Comments extends Component {
 						</Modals> : 
 						<Dialog
 		          	open={dialogOpen}
+								disableEscapeKeyDown={true}
 		          	onClose={this.handleDialogClose}
 		        >	
 			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
@@ -531,6 +532,7 @@ class Comments extends Component {
 
 		        <Dialog
 		          	open={goldRewardDialogOpen}
+								disableEscapeKeyDown={true}
 		          	onClose={this.handleGoldRewardDialogClose}
 		        >	
 			       	<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>

public/react/src/modules/common/RewardDialog.js

@@ -58,6 +58,7 @@ class RewardDialog extends Component {
 	    return (
 	      	 <Dialog
 	          	open={goldRewardDialogOpen}
+							disableEscapeKeyDown={true}
 	          	onClose={this.handleGoldRewardDialogClose}
 	        >	
 		       	<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>

public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js

@@ -5,7 +5,8 @@ import locale from 'antd/lib/date-picker/locale/zh_CN';
 import { WordsBtn,getUrl ,handleDateString} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
-import DownloadMessage from '../../../modals/DownloadMessage';
+import DownloadMessageysl from "../../../modals/DownloadMessageysl";
+
 import CoursesListType from '../../coursesPublic/CoursesListType';
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
 import moment from 'moment';
@@ -70,7 +71,9 @@ class GraduationTaskssettingapp extends Component{
       endtimetype:false,
       flagPageEdit:false,
       visible:false,
-			starttime:undefined
+			starttime:undefined,
+			DownloadType:false,
+			DownloadMessageval:undefined,
     }
   }
 
@@ -891,34 +894,41 @@ class GraduationTaskssettingapp extends Component{
   }
 	/// 确认是否下载
 	confirmysl(url){
+		axios.get(url).then((response) => {
+			if(response === undefined){
+				return
+			}
+			if(response.data.status&&response.data.status===-1){
 
-    this.refs.DownloadMessage.confirmysl(url);
+			}else if(response.data.status&&response.data.status===-2){
-
+				if(response.data.messages === "100"){
-		// axios.get(url).then((response) => {
+					// 已超出文件导出的上限数量（100 ），建议：
-		// 	if(response.data.status&&response.data.status===-1){
 
-		// 	}else if(response.data.status&&response.data.status===-2){
+					this.setState({
-		// 		if(response.data.messages === "100"){
+						DownloadType:true,
-		// 			// 已超出文件导出的上限数量（100 ），建议：
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
 
-		// 			this.setState({
+	Downloadcal=()=> {
-		// 				DownloadType:true,
+		this.setState({
-		// 				DownloadMessageval:100
+			DownloadType: false,
-		// 			})
+			DownloadMessageval: undefined
-		// 		}else {
+		})
-		// 			//因附件资料超过500M
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:500
-		// 			})
-		// 		}
-		// 	}else {
-		// 		this.props.showNotification(`正在下载中`);
-		// 		window.open("/api"+url, '_blank');
-		// 	}
-		// }).catch((error) => {
-		// 	console.log(error)
-		// });
 	}
   render(){
     const { getFieldDecorator } = this.props.form;
@@ -994,10 +1004,14 @@ class GraduationTaskssettingapp extends Component{
             {/*course_groups={course_groups}*/}
             {/*skipTop={this.skipTop}*/}
           {/*/>*/}
-					<DownloadMessage
+					<DownloadMessageysl
 						{...this.props}
-            ref="DownloadMessage"
+						value={this.state.DownloadMessageval}
+						modalCancel={this.Downloadcal}
+						modalsType={this.state.DownloadType}
+
 					/>
+
 					<HomeworkModal
 						starttimes={this.state.starttimes}
 						typs={this.state.typs}

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -6,9 +6,8 @@ import axios from 'axios';
 import moment from 'moment';
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
 import Modals from '../../../modals/Modals';
-import DownloadMessage from '../../../modals/DownloadMessage';
 import CoursesListType from '../../coursesPublic/CoursesListType';
-
+import DownloadMessageysl from "../../../modals/DownloadMessageysl";
 import ModulationModal from "../../coursesPublic/ModulationModal";
 import AllocationModal from "../../coursesPublic/AllocationModal";
 import Associationmodel from '../../coursesPublic/Associationmodel';
@@ -48,7 +47,9 @@ class GraduationTaskssettinglist extends Component{
 			Allocationtype:false,
 			task_Id:"",
 			user_id:"",
-			visibles:false
+			visibles:false,
+			DownloadType:false,
+			DownloadMessageval:undefined,
 		}
 	}
 
@@ -626,9 +627,9 @@ class GraduationTaskssettinglist extends Component{
 		this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pageNumber);
 
 	}
+
 	/// 确认是否下载
 	confirmysl(url){
-
 		let  {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state;
 
 		let params ={
@@ -640,7 +641,43 @@ class GraduationTaskssettinglist extends Component{
 			b_order:b_order,
 			search:search,
 		}
-	 this.refs.DownloadMessage.confirmysl(url,params);
+		axios.get(url,{
+			params
+		}).then((response) => {
+			if(response === undefined){
+				return
+			}
+			if(response.data.status&&response.data.status===-1){
+
+			}else if(response.data.status&&response.data.status===-2){
+				if(response.data.messages === "100"){
+					// 已超出文件导出的上限数量（100 ），建议：
+
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+
+	Downloadcal=()=> {
+		this.setState({
+			DownloadType: false,
+			DownloadMessageval: undefined
+		})
 	}
 	render(){
 
@@ -1007,7 +1044,13 @@ class GraduationTaskssettinglist extends Component{
 						setupdate={this.setupdate}
 					/>:""}
 
-					<DownloadMessage ref="DownloadMessage" {...this.props} />
+					<DownloadMessageysl
+						{...this.props}
+						value={this.state.DownloadMessageval}
+						modalCancel={this.Downloadcal}
+						modalsType={this.state.DownloadType}
+
+					/>
 
 					{taskslistdata&&taskslistdata?
 						// 教师列表

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js

@@ -4,7 +4,7 @@ import {Link} from 'react-router-dom';
 import { WordsBtn,markdownToHTML} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
-import DownloadMessage from '../../../modals/DownloadMessage';
+import DownloadMessageysl from "../../../modals/DownloadMessageysl";
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
 import CoursesListType from '../../coursesPublic/CoursesListType';
 import moment from 'moment';
@@ -25,7 +25,9 @@ class GraduationTasksquestions extends Component{
       fileList: [],
       contents: [{val:"",id:1}],
       type:true,
-      questionslist:undefined
+      questionslist:undefined,
+			DownloadType:false,
+			DownloadMessageval:undefined,
     }
   }
 
@@ -192,33 +194,36 @@ class GraduationTasksquestions extends Component{
 
 	/// 确认是否下载
 	confirmysl(url){
-    this.refs.DownloadMessage.confirmysl(url);
+		axios.get(url).then((response) => {
-		// axios.get(url).then((response) => {
+			if(response === undefined){
-		// 	if(response.data.status&&response.data.status===-1){
+				return
-
+			}
-		// 	}else if(response.data.status&&response.data.status===-2){
+			if(response.data.status&&response.data.status===-1){
-		// 		if(response.data.messages === "100"){
+
-		// 			// 已超出文件导出的上限数量（100 ），建议：
+			}else if(response.data.status&&response.data.status===-2){
-
+				if(response.data.messages === "100"){
-		// 			this.setState({
+					// 已超出文件导出的上限数量（100 ），建议：
-		// 				DownloadType:true,
+
-		// 				DownloadMessageval:100
+					this.setState({
-		// 			})
+						DownloadType:true,
-		// 		}else {
+						DownloadMessageval:100
-		// 			//因附件资料超过500M
+					})
-		// 			this.setState({
+				}else {
-		// 				DownloadType:true,
+					//因附件资料超过500M
-		// 				DownloadMessageval:500
+					this.setState({
-		// 			})
+						DownloadType:true,
-		// 		}
+						DownloadMessageval:500
-		// 	}else {
+					})
-		// 		this.props.showNotification(`正在下载中`);
+				}
-		// 		window.open("/api"+url, '_blank');
+			}else {
-		// 	}
+				this.props.showNotification(`正在下载中`);
-		// }).catch((error) => {
+				window.open("/api"+url, '_blank');
-		// 	console.log(error)
+			}
-		// });
+		}).catch((error) => {
+			console.log(error)
+		});
 	}
+
 	Downloadcal=()=> {
 		this.setState({
 			DownloadType: false,
@@ -256,9 +261,12 @@ class GraduationTasksquestions extends Component{
             {/*modalSave={ModalSave}*/}
             {/*loadtype={Loadtype}*/}
           {/*/>*/}
-					<DownloadMessage
+					<DownloadMessageysl
 						{...this.props}
-						ref="DownloadMessage"
+						value={this.state.DownloadMessageval}
+						modalCancel={this.Downloadcal}
+						modalsType={this.state.DownloadType}
+
 					/>
           <HomeworkModal
 						starttimes={this.state.starttimes}

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

@@ -911,8 +911,8 @@ class Listofworksstudentone extends Component {
 		}
 	}
 	student=()=>{
-		console.log("914");
+		// console.log("914");
-		debugger
+		// debugger
 		this.props.triggerRef(this);
 		var homeworkid = this.props.match.params.homeworkid;
 		this.Getalistofworks(homeworkid);
@@ -932,8 +932,8 @@ class Listofworksstudentone extends Component {
 	// 获取作品列表
 	Getalistofworks = (homeworkid) => {
 		// console.log("获取作品列表");
-		console.log("935");
+		// console.log("935");
-		debugger
+		// debugger
 		let urll = `/homework_commons/${homeworkid}/works_list.json`;
 		var data = {
 			search: "",
@@ -948,9 +948,9 @@ class Listofworksstudentone extends Component {
           if(result === undefined){
           	return
 					}
-			console.log("951");
+			// console.log("951");
-			console.log(result);
+			// console.log(result);
-			debugger
+			// debugger
 				if (result.status === 200) {
 					this.setState({
 						teacherdata: result.data,
@@ -1109,11 +1109,11 @@ class Listofworksstudentone extends Component {
 					})
 
 					// }
-					var teacherlist = {  //分页
+					// var teacherlist = {  //分页
-						total: teacherdata.student_works.length, //数据总数量
+					// 	total: teacherdata.student_works.length, //数据总数量
-						pageSize: teacherdata.student_works.length,  //一页显示几条
+					// 	pageSize: teacherdata.student_works.length,  //一页显示几条
-						current: this.state.page,
+					// 	current: this.state.page,
-					}
+					// }
 					styletable = {"display": "block",}
 				} else {
 					// console.log("seacthdata设置数据2")
@@ -1231,11 +1231,11 @@ class Listofworksstudentone extends Component {
 				})
 
 				// }
-				var teacherlist = {  //分页
+				// var teacherlist = {  //分页
-					total: teacherdata.student_works.length, //数据总数量
+				// 	total: teacherdata.student_works.length, //数据总数量
-					pageSize: teacherdata.student_works.length,  //一页显示几条
+				// 	pageSize: teacherdata.student_works.length,  //一页显示几条
-					current: this.state.page,
+				// 	current: this.state.page,
-				}
+				// }
 			} else {
 				// console.log("seacthdata设置数据2")
 				var teacherlist = undefined;
@@ -1404,11 +1404,11 @@ class Listofworksstudentone extends Component {
 
 	TablePagination = (e) => {
 		// console.log(e.current);
-		var teacherlists = {  //分页
+		// var teacherlists = {  //分页
-			total: this.state.student_works.length, //数据总数量
+		// 	total: this.state.student_works.length, //数据总数量
-			pageSize: 10,  //一页显示几条
+		// 	pageSize: 10,  //一页显示几条
-			current: e.current,
+		// 	current: e.current,
-		}
+		// }
 		this.setState({
 			page: e.current,
 			teacherlists: teacherlists
@@ -1468,7 +1468,7 @@ class Listofworksstudentone extends Component {
 	// 获取作品列表
 	Getalistofworkst = (homeworkid) => {
 		// console.log("获取作品列表");7009
-		debugger
+		// debugger
 
 		let urll = `/homework_commons/${homeworkid}/works_list.json`;
 		// console.log(homeworkid);
@@ -1488,7 +1488,7 @@ class Listofworksstudentone extends Component {
 			limit:20,
 		}
 		axios.post(urll, data).then((result) => {
-			debugger
+			// debugger
 				if (result !== undefined) {
 					// console.log(url)
 					// console.log("作品列表6789077")
@@ -1583,7 +1583,7 @@ class Listofworksstudentone extends Component {
 
 	// 设置数据
 	seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
-		debugger
+		// debugger
 		let {page, limit} = this.state;
 		let datalist = [];
 		let columns = this.state.columns;
@@ -1615,11 +1615,11 @@ class Listofworksstudentone extends Component {
 
 			}
 
-			var teacherlist = {  //分页
+			// var teacherlist = {  //分页
-				total: student_works.length, //数据总数量
+			// 	total: student_works.length, //数据总数量
-				pageSize: 20,  //一页显示几条
+			// 	pageSize: 20,  //一页显示几条
-				current: page,
+			// 	current: page,
-			}
+			// }
 			if (work_efficiency === false) {
 				if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined||course_group_info === null){
 					//这里没有分班 没有 关卡得分 没有效率分
@@ -2198,9 +2198,12 @@ class Listofworksstudentone extends Component {
 		// console.log(this.state.data);
 		// console.log("841");
 		// console.log(this.state.columns);
+		// console.log(data);
+		// console.log("2202");
+		// console.log(this.props.isAdmin());
+
 		return (
-			this.props.isAdmin === true ?
+			this.props.isAdmin() === true ?
-				(
 					<div className=" clearfix " style={{margin:  "auto" , minWidth:"1200px"}}>
 						{visible === true ? <ModulationModal
 							visible={visible}
@@ -2488,7 +2491,7 @@ class Listofworksstudentone extends Component {
 							</div>
 							{
 								teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-									<div className="edu-txt-center edu-back-white mt30 mb20">
+									<div className="edu-txt-center mt30 ">
 										<Pagination showQuickJumper current={page}
 																onChange={this.paginationonChanges} pageSize={limit}
 																total={teacherdata.work_count}></Pagination>
@@ -2498,8 +2501,9 @@ class Listofworksstudentone extends Component {
 						</div>
 
 					</div>
-				)  :(
+				 :
-
+				<div>
+					{
 						teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
 							// 学生不能查看别人的
 							<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
@@ -2837,7 +2841,7 @@ class Listofworksstudentone extends Component {
 													</div>
 													{
 														teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-												<div className="edu-txt-center edu-back-white mt30 mb20">
+															<div className="edu-txt-center mt30">
 																<Pagination showQuickJumper current={page}
 																						onChange={this.paginationonChanges} pageSize={limit}
 																						total={teacherdata.work_count}></Pagination>
@@ -2868,7 +2872,8 @@ class Listofworksstudentone extends Component {
 								</div>
 
 							</div>
-		)
+					}
+				</div>
 
 		)
 	}

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

@@ -276,6 +276,7 @@ class ShixunHomeworkPage extends Component {
 						value={this.state.DownloadMessageval}
 						modalCancel={this.Downloadcal}
 						modalsType={this.state.DownloadType}
+
 					/>
 
 					{parseInt(tab) === 0 &&<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>}

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

@@ -381,6 +381,7 @@ class LoginDialog extends Component {
     	return (
             <Dialog open={true} id="DialogID"
               style={{ display: isRender==false? 'none' : ''}}
+							disableEscapeKeyDown={true}
               onClose={() => this.handleDialogClose()}
             >
             <div className={dialogBox}>

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

@@ -538,6 +538,7 @@ class Trialapplication extends Component {
 										 style={{height: '0', width: '0', border: 'none', display: "none"}}/>
 
 							<Dialog open={true} id="DialogIDysl"
+											disableEscapeKeyDown={true}
 											style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}}
 							>
 								<div id="closeIcon" onClick={() => {

public/react/src/modules/page/MainContentContainer.js

@@ -876,6 +876,7 @@ class MainContentContainer extends Component {
 	    	<React.Fragment>
 		        <Dialog
 		          	open={this.state.open}
+								disableEscapeKeyDown={true}
 		          	onClose={this.handleClose}
 		        >
 			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
@@ -893,6 +894,7 @@ class MainContentContainer extends Component {
 
 		        <Dialog
 		          	open={this.state.resetCodeDialogOpen}
+								disableEscapeKeyDown={true}
 		          	onClose={() => this.handleResetCodeDialogClose()}
 		        >
 			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
@@ -912,6 +914,7 @@ class MainContentContainer extends Component {
 		        </Dialog>
 
 		        <Dialog
+						  	disableEscapeKeyDown={true}
 		          	open={this.state.resetPassedCodeDialogOpen}
 		          	onClose={() => this.handleResetPassedCodeDialogClose()}
 		        >

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

@@ -147,6 +147,7 @@ class LeftView extends Component {
 	    	<React.Fragment>
 	    		<Dialog
 		          	open={dialogOpen}
+								disableEscapeKeyDown={true}
 		          	onClose={handleDialogClose}
 		        >	
 			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>

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

@@ -0,0 +1,51 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import 'common.css'
+//立即申请试用
+class MyEduCoderModal extends Component {
+
+	constructor(props) {
+		super(props);
+    this.state={
+
+		}
+	}
+
+	modalCancel=()=>{
+		//取消
+	}
+
+	setDownload=()=>{
+    //立即联系
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				title="提示"
+				centered={true}
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				width="530px"
+			>
+				<div className="educouddiv">
+					<div><p>欢迎使用EduCoder，您可以试用1天</p></div>
+					<div><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>
+		)
+	}
+}
+
+export default MyEduCoderModal;

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

@@ -0,0 +1,49 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import 'common.css'
+//完善个人资料
+class Notcompleted extends Component {
+
+	constructor(props) {
+		super(props);
+
+	}
+
+	modalCancel=()=>{
+		//取消
+	}
+
+	setDownload=()=>{
+		//立即联系
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				title="提示"
+				centered={true}
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				width="530px"
+			>
+				<div className="educouddiv">
+					<div><p>您尚未完善个人资料</p></div>
+					<div><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>
+		)
+	}
+}
+
+export default Notcompleted;

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

@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import 'common.css'
+//密码已重置，请重新登录
+class ReadPassword extends Component {
+
+	constructor(props) {
+		super(props);
+
+	}
+
+
+	setDownload=()=>{
+		//立即联系
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				title="提示"
+				centered={true}
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				width="530px"
+			>
+				<div className="educouddiv">
+					<div><p>密码已重置，请重新登录</p></div>
+					<a className="task-btn task-btn-orange" onClick={this.setDownload()}>知道啦</a>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default ReadPassword;

public/react/src/modules/user/account/AccountBasic.js

@@ -11,6 +11,7 @@ const radioOptions = [
   { label: '男', value: 'boy' },
   { label: '女', value: 'girl' },
 ];
+export const identityMap={"teacher":"教师", "student":"学生", "professional":"专业人士"}
 class AccountBasicEdit extends Component {
   constructor(props){
     super(props);
@@ -84,14 +85,14 @@ class AccountBasicEdit extends Component {
               label="所在地"
               className="display formItemInline"
             >
-              {basicInfo && basicInfo.location}    {basicInfo && basicInfo.location_city}
+              {basicInfo && basicInfo.location}　{basicInfo && basicInfo.location_city}
             </Form.Item>
 
             <Form.Item
               label="职业"
               className="display formItemInline"
             >
-              {basicInfo && basicInfo.technical_title}
+              { basicInfo && basicInfo.identity && identityMap[basicInfo.identity] }　{basicInfo && ( basicInfo.technical_title || basicInfo.student_id)}
             </Form.Item>
 
             <Form.Item
@@ -109,7 +110,7 @@ class AccountBasicEdit extends Component {
             </Form.Item>
           </Form>
           </div>
-          <diV style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</diV>
+          <div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
       </div>
     );
   }

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -5,11 +5,11 @@ import { Form, Button, Input, Radio, Select, Tooltip, Icon  } from 'antd'
 import ApplyForAddOrgModal from '../modal/ApplyForAddOrgModal'
 import ApplyForAddChildOrgModal from '../modal/ApplyForAddChildOrgModal'
 import axios from 'axios'
-
+import { identityMap } from './AccountBasic'
 const RadioGroup = Radio.Group;
 const Option = Select.Option;
 
-const map={"teacher":"教师", "student":"学生", "professional":"专业人士"}
+const map = identityMap // {"teacher":"教师", "student":"学生", "professional":"专业人士"}
 class AccountBasic extends Component {
   constructor(props){
     super(props);
@@ -62,10 +62,13 @@ class AccountBasic extends Component {
           job2:basicInfo && basicInfo.identity=="professional" ? basicInfo.technical_title:"企业管理者",
         })
       }, 100)
+
       //if(basicInfo.nickname){
         this.setState({
+          forDisable: true,
           nameLength:basicInfo.nickname?basicInfo.nickname.length:0,
           showRealName:basicInfo.show_realname,
+          realName: basicInfo.name,
           identity:basicInfo.identity
         })
       //}
@@ -116,7 +119,8 @@ class AccountBasic extends Component {
         axios.put((url),{
           nickname:values.nickname,
           // 认证中的不能修改
-          name: basicInfo.authentication == 'uncertified' ? values.name : basicInfo.name,
+          name: basicInfo.authentication == 'uncertified' ? 
+              (this.state.showRealName ? values.name : this.state.realName ) : basicInfo.name,
           show_realname:this.state.showRealName,
           gender:parseInt(values.sex),
           location:values.city[0],
@@ -140,15 +144,16 @@ class AccountBasic extends Component {
   }
 
   // 隐藏或显示真实姓名
-  showOrHide=(flag,name)=>{
+  showOrHide=(flag)=>{
+    const name = this.props.form.getFieldsValue().name || this.props.basicInfo.name
     this.setState({
       showRealName:flag==true?false:true
     })
-    if(flag==true){
+    if(flag==true){ // 隐藏真实姓名
       this.hideRealName(name);
-    }else{
+    }else{  // 显示
       this.props.form.setFieldsValue({
-        name
+        name: this.state.realName
       })
     }
   }
@@ -164,11 +169,13 @@ class AccountBasic extends Component {
 
   // 将名字隐藏起来
   hideRealName=(name)=>{
+    this.setState({ realName: name })
     const newName = this.getHiddenName(name)
 
     this.props.form.setFieldsValue({
       name: newName
     })
+    return newName
   }
 
   // 过滤学校
@@ -333,9 +340,12 @@ class AccountBasic extends Component {
               font-size: 14px;
             }
             .basicForm .saveBtn {
-              width: 120px;
+              width: 100px;
               margin-left: 100px;
             }
+            .basicForm .cancelBtn {
+              margin-left: 0px;
+            }
             .basicForm .ant-input-lg {
               height: 32px;
             }
@@ -384,9 +394,9 @@ class AccountBasic extends Component {
                     message: '请输入您的姓名',
                   }],
                 })(
-                  <Input placeholder="请输入您的姓名"  suffix={
+                  <Input placeholder="请输入您的姓名" disabled={!showRealName && this.state.forDisable == true } suffix={
                     <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
-                          onClick={()=>this.showOrHide(showRealName,basicInfo.name)}></i>
+                          onClick={()=>this.showOrHide(showRealName)}></i>
                   }></Input>
                 )} 
                 <span>{ showRealName ? '（显示：平台将显示您的真实姓名）' : '（隐藏：平台将显示你的昵称）' }</span>
@@ -394,7 +404,7 @@ class AccountBasic extends Component {
                 <div className="df" style={{ 'justify-content': 'center' }}>
                   <span className="mr8" >{showRealName ? this.props.basicInfo.name : this.getHiddenName(this.props.basicInfo.name)}</span>
                   <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
-                       onClick={()=>this.showOrHide(showRealName,basicInfo.name)}></i>
+                       onClick={()=>this.showOrHide(showRealName)}></i>
                   <span>{ showRealName ? '（显示：平台将显示您的真实姓名）' : '（隐藏：平台将显示你的昵称）' }</span>
                 </div>
               }
@@ -562,7 +572,7 @@ class AccountBasic extends Component {
                   {
                     filterDepartments && filterDepartments.map((item,key)=>{
                       return(
-                        <Option value={item.name}>{item.name}</Option>
+                        <Option value={item.name} key={item.name}>{item.name}</Option>
                       )
                     })
                   }
@@ -583,11 +593,14 @@ class AccountBasic extends Component {
             {/* <Form.Item>
               <div className="clearfix mt30 mb30"> */}
                 <Button type="primary" onClick={this.handleSubmit} size="middle" className="saveBtn mr20 mt30">{"保存"}</Button>
+
+                {this.props.basicInfo.base_info_completed && 
+                  <Button type="" onClick={() => { this.props.history.push('/account/profile') }} size="middle" className="saveBtn cancelBtn mr20 mt30">{"取消"}</Button>}
               {/* </div>
             </Form.Item> */}
           </Form>
           </div>
-          <diV style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</diV>
+          <div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
       </div>
     );
   }

public/react/src/modules/user/account/AccountCertification.js

@@ -84,7 +84,7 @@ class AccountCertification extends Component {
               </div>  
             </div>
           </div>
-          <diV style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</diV>
+          <div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
         </div>
       );
     }

public/react/src/modules/user/account/AccountSecure.js

@@ -480,7 +480,7 @@ class AccountSecure extends Component {
           </div>
           </Form>
         </div>
-        <diV style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</diV>
+        <div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
       </div>
     );
   }

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

@@ -66,7 +66,7 @@ button.ant-btn.ant-btn-primary.grayBtn {
     padding-bottom: 30px;
     margin-bottom:30px;
     margin-right:20px;
-    max-height:430px;
+    height:418px;
   }
   .accountInfo { 
     text-align: center;

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

@@ -32,6 +32,10 @@
     height: 45px;
   }
 
+  .educouddiv {
+    display: flex;
+    justify-content: center;
+  }
 
 
   .left_right {