Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank

# Conflicts:
#	config/routes.rb

public/react/src/modules/topic_bank/Topic_bank.js

@@ -30,8 +30,6 @@ class Topic_bank extends Component {
 			<div className="newMain clearfix">
 
 				<Switch>
-					{/*众包首页*/}
-
 					<Route path="/topicbank/:username/:topicstype"
 								 render={
 									 (props) => (<PackageIndex {...this.props} {...props} {...this.state} />)

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

@@ -79,7 +79,8 @@ class InfosTopics extends Component{
 				}
 			}).then((response) => {
 				this.setState({
-					data:response.data
+					data:response.data,
+					checkBoxValues:[]
 				})
 			}).catch((error) => {
 
@@ -90,12 +91,13 @@ class InfosTopics extends Component{
 
 	searchCategory=(type)=>{
 		this.setState({
-			category:type
+			category:type,
+			course_list_id:undefined,
 		})
 
 		let types=this.props.match.params.topicstype;
 		let { category,course_list_id,sort_by,sort_direction,page}=this.state;
-		this.searchAlldata(types,type,course_list_id,sort_by,sort_direction,page)
+		this.searchAlldata(types,type,undefined,sort_by,sort_direction,page)
 	}
 
 	searchCourselistid=(id)=>{
@@ -333,15 +335,27 @@ class InfosTopics extends Component{
 
 					{
 						`
+						  ::-webkit-scrollbar-thumb {
+									background-color: #cde5fe;
+
+									box-shadow: 0px 0px black;
+							}
+
+
+							::-webkit-scrollbar-track {
+									-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
+									background-color: #fff;
+							}
+
 							.shaiContent li.shaiItem {
-									padding: 3px 15px;
+					    padding: 0px 15px;
-									float: left;
+							float: left;
-									border-radius: 4px;
+							border-radius: 4px;
-									color: #4C4C4C;
+							color: #4C4C4C;
-									cursor: pointer;
+							cursor: pointer;
-									margin-right: 20px;
+							margin-right: 20px;
-									display: block;
+							display: block;
-									margin-bottom: 5px;
+							margin-bottom: 0px;
 							}
 
 							.mr38{
@@ -395,8 +409,8 @@ class InfosTopics extends Component{
 							</div>
 
 								<div className={"shaiContent"}>
+									<li className={course_list_id===undefined?"shaiItem shixun_repertoire active fl":"shaiItem shixun_repertoire fl"}  onClick={()=>this.searchCourselistid(undefined)}>全部</li>
 									<div className="fl pr topicsItem pagetype mb20">
-										<li className={course_list_id===undefined?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"}  onClick={()=>this.searchCourselistid(undefined)}>全部</li>
 										{data===undefined?"":data.course_list===undefined||data.course_list.length===0?"":data.course_list.map((item,key)=>{
 											return(
 												<li key={key} className={course_list_id===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} onClick={()=>this.searchCourselistid(item.id)}>{item.name}</li>

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

@@ -381,3 +381,9 @@
     color: rgba(51,51,51,1);
     line-height: 35px;
 }
+
+.topicsItem{
+    max-width: 1050px;
+    max-height: 115px;
+    overflow-y: auto;
+}

public/stylesheets/educoder/edu-all.css

@@ -3761,8 +3761,3 @@ a.singlepublishtwo{
     /*width: auto !important;*/
     /*max-width: 600px !important;*/
 /*}*/
-.topicsItem{
-    max-width: 1138px;
-    max-height: 110px;
-    overflow-y: auto;
-}