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

public/react/package.json

@@ -93,7 +93,7 @@
     "wrap-md-editor": "^0.2.20"
   },
   "scripts": {
-    "start": "node --max_old_space_size=8072 scripts/start.js",
+    "start": "node --max_old_space_size=15360 scripts/start.js",
     "build": "node --max_old_space_size=15360 scripts/build.js",
     "concat": "node scripts/concat.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",

public/react/src/modules/courses/Resource/index.js

@@ -123,7 +123,7 @@ class Fileslists extends Component{
 					list.map((item,key)=>{
 						course_second_categoriess=item.course_second_categories
 					})
-					debugger
+
           this.setState({
             course_modules:response.data,
             has_course_groups:response.data.has_course_groups,
@@ -850,7 +850,7 @@ class Fileslists extends Component{
                             {/*})*/}
                         {/*)*/}
                       {/*})}*/}
-                      {this.props.isAdmin()?parseInt(this.props.match.params.main_id)===parseInt(this.props.coursesids)?
+                      {this.props.isAdmin()?parseInt(this.props.match.params.main_id)===filesId&&filesId?
                         <p className="drop_down_btn">
                           <a className="color-grey-6" onClick={()=>this.addDir()}>添加目录</a>
                         </p>

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

@@ -976,7 +976,8 @@ class ShixunHomework extends Component{
       order,
     }=this.state;
 
-
+		let main_id=this.props.match.params.main_id;
+		let category_id=this.props.match.params.category_id;
     return(
       <React.Fragment  >
       <div>
@@ -1131,7 +1132,7 @@ class ShixunHomework extends Component{
 
                   {course_modules&&course_modules.main_category.map((item,key)=>{
                     return(
-											datas&&datas.category_id===null?datas.main_category_id===item.main_category_id?"":<li key={key} id={item.main_category_id} onClick={() => this.moveTos(item.main_category_id)}>{item.main_category_name}</li>:""
+											datas&&datas.category_id===null?"":<li key={key} id={item.main_category_id} onClick={() => this.moveTos(item.main_category_id)}>{item.main_category_name}</li>:""
 									)
                   })}
 
@@ -1139,8 +1140,12 @@ class ShixunHomework extends Component{
                   { course_modules&&course_modules.homework_category.filter((item,key)=> {
                   return (!this.state.dirSearchValue || item.category_name.indexOf(this.state.dirSearchValue) != -1)
                   }).map( (item,key) => {
-                    return
-										datas&&datas.category_id!=null?datas.category_id===item.category_id?"":<li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )}>{item.category_name}</li>:""
+ 										if(datas&&datas.category_id!=null&&datas&&datas.category_id===item.category_id===false){
+											return <li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )}>{item.category_name}</li>
+										}
+										if(datas&&datas.category_id===null){
+											return <li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )}>{item.category_name}</li>
+										}
 									})}
 
 
@@ -1152,7 +1157,7 @@ class ShixunHomework extends Component{
 									 }
 										`}
 									</style>
-									{course_modules&&course_modules.homework_category.length===0?
+									{course_modules&&course_modules.homework_category.length===0&&datas&&datas.category_id===null?
 										<div className={"courseSecond"}>暂无数据</div>:""}
 
                   {/*{course_modules&&course_modules.homework_category.map((item,key)=>{*/}