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

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

@@ -367,7 +367,7 @@ class InfosTopics extends Component{
 							float: left;
 							border-radius: 4px;
 							cursor: pointer;
-							margin-right: 10px;
+					    margin-right: 15px !important;
 							display: block;
 							margin-bottom: 2px;
 					    color: #666;
@@ -397,14 +397,14 @@ class InfosTopics extends Component{
 				<Spin size="large" spinning={isSpin}>
 					<div className="clearfix topicsbox">
 						{types==="publicly"?<div className={"topcschild"}>
-							<a className={types==="personal"?"topicstopfont fr topcsactive":"topicstopfont fr"}
+							<a className={types==="personal"?"topicstopfont fr ":"topicstopfont fr topcsactive"}
 								 href={`/users/${username}/topics/personal`}>我的题库</a>
-							<a className={types==="publicly"?"topicstopfont fl topcsactive":"topicstopfont fl"}
-							>公共题库</a>
+							<div className={types==="publicly"?"topicstopfont fl ":"topicstopfont fl topcsactive"}
+							>公共题库</div>
 						</div>:<div className={"topcschild"}>
-							<a className={types==="personal"?"topicstopfont fl topcsactive":"topicstopfont fl"}
-							 >我的题库</a>
-							<a className={types==="publicly"?"topicstopfont fr topcsactive":"topicstopfont fr"}
+							<div className={types==="personal"?"topicstopfont fl ":"topicstopfont fl topcsactive"}
+							 >我的题库</div>
+							<a className={types==="publicly"?"topicstopfont fr ":"topicstopfont fr topcsactive"}
 								 href={`/topicbank/${username}/publicly`}
 							>公共题库</a>
 						</div>}
@@ -421,7 +421,7 @@ class InfosTopics extends Component{
 
 							</div>
 
-								<div className={data===undefined?"":data.course_list===undefined||data.course_list.length===0?"shaiContent mb45":"shaiContent"}>
+							{data&&data.count===undefined?"":data&&data.count===0?"":<div className={data===undefined?"":data.course_list===undefined||data.course_list.length===0?"shaiContent mb45":"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 mb20">
 										{data===undefined?"":data.course_list===undefined||data.course_list.length===0?"":data.course_list.map((item,key)=>{
@@ -430,7 +430,7 @@ class InfosTopics extends Component{
 											)
 										})}
 									</div>
-								</div>
+								</div>}
 
 						</div>:<div className={"professional_certificationbox"}>
 									<p className="clearfix ">
@@ -450,7 +450,7 @@ class InfosTopics extends Component{
 					</div>
 
 					{isshowprofes===false?<div className="clearfix font-12 mt20">
-						<p className="font-12 ml25 fl">
+						<p className="font-12 ml5 fl">
 								<span className="fl color-grey-9 mr20">共   <span className={"color-orange"}>{data&&data.count===undefined?0:data&&data.count}</span>   个</span>
 								<span className="fr color-grey-9">已选择   <span  className={"color-orange"}>{checkBoxValues.length}</span>  个   (不支持跨页勾选)</span>
 						</p>
@@ -507,7 +507,7 @@ class InfosTopics extends Component{
 											{item.name}
 									  </a>
 
-										{item.is_public===true?<span className="edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle mt3">公开</span>:""}
+										{item.is_public===true?types==="publicly"?"":<span className="edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle mt3">公开</span>:""}
 
 
 
@@ -517,7 +517,7 @@ class InfosTopics extends Component{
 											<span className={"topicswidth600"}>
 												 {types==="publicly"?<span className="topsics135 color-grey9 mr50">{item.creator_name}</span>:""}
 												 <span className="mr50 color-grey9">{item.quotes_count}  次引用</span>
-												 <span className="mr50 color-grey9">{item.solve_count}  次答题</span>
+												 <span className="mr50 color-grey9">{item.solve_count}   次答题</span>
 											   <span className="mr50 color-grey9">{moment(item.updated_at).fromNow()}</span>
 											</span>
 											{item.course_list_name===null?"":<span className={"topsicrelative topsicinline"} title={item.course_list_name}>

public/react/src/modules/user/usersInfo/banks/banksMenu.js

@@ -111,7 +111,7 @@ class BanksMenu extends Component{
     // console.log("banksMenubanksMenubanksMenubanksMenu");
     // console.log(banksMenu);
     return(
-      <div className="clearfix bor-bottom-greyE edu-back-white" style={{padding:"2px 30px"}}>
+      <div className="clearfix bor-bottom-greyE edu-back-white" style={{padding:"0px 30px"}}>
         {this.state.Modalstype&&this.state.Modalstype===true?<Modals
           modalsType={this.state.Modalstype}
           modalsTopval={this.state.Modalstopval}

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

@@ -278,7 +278,6 @@
     font-family:PingFangSC;
     font-weight:400;
     color: #666 !important;
-    cursor: pointer;
 }
 
 .topcschild{
@@ -296,6 +295,7 @@
 
 .topcsactive{
     color: #4CACFF !important;
+    cursor: pointer;
 }
 
 .topicsmidfont{
@@ -398,7 +398,7 @@
 }
 
 .topicsItem{
-    max-width: 1073px;
+    max-width: 1068px;
     max-height: 115px;
     overflow-y: auto;
 }