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

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

@@ -721,13 +721,21 @@ class CoursesBanner extends Component {
 														.ant-breadcrumb-separator{
 														      color: rgba(255,255,255,0.3) !important;
 														}
+														.ant-tooltip-inner{
+														background: #FFFFFF !important;
+														opacity: 0.2 !important;
+														}
+														.ant-tooltip-arrow::before{
+														background: #FFFFFF !important;
+														opacity: 0.2 !important;
+														}
 													`}
 												</style>
 												<Breadcrumb separator="|" className={"mt5"}>
 
 													<Breadcrumb.Item className={"pointer"}>
-														<Tooltip visible={coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
-																		 placement="topLeft"
+														<Tooltip  visible={coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
+														placement="topLeft"
 																		 title={<pre>{coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?<span>您有{coursedata.teacher_applies_count}条新的加入申请<a className={"daishenp"} onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
 																			 <span style={{
 																			 	color:"#FFA804"

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

@@ -2,14 +2,14 @@ i.iconfont {
     cursor: pointer;
 }
 .overflowHidden1 {
-    overflow: hidden; 
-    text-overflow: ellipsis; 
+    overflow: hidden;
+    text-overflow: ellipsis;
     white-space: nowrap;
     display: inline-block;
 }
 .overflowHidden2 {
-    overflow: hidden; 
-    text-overflow: ellipsis; 
+    overflow: hidden;
+    text-overflow: ellipsis;
     white-space: nowrap;
 }
 
@@ -637,7 +637,7 @@ a.white-btn.use_scope-btn:hover{
 /* 公用的文字按钮：蓝、白、灰 */
 .btn.colorblue {
     color:#4CACFF !important;
-}  
+}
 .btn.colorblue:hover{
     color:#459BE5 !important;
 }
@@ -685,7 +685,7 @@ a.white-btn.use_scope-btn:hover{
     background-color: #fff;
     color: #4CACFF!important;
     border: 1px solid #4CACFF;
-}   
+}
 .greyBack{
     /* 不要固定宽度 */
     /* width: 64px; */
@@ -1217,7 +1217,7 @@ samp {
     top: 4px;
     color: #FE4F4C;
   }
-  
+
   /* 毕设任务 */
   .graduationTaskMenu>a{
       display: block;
@@ -1240,7 +1240,7 @@ samp {
   .graduationTaskMenu>a.active{
       color: #4CACFF!important;
   }
-  
+
   /* end */
 /* form表单，包含多个item时 */
 .createPage{
@@ -1268,7 +1268,7 @@ samp {
   .createPage .ant-form-explain{
     padding-left: 0px;
   }
-  
+
   .has-error .ant-input-group-addon{
     border-color:#f5222d!important;
   }
@@ -1282,7 +1282,7 @@ samp {
     top: 32px;
     color: #FE4F4C;
   }
-  
+
   .searchView{
     width: 248px;
     height: 40px;
@@ -1544,7 +1544,7 @@ samp {
   /* 单选下拉列表（超出十条数据带搜索、且有添加按钮） */
   .drop_down_menu li{
     overflow:hidden;
-    white-space: nowrap; 
+    white-space: nowrap;
     text-overflow:ellipsis;
     padding:0px 20px;
     height: 34px;
@@ -1571,7 +1571,7 @@ samp {
     line-height: 48px;
     color: #666666;
   }
-  
+
 /* 下拉 ---------------- END */
 
 /* List列表页的公共样式---------------------------------------------- END */
@@ -1749,4 +1749,8 @@ input.ant-input-number-input:focus {
 .daishenp{
     color: #F79946 !important;
     text-decoration: underline !important;
-}
+}
+.pointertooltip{
+  background: #DDDDDD;
+
+}

public/react/src/search/SearchPage.js

@@ -137,8 +137,10 @@ class SearchPage extends Component{
 						margin-right: 4px;
 						font-size: 16px !important;
 					}
+					.shixundetailtopcss{
+					}
 				`}</style>
-				<div className="shixunDetail_top " >
+				<div className="shixunDetail_top shixundetailtopcss" >
 					{/*<div style={{height:"53px"}}></div>*/}
 					<div className="intermediatecenter" style={{ width: "100%"}}>
 						<Search

public/react/src/search/searchc.css

@@ -178,9 +178,10 @@
 .ml9{
     margin-left: 9px;
 }
-.shixunDetail_top{width: 100%;background-image: url("/images/educoder/searchforbackres.jpg"); height: 240px;
+.shixunDetail_top{width: 100%;background-image: url("/images/educoder/searchforbackres.jpg"); height: 160px;
     justify-content: center;align-items: center;display: -webkit-flex;
     background-size: cover;
     background-position: center;
     background-repeat: no-repeat;
+    padding-top: 0px !important;
 }