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

public/react/src/modules/courses/new/CoursesNew.js

@@ -335,11 +335,19 @@ class CoursesNew extends Component {
 				//  this.props.history.push(this.props.current_user.first_category_url);
 			 // }
         // window.history.go(-1)
+        try {
             if(id===undefined){
-				this.props.history.goBack()
+                this.props.history.push("/");
+            }else{
+                if(this.props.current_user.first_category_url===undefined){
+                    this.props.history.push("/");
                 }else{
                     this.props.history.push(this.props.current_user.first_category_url);
                 }
+            }
+        }catch (e) {
+            this.props.history.push("/");
+        }
 
     }
 

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

@@ -168,27 +168,29 @@ class ShixunWorkReport extends Component {
 			//  })
 		 //
 		 // }
+		let{work_comment,work_comment_hidden}=this.state;
 		this.setState({
 			showAppraiseModaltype:true,
+			work_comment_hidden:work_comment===null||work_comment===undefined?this.state.work_type?true:false:work_comment_hidden,
 		})
 	}
 
 	hideAppraiseModal=()=>{
-		let{data,work_comment}=this.state;
+		let{work_comment,work_comment_hidden}=this.state;
 		this.setState({
 			showAppraiseModaltype:false,
-			work_comment_hidden:data&&data.work_comment_hidden===true?true:work_comment!=null?true:false,
+			work_comment_hidden:work_comment===null||work_comment===undefined?this.state.work_type===1?true:false:work_comment_hidden,
 		})
 	}
 	showAppraiseModals=(list,type)=>{
-		let{data,work_comment}=this.state;
+
 		this.setState({
 			showAppraiseModaltype:false,
-			work_comment_hidden:data&&data.work_comment_hidden===true?true:work_comment!=null?true:false,
+			work_comment_hidden:type===0?false:true,
 			work_comment:list,
 			work_type:type,
 			showAppraiseModals:true,
-			showAppraiseModalsshow:true
+			showAppraiseModalsshow:true,
 		})
 	}
 	isdeleteModal=()=>{
@@ -258,7 +260,7 @@ class ShixunWorkReport extends Component {
 					Cancel={()=>this.hideAppraiseModal()}
 					showCancel={(list,type)=>this.showAppraiseModals(list,type)}
 					work_comment={this.state.work_comment}
-					work_type={this.state.work_type}
+					work_type={work_comment===null||work_comment===undefined?this.state.work_type:work_comment_hidden===true?1:0}
 				 />:""}
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20" }>

public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js

@@ -81,7 +81,7 @@ class ConclusionEvaluation extends Component {
 				</span>
 			),
 		}, {
-			title: '耗时',
+			title: '实战耗时',
 			key: 'elapsed',
 			dataIndex: 'elapsed',
 

public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js

@@ -150,7 +150,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '耗时',
+			title: '实战耗时',
 			key: 'elapsedtime',
 			dataIndex: 'elapsedtime',