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

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

@@ -503,7 +503,12 @@ class CoursesBanner extends Component {
                       }
                     </style>
                     {excellent===true?
-                      <span className="tag-orangces fl"><span className="tag-names mt10 ml15">开放课程</span></span>
+
+											<span>
+												<CoursesListType
+												typelist={["开放课程"]}
+												typesylename={"mt10"}/>
+											</span>
                       :""}
                     <span className={"TabsWarp"}>
                       <CoursesListType

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

@@ -884,7 +884,7 @@ class Coursesleftnav extends Component{
                                 <a onClick={(e)=>this.showsandians(e,key,item.category_url,1)}  className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
                                   {
                                     item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
-                                    item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl":"iconfont icon-kecheng mr10 fl"}></i>:
+                                    item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl font-16":"iconfont icon-kecheng mr10 fl font-16"}></i>:
                                     item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
                                     item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
                                     item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:
@@ -1001,7 +1001,7 @@ class Coursesleftnav extends Component{
                        <a className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
                        {
                          item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
-                         item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl":"iconfont icon-kecheng mr10 fl"}></i>:
+                         item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl font-16":"iconfont icon-kecheng mr10 fl font-16"}></i>:
                          item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
                            item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
                              item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:

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

@@ -55,6 +55,8 @@ class CoursesListType extends Component {
                   {item==="未提交"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未提交</span>:""}
                   {item==="已确认"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已确认</span>:""}
                   {item==="已截止"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已截止</span>:""}
+									{item==="开放课程"?<span className={"edu-filter-btn edu-filter-btn-FF6800 ml15 fl typestyle "+ typesylename} >开放课程</span>:""}
+
                 </span>
               </Tooltip>
           )

public/react/src/modules/courses/css/Courses.css

@@ -907,6 +907,10 @@ a.white-btn.use_scope-btn:hover{
 .edu-filter-btn-FC2B6A{
     background:#FC2B6A !important;
 }
+
+.edu-filter-btn-FF6800{
+    background:#FF6800 !important;
+}
 .color666666{
     color:#666666 !important;
 }

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

@@ -332,8 +332,8 @@ class DetailTop extends Component{
 									border-radius:4px;
 									border:1px solid rgba(255,255,255,1);
 									}
-									.minwinth600{
-									  min-width:600px;
+									.maxwinth700{
+									  max-width:700px;
 									}
 									`
 								}
@@ -361,7 +361,7 @@ class DetailTop extends Component{
                   { detailInfoList.member_count!=0 ? <li><span>学习人数</span><span>{detailInfoList.member_count}</span></li> : ""}
                 </ul>
               }
-				    	<div className="fr pr minwinth600">
+				    	<div className="fr pr maxwinth700">
 
 								{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
 										<Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="fl font-18 color-white kaike mr20 kkbths" >