Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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

@@ -1055,7 +1055,7 @@ class Coursesleftnav extends Component{
 																																		iem.category_id===0?"":
                                                                     iem.category_type==="graduation_topics"||iem.category_type==="graduation_tasks"?
                                                                       (
-                                                                        iem.category_name.length<13?
+                                                                        iem.category_name&&iem.category_name.length<13?
                                                                           <span className={"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
                                                                           :
                                                                           <Tooltip placement="right" key={index} title={iem.category_name}  visible={toopvisibleindexs===undefined?false:toopvisibleindexs===index?true:false}>
@@ -1064,7 +1064,7 @@ class Coursesleftnav extends Component{
                                                                       )
                                                                       :
                                                                       (
-                                                                        iem.category_name.length<13?
+                                                                        iem.category_name&&iem.category_name.length<13?
                                                                           <Popover placement="right" content={this.content(item,iem,index)} trigger="hover" key={index} onMouseEnter={(e)=>this.twosandianshowyss(e)}>
                                                                             <i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i>
                                                                           </Popover>
@@ -1147,6 +1147,16 @@ class Coursesleftnav extends Component{
                              {/*title={iem.category_name.length<10?"":iem.category_name}*/}
 
                              <li className="clearfix Draggableli" key={index} style={{ width: '244px'}}  >
+                               {
+                                   iem.category_name&&iem.category_name.length<13?
+                                       <a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} >
+                                         {/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/}
+                                         {/*{iem.category_name.length<10?"":*/}
+                                         {/*  iem.category_name}*/}
+                                         <span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth170 task-hide  Draggablelichild":"fl ml38 maxwidth170 task-hide  Draggablelichild"}>{iem.category_name}</span>
+                                         <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14":twosandiantype===index&&item.type!="graduation"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14"}>{iem.category_count===0?"":iem.category_count}</span>
+                                       </a>
+                                     :
                                      <Tooltip placement="right" key={index} title={iem.category_name}>
                                        <a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} >
                                          {/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/}
@@ -1156,6 +1166,7 @@ class Coursesleftnav extends Component{
                                          <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14":twosandiantype===index&&item.type!="graduation"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14"}>{iem.category_count===0?"":iem.category_count}</span>
                                        </a>
                                      </Tooltip>
+                               }
                                </li>
 
                            </a>