Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/public/css/edu-all.css

@@ -3474,10 +3474,7 @@ a.singlepublishtwo{
     margin-bottom: 0 !important;
 }
 
-/*.ant-notification{*/
-    /*width: auto !important;*/
-    /*max-width: 600px !important;*/
-/*}*/
+
 
 
 .markdown-body {
@@ -3502,3 +3499,7 @@ a.singlepublishtwo{
     text-shadow: none !important;
     box-shadow: none !important;
 }
+
+.ant-notification{
+    z-index: 10001 !important;
+}

public/react/src/modules/courses/common/comments/CCommentItem.js

@@ -227,11 +227,11 @@ class CCommentItem extends Component{
 										</Tooltip> }
 										{/* </React.Fragment>
 										} */}
-										{item.is_appeal_info && isAdmin && item.appeal_status == 1 && <React.Fragment>
+										{item.is_appeal_info && isAdmin && item.appeal_status == 1 && this.props.isAdmin()===true&&<React.Fragment>
 											<WordsBtn style="grey" onClick={() => this.on_deal_appeal_score(REFUSE, item)} className="fr ml6">拒绝申诉</WordsBtn>
 											<WordsBtn style="orange" onClick={() => this.on_deal_appeal_score(ACCEPT, item)} className="fr">接受申诉</WordsBtn>
 										</React.Fragment>}
-										{item.appeal_status == 1 &&	this.props.is_author == true && 
+										{item.appeal_status == 1 &&	this.props.is_author == true && this.props.isStudent()===true &&
 											<WordsBtn style="blue" className="fr mr5" onClick={() => this.cancelMyAppeal()}>撤销申诉</WordsBtn>}
 										
 									</div>

public/react/src/modules/courses/coursesPublic/NewShixunModel.js

@@ -234,16 +234,7 @@ class NewShixunModel extends Component{
 		this.getdatalist(1,undefined,'all',value,'desc',0,20)
 	}
 
-	showNotification = (description, message = "提示", icon) => {
-		const data = {
-			message,
-			description
-		}
-		if (icon) {
-			data.icon = icon;
-		}
-		notification.open(data);
-	}
+
 	savecouseShixunModal=()=>{
 
 		this.setState({
@@ -252,19 +243,24 @@ class NewShixunModel extends Component{
 		let {coursesId}=this.props;
     let{Grouplist}=this.state;
 		if(Grouplist.length===0){
+
 			this.setState({
 				hometypepvisible:false
 			})
-			this.showNotification(this.props.type==='shixuns'?"请先选择实训":"请先选择课程")
+
+			this.props.showNotification(this.props.type==='shixuns'?"请先选择实训":"请先选择课程")
+
 			return
 		}
 
 		if (this.props.chooseShixun) {
+
 			if(Grouplist.length>1){
+
 				this.setState({
 					hometypepvisible:false
 				})
-				this.showNotification("试卷选择的实训数不能大于1")
+				this.props.showNotification("试卷选择的实训数不能大于1")
 				return
 			}
 			this.props.chooseShixun(Grouplist)
@@ -293,7 +289,7 @@ class NewShixunModel extends Component{
 
 				}else{
 					// this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
-					this.showNotification("操作成功")
+					this.props.showNotification("操作成功")
 					this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order);
 					this.props.hideNewShixunModelType()
 					this.props.updataleftNavfun()
@@ -321,7 +317,7 @@ class NewShixunModel extends Component{
 
 				}else{
 					// this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
-					this.showNotification("操作成功")
+					this.props.showNotification("操作成功")
 					this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order);
 					this.props.hideNewShixunModelType()
 					this.props.updataleftNavfun()

public/stylesheets/educoder/edu-all.css

@@ -3784,10 +3784,7 @@ a.singlepublishtwo{
 .has-error .ant-input:focus{
     border-color: #ff4d4f !important;
 }
-/*.ant-notification{*/
-    /*width: auto !important;*/
-    /*max-width: 600px !important;*/
-/*}*/
+
 .fontweight400{
     font-weight: 400 !important;
 }
@@ -3800,6 +3797,10 @@ a.singlepublishtwo{
     z-index: 10000 !important;
 }
 
+.ant-notification{
+    z-index: 10001 !important;
+}
+
 .markdown-body {
     text-align: justify;
     word-break: break-all;