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

public/react/src/modules/courses/questionbank/Generaljobbankdetails.js

@@ -87,6 +87,7 @@ class Generaljobbankdetails extends Component {
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
 							type:this.props.match.params.type,
+
 						}
 						this.setState({
 									banksMenu:menuData

public/react/src/modules/user/usersInfo/InfosTopics.js

@@ -369,7 +369,7 @@ class InfosTopics extends Component{
 							cursor: pointer;
 							margin-right: 10px;
 							display: block;
-							margin-bottom: 0px;
+							margin-bottom: 2px;
 					    color: #666;
 							}
 
@@ -455,6 +455,16 @@ class InfosTopics extends Component{
 								<span className="fr color-grey-9">已选择   <span  className={"color-orange"}>{checkBoxValues.length}</span>  个   (不支持跨页勾选)</span>
 						</p>
 						<p className="font-12 alltopiscright ml25 fr">
+							<style>
+								{
+									`
+									.yslbottomsj{
+									position: absolute;
+									bottom: -8px;
+									}
+									`
+								}
+							</style>
 								<Dropdown overlay={menu}>
 										<span className="fr color-grey-9 mr10 pointer ">
 											<span>{sort_by==="updated_at"?'最近更新':sort_by==="name"?'题目名称':sort_by==="contributor"?"贡献者":""}</span>
@@ -462,7 +472,7 @@ class InfosTopics extends Component{
 												<i className={sort_direction==="asc"?
 													"iconfont icon-sanjiaoxing-up font-12 topsj color-blue" :"iconfont icon-sanjiaoxing-up font-12 topsj"}></i>
 												<i className={sort_direction==="desc"?
-													"iconfont icon-sanjiaoxing-down font-12 bottomsj color-blue":"iconfont icon-sanjiaoxing-down font-12 bottomsj"}></i>
+													"iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue":"iconfont icon-sanjiaoxing-down font-12 yslbottomsj"}></i>
 											</sapn>
 										</span>
 								</Dropdown>

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -331,7 +331,7 @@
 
 .topicsbtn{
     padding: 3px 15px;
-    border-radius: 2px;
+    border-radius: 30px;
     color: #4C4C4C;
     cursor: pointer;
     display: inline-block;