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

public/react/src/App.js

@@ -297,8 +297,9 @@ class App extends Component {
 			const wx = window.wx
 			const url = '/wechats/js_sdk_signature.json'
 			const currentUrl = window.location.href.split('#')[0]
+			// window.encodeURIComponent()
 			axios.post(url, {
-				url: currentUrl,
+				url: window.__testUrl || currentUrl,
 			}).then((response) => {
 				console.log('got res')
 				const data = response.data;
@@ -306,7 +307,7 @@ class App extends Component {
 					debug: false,
 					appId: data.appid,
 					timestamp: data.timestamp,
-					nonceStr: data.nonceStr,
+					nonceStr: data.noncestr,
 					signature: data.signature,
 					jsApiList: [
 						'onMenuShareTimeline',//

public/react/src/modules/courses/busyWork/commonWork.js

@@ -227,7 +227,7 @@ class commonWork extends Component{
     
   }
   clearSelection = () => {
-    this.setState({ checkBoxValues: [] })
+    this.setState({ checkBoxValues: [], checkAll: false })
   }
   // 
   onSetPublic = () => {

public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js

@@ -67,7 +67,7 @@ class Groupjobbandetails extends Component {
 			<div className=" clearfix  edu-back-white "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
 					{
-						ddatas.description===null?
+						datas.description===null?
 								""
 					 			:datas.description==="null"?
 						   	""

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

@@ -408,10 +408,11 @@ class InfosTopics extends Component{
 							}
 
 							.gongkais{
-									min-width: 50px;
+								min-width: 50px;
 								height: 22px !important;
 								line-height: 22px !important;
 								color: #fff !important;
+							  margin-top: 4px;
 							}
 						 	`
 					}
@@ -428,7 +429,7 @@ class InfosTopics extends Component{
 							<div className={types==="personal"?"topicstopfont fl ":"topicstopfont fl topcsactive"}
 							 >我的题库</div>
 							<a className={types==="publicly"?"topicstopfont fr ":"topicstopfont fr topcsactive"}
-								 href={`/topicbank/${username}/publicly`}
+								 href={`/topicbank/${this.props.current_user&&this.props.current_user.login}/publicly`}
 							>公共题库</a>
 						</div>}
 
@@ -530,7 +531,7 @@ class InfosTopics extends Component{
 											{item.name}
 									  </a>
 
-										{item.is_public===true?types==="publicly"?"":<span className="edu-filter-btn edu-filter-btn-4CACFF ml15 fl gongkais mt3">公开</span>:""}
+										{item.is_public===true?types==="publicly"?"":<span className="edu-filter-btn edu-filter-btn-4CACFF ml15 fl gongkais">公开</span>:""}
 
 
 

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

@@ -121,7 +121,7 @@ class BanksIndex extends Component{
           }
 
 					{
-						crumbData &&<p className="clearfix mt20 mb30 ">
+						crumbData &&<p className="clearfix mt15 mb10 ">
             <span className="fl font-24 color-grey-3 task-hide lineh-30" style={{maxWidth:'800px'}}>{crumbData && crumbData.title}</span>
             { crumbData.is_public == true ? 
               <span className="bank_is_public">公开</span>