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

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

@@ -171,7 +171,9 @@ class DetailCards extends Component{
             delecttype:false,
             editdelectid:undefined
           })
-          this.getPathCardsList();
+          // this.getPathCardsList();
+
+          this.updatapathCardsedit()
         }
       }).catch((error) => {
         console.log(error)

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

@@ -484,9 +484,10 @@ class PathDetailIndex extends Component{
 
                                     <div className="fl ml15 flex1">
                                       <p className="mb10 mt5">{item.name}
-                                      {/* 新增allow_delete 判断是否能删除 */}
+                                        {/* 新增role 判断是否能删除  1 管理员   2 合作者 */}
+
                                         {
-                                          item.allow_delete===true?
+                                          detailInfoList===undefined?"":detailInfoList.allow_add_member===true && item.role == 2?
                                           <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""
                                         }
                                       </p>