调整

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -553,19 +553,28 @@ class Coursesleftnav extends Component{
      // notification.open({
      //   message: "删除成功",
      // });
+
+		 // this.props.history.replace(url);
       window.location.href = url;
    }
 
-  deletenavchilds=(url)=>{
+  deletenavchilds=(url,mainurl)=>{
+
     axios.delete(url).then((result)=>{
       if(result.data.status===0){
+
+				if(mainurl===undefined){
 					this.updatadeleteSecondary(result.data.right_url)
+				}else{
+					this.updatadeleteSecondary(mainurl)
+				}
+
       }
     }).catch((error)=>{
       console.log(error)
     })
   }
-  deleteSecondary=(e,type,id)=>{
+  deleteSecondary=(e,type,id,mainurl)=>{
     e.stopPropagation();//阻止冒泡
     if(type===1){
       let url="/course_second_categories/"+id+".json"
@@ -593,7 +602,7 @@ class Coursesleftnav extends Component{
         ModalsType:true,
         Modalstopval:"该目录下的内容将被移动到父目录,",
         ModalsBottomval:"是否确认删除?",
-        ModalSave:()=>this.deletenavchilds(url),
+        ModalSave:()=>this.deletenavchilds(url,mainurl),
 
       })
     }
@@ -726,7 +735,7 @@ class Coursesleftnav extends Component{
           {item.type==="course_group"?<div onClick={e=>this.deleteSecondary(e,2,iem.category_id)}>删除</div>:""}
           {/*讨论区*/}
           {item.type==="board"?<div onClick={e=>this.Navmodalnames(e,7,"editSecondname",iem.category_id,iem.category_name)}>重命名</div>:""}
-          {item.type==="board"?<div onClick={e=>this.deleteSecondary(e,3,iem.category_id)}>删除</div>:""}
+          {item.type==="board"?<div onClick={e=>this.deleteSecondary(e,3,iem.category_id,item.category_url)}>删除</div>:""}
         </div>)
   }
 

public/react/src/modules/courses/coursesHome/coursesHomeCard.js

@@ -40,7 +40,8 @@ class coursesHomeCard extends Component{
                               className="mt80 mb25"/>
                               <p className="font-14 color-white">非成员不能访问</p>
                           </div>
-                           <a href={item.first_category_url} className="square-img" >
+                           {/*<a href={item.first_category_url} className="square-img" >*/}
+											    	<a href={`/courses/${item.id}/students`} className="square-img" >
 														 {/*target="_blank"*/}
                              {
                                item.is_public===1&&item.id===1309?

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

@@ -211,15 +211,15 @@ class ShixunModal extends Component{
                     <a onClick={()=>this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a>
                   </li>
 
-                  {
-                    shixunmodallist && shixunmodallist.tags.map((item,key)=>{
-                      return(
-                        <li className="fl mr5 mt5" key={key}>
-                          <a onClick={()=>this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}</a>
-                        </li>
-                      )
-                    })
-                  }
+                  {/*{*/}
+                    {/*shixunmodallist && shixunmodallist.tags.map((item,key)=>{*/}
+                      {/*return(*/}
+                        {/*<li className="fl mr5 mt5" key={key}>*/}
+                          {/*<a onClick={()=>this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}</a>*/}
+                        {/*</li>*/}
+                      {/*)*/}
+                    {/*})*/}
+                  {/*}*/}
 
                 </div>
                 <div className="clearfix mb10" id="shixun_search_form_div" style={{height:"30px"}}>
@@ -251,9 +251,9 @@ class ShixunModal extends Component{
                 }
                 <ul className="clearfix greybackHead edu-txt-center">
                   <li className="fl with40 paddingleft22" >实训名称</li>
-                  <li className="fl with30 edu-txt-left">使用院校</li>
-                  <li className="fl with10">使用人数</li>
-                  <li className="fl with10">评价等级</li>
+                  <li className="fl with30 edu-txt-left">院校</li>
+                  <li className="fl with10">学习人数</li>
+                  <li className="fl with10">难度</li>
                   <li className="fl with10"></li>
                 </ul>
 
@@ -292,9 +292,9 @@ class ShixunModal extends Component{
                                   <span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.shixun_name}</span>
                                 </Checkbox>
                               </li>
-                              <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school_users}</li>
+                              <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school}</li>
                               <li className="fl with10 paddingl10">{item.myshixuns_count}</li>
-                              <li className="fl with10 color-orange-tip paddingl10">{item.preference}</li>
+                              <li className="fl with10 color-orange-tip paddingl10">{item.level}</li>
                               <Tooltip title="新窗口查看详情">
                               <li className="fl with10"><a className="color-blue" href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">详情</a></li>
                               </Tooltip>

public/react/src/modules/page/layers/TaskResultLayer.css

@@ -91,9 +91,9 @@
 .inline.exp {
     margin-left: 18px;
 }
-    .inline img{
-        margin-right: 8px;
-    }
+    /*.inline img{*/
+        /*margin-right: 8px;*/
+    /*}*/
 .goldring{
     margin-right: 8px;
     width: 17px;
@@ -132,3 +132,7 @@
 .passed.stared:hover {
     opacity: 1;
 }
+
+.vertical4{
+    vertical-align: -4px;
+}

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

@@ -476,7 +476,7 @@ class DetailCardsEditAndEdit extends Component{
                 footer={null}
                 width="840px"
                 destroyOnClose={true}
-              >Z
+              >
 								<Spin spinning={hometypepvisible}  size="large" style={{marginTop:'15%'}}>
                 <div className="newupload_conbox">
                   <div className="clearfix mb20 shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div">

public/react/src/modules/tpm/NewFooter.js

@@ -37,7 +37,16 @@ class NewFooter extends Component {
             </ul>
           </div>
           <div>
-            <p className="footer_con-p inline lineh-30 font-14"><span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</p>
+							<p className="footer_con-p inline lineh-30  font-14">
+								<span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder
+								<a style={{"color":"#888"}}  target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
+								<a style={{"color":"#888"}}  target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962"  className="mr15">
+									<img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号
+								</a>
+								<a href="https://team.trustie.net" style={{"color":"#888"}}
+									 target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span
+									className="mr15">版权所有 湖南智擎科技有限公司</span>
+						  </p>
           </div>
           <div className="cl"></div>
         </div>