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

public/react/src/modules/courses/Video/LiveNew.js

@@ -9,7 +9,7 @@ import axios from 'axios';
 
 const { TextArea } = Input;
 const { Option  } = Select;
-const array=['腾讯课堂','B站','斗鱼','威佰通'];
+const array=['腾讯课堂','斗鱼直播','Bilibili','威佰通'];
 
 function range(start, end) {
   const result = [];

public/react/src/modules/tpm/shixuns/ShixunSearchBar.js

@@ -208,7 +208,7 @@ render() {
             <div className="educontent">
                 <div className="pt_b_26">
                     <div className="clearfix mb20 shaiContent">
-                        <span className="shaiTitle fl mt3">方向：</span>
+                        <span className="shaiTitle fl">方向：</span>
                         <div className="fl pr shaiAllItem">
                         <li className={shixunsearchAllvalue==="a"?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value= "a"    onClick={this.shixunsearchall}>全部</li>
 													<style>
@@ -222,7 +222,8 @@ render() {
 																	float: left;
 																	margin-right: 20px;
 																	color: #999;
-																	cursor: pointer;
+                                                                    cursor: pointer;
+                                                                    margin-bottom:10px;
 															}
 															.ant-dropdown-menu-item, .ant-dropdown-menu-submenu-title{
     															padding: 0px 12px;
@@ -249,12 +250,23 @@ render() {
                         </div>
                         </div>
                         <div className="clearfix">
-                        <span className="shaiTitle fl mt6">筛选：</span>
+                        <span className="shaiTitle fl">筛选：</span>
 													{
 														<style>
-															{`
+                                                            {`
+                                                            .shaiContent li.shaiItem{
+                                                                padding:0px 15px;
+                                                                line-height:32px;
+                                                                height:32px
+                                                            }
+                                                            .shaiTitle{
+                                                                height:32px;
+                                                                line-height:32px;
+                                                            }
 															  .shaiItems{
-																		padding: 3px 15px;
+                                                                padding:0px 15px;
+                                                                line-height:32px;
+                                                                height:32px;
 																		float: left;
 																		border-radius: 4px;
 																		color: #4C4C4C;