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

public/react/src/common/educoder.js

@@ -64,3 +64,4 @@ export { default as ImageLayerHook } from './hooks/ImageLayerHook'
 
 // 外部
 export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb'
+export { CNotificationHOC as CNotificationHOC } from '../modules/courses/common/CNotificationHOC'

public/react/src/modules/paths/Index.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import { SnackbarHOC } from 'educoder';
+import { SnackbarHOC, CNotificationHOC } from 'educoder';
 
 
 import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
@@ -55,4 +55,4 @@ class Index extends Component{
         )
     }
 }
-export default SnackbarHOC() ( TPMIndexHOC(Index) );
+export default CNotificationHOC() (SnackbarHOC() ( TPMIndexHOC(Index) ));

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -112,6 +112,10 @@ class PathDetailIndex extends Component{
     this.setState({
       Modalstype:false,
     })
+    // TODO 这个是临时处理，还需要优化，这里要看怎么区分处理
+    if (this.state.Modalstopval == '你确定要删除该成员吗？') {
+      return;
+    }
 		this.props.history.goBack()
   }
 
@@ -248,11 +252,12 @@ class PathDetailIndex extends Component{
     let param={user_id:user_id};
     axios.delete(url,{data:param}).then((response) => {
       if(response.data.status===1){
+        this.props.showNotification(response.data.message)
         this.setState({
-          Modalstype:true,
-          Modalstopval:response.data.message,
-          loadtype:true,
-          cardsModalsave:this.cardsModalsave,
+          Modalstype:false,
+          // Modalstopval:response.data.message,
+          loadtype:false,
+          // cardsModalsave:this.cardsModalsave,
         })
         this.updatadetailInfoList();
       }
@@ -479,8 +484,9 @@ class PathDetailIndex extends Component{
 
                                     <div className="fl ml15 flex1">
                                       <p className="mb10 mt5">{item.name}
+                                      {/* 新增allow_delete 判断是否能删除 */}
                                         {
-                                         detailInfoList===undefined?"":detailInfoList.allow_add_member===true?
+                                          item.allow_delete===true?
                                           <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""
                                         }
                                       </p>