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

public/react/src/search/SearchPage.js

@@ -218,10 +218,15 @@ class SearchPage extends Component{
 
 													<div>
 													{/*挑战名字*/}
+													
+													
 													{item.content.challenge_names === undefined || item.content.challenge_names===0?"": item.content.challenge_names.map((item5, key5) => {
 														return (
-															<span className={"markdown-body"}
+															<div className={"df"}>
+																<span style={{flex: '0 0 82px'}}>关卡名称：</span>
+																<span className={""}
 																	 dangerouslySetInnerHTML={{__html: item5}} />
+															</div>
 														)
 													})
 													}
@@ -231,8 +236,11 @@ class SearchPage extends Component{
 													{/*挑战标签*/}
 													{item.content.challenge_tag_names === undefined || item.content.challenge_tag_names===0?"": item.content.challenge_tag_names.map((item6, key6) => {
 														return (
-															<span className={key6>1?"markdown-body tzbq ":"markdown-body tzbqx"}
+															<div className={"df"}>
+																<span style={{flex: '0 0 82px'}}>关卡标签：</span>
+																<span className={key6>1?" tzbq ":" tzbqx"}
 																		dangerouslySetInnerHTML={{__html:item6}} />
+															</div>
 														)
 													})
 													}
@@ -260,44 +268,44 @@ class SearchPage extends Component{
 
 														<span className="ziticor">
 															{/* <i className="fa fa-user ziticor"></i> */}
-															<span className="ml10">{item.author_name}</span></span>
+															<span className="">{item.author_name}</span></span>
 															<span className="ml10 ziticor "><span>{item.author_school_name}</span>
 														</span>  
 														{!!item.challenges_count && <span className="ml20 ziticor">
-															<i className="iconfont icon-shixunguanqia ziticor"></i>
+															{/* <i className="iconfont icon-shixunguanqia ziticor"></i> */}
 															<span>任务:
 																<span className="ml10 ziticor">{item.challenges_count}</span>
 															</span>
 														</span> }
 														{!!item.study_count && <span className="ml20 ziticor">
-															<i className="iconfont icon-chengyuan ziticor"></i>
+															{/* <i className="iconfont icon-chengyuan ziticor"></i> */}
 															<span>学习人数:
 																<span className="ml10 ziticor">{item.study_count}</span>
 															</span>
 														</span>}
 
 														{!!item.stage_shixuns_count && <span className="ml20 ziticor">
-															<i className="iconfont icon-shixunguanqia ziticor"></i>
+															{/* <i className="iconfont icon-shixunguanqia ziticor"></i> */}
 															<span>实训数:
 																<span className="ml10 ziticor">{item.stage_shixuns_count}</span>
 															</span>
 														</span>}
 														{type == 'subject' && !!item.visits_count && <span className="ml20 ziticor">
-															<i className="iconfont icon-chengyuan ziticor" style={{ 'margin-bottom': '1px' }}></i>
+															{/* <i className="iconfont icon-chengyuan ziticor" style={{ 'margin-bottom': '1px' }}></i> */}
 															<span>访问数:
 																<span className="ml10 ziticor">{item.visits_count}</span>
 															</span>
 														</span>}
 
 														{!!item.members_count && <span className="ml20 ziticor">
-															<i className="iconfont icon-chengyuan ziticor"></i>
+															{/* <i className="iconfont icon-chengyuan ziticor"></i> */}
 															<span>成员数:
 																<span className="ml10 ziticor">{item.members_count}</span>
 															</span>
 														</span>}
 
 														{!!item.all_replies_count && <span className="ml20 ziticor">
-															<i className="iconfont icon-huifu1 ziticor"></i>
+															{/* <i className="iconfont icon-huifu1 ziticor"></i> */}
 															<span>回复数:<span className="ml10 ziticor">{item.all_replies_count}</span></span>
 														</span> }
 															

public/react/src/search/searchc.css

@@ -113,7 +113,7 @@
     margin-left: 68px;
 }
 .tzbqx{
-    margin-left: 24px;
+    /* margin-left: 24px; */
 }
 .bjyss{
     background: #F8F8F8;