调整

public/react/src/App.js

@@ -251,6 +251,11 @@ const Messagerouting= Loadable({
 	loader: () => import('./modules/message/js/Messagerouting'),
 	loading: Loading,
 })
+
+const Topicbank= Loadable({
+	loader: () => import('./modules/topic_bank/Topic_bank'),
+	loading: Loading,
+})
 class App extends Component {
 	constructor(props) {
 		super(props)
@@ -342,6 +347,14 @@ class App extends Component {
           <Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy}/>
 					<Router>
 						<Switch>
+							{/*题库*/}
+							<Route path="/topicbank/:username/:topicstype"
+										 render={
+											 (props) => {
+
+												 return (<Topicbank {...this.props} {...props} {...this.state} />)
+											 }
+										 }></Route>
 
 							{/*众包创新*/}
 							<Route path={"/crowdsourcing"} component={ProjectPackages}/>

public/react/src/common/SnackbarHOC.js

@@ -48,7 +48,17 @@ export function SnackbarHOC(options = {}) {
 						snackbarHorizontal: horizontal,
 					})
 				}
-
+				//个别情况需要走
+				showNotification = (description, message = "提示", icon) => {
+					const data = {
+						message,
+						description
+					}
+					if (icon) {
+						data.icon = icon;
+					}
+					notification.open(data);
+				}
 	      	render() {
 		        const { snackbarOpen, snackbarText, snackbarHorizontal, snackbarVertical } = this.state;
 
@@ -70,7 +80,7 @@ export function SnackbarHOC(options = {}) {
 				          	resumeHideDuration={2000}
 				        	message={<span id="message-id">{this.state.snackbarText}</span>}
 				        />
-			            <WrappedComponent {...this.props} showSnackbar={ this.showSnackbar } >
+			            <WrappedComponent {...this.props} showSnackbar={ this.showSnackbar }	showNotification= { this.showNotification } >
 			       	
 			            </WrappedComponent>
 		          	</React.Fragment>

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

@@ -0,0 +1,47 @@
+import React, { Component } from 'react';
+
+import { Redirect } from 'react-router';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import Loading from '../../Loading'
+
+import Loadable from 'react-loadable';
+import { TPMIndexHOC } from '../tpm/TPMIndexHOC'
+import { SnackbarHOC } from 'educoder'
+
+
+const PackageIndex = Loadable({
+	loader: () => import('../user/usersInfo/InfosTopics'),
+	loading: Loading,
+})
+
+
+class Topic_bank extends Component {
+	constructor(props) {
+		super(props)
+	}
+
+	componentDidMount(){
+	}
+
+	render() {
+		return (
+			<div className="newMain clearfix">
+
+				<Switch>
+					{/*众包首页*/}
+
+					<Route path="/topicbank/:username/:topicstype"
+								 render={
+									 (props) => (<PackageIndex {...this.props} {...props} {...this.state} />)
+								 }
+					></Route>
+				</Switch>
+
+			</div>
+		);
+	}
+}
+
+export default SnackbarHOC() (TPMIndexHOC (Topic_bank)) ;

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

@@ -34,7 +34,6 @@ class InfosTopics extends Component{
 		let types=this.props.match.params.topicstype;
     let professional_certification=this.props.current_user&&this.props.current_user.professional_certification;
 
-    console.log(professional_certification)
 		if(professional_certification===false&&types==="publicly"){
       this.setState({
 				isshowprofes:true
@@ -43,6 +42,22 @@ class InfosTopics extends Component{
 			this.updataslist()
 		}
 	}
+	componentDidUpdate(prevProps) {
+
+		if(prevProps.current_user!=this.props.current_user){
+			let types=this.props.match.params.topicstype;
+			let professional_certification=this.props.current_user&&this.props.current_user.professional_certification;
+
+			console.log(professional_certification)
+			if(professional_certification===false&&types==="publicly"){
+				this.setState({
+					isshowprofes:true
+				})
+			}else{
+				this.updataslist()
+			}
+		}
+	}
 	updataslist=()=>{
 		let types=this.props.match.params.topicstype;
 		let { category,course_list_id,sort_by,sort_direction,page}=this.state;
@@ -258,14 +273,15 @@ class InfosTopics extends Component{
 			]
 
 		let types=this.props.match.params.topicstype;
+		let username=this.props.match.params.username;
 
-	  console.log(isshowprofes)
 
 		//types===publicly  公共
 		//types===personal  私有
 		let user_id=this.props.current_user&&this.props.current_user.user_id;
 		let user_type=this.props.current_user&&this.props.current_user.user_identity;
 		let targetuserid=this.props.data&&this.props.data.id;
+
 		const menu = (
 			<Menu>
 				<Menu.Item onClick={()=>this.updatedlist("updated_at")}>
@@ -280,9 +296,17 @@ class InfosTopics extends Component{
 			</Menu>
 		);
 		return(
-			<div className="educontent mb50">
+			<div className="educontent mb50 mt40 topicsmb141">
 				{/*提示*/}
-
+				<style>
+					{
+						`
+						.mt40{
+    					margin-top: 40px !important;
+						}
+						`
+					}
+				</style>
 				{Modalstype&&Modalstype===true?<Modals
 					modalsType={this.state.Modalstype}
 					modalsTopval={this.state.Modalstopval}
@@ -345,20 +369,18 @@ class InfosTopics extends Component{
 					<div className="clearfix topicsbox">
 						{types==="publicly"?<div className={"topcschild"}>
 							<a className={types==="personal"?"topicstopfont fr topcsactive":"topicstopfont fr"}
-								 href={`/users/innov/topics/personal`}>个人题库</a>
+								 href={`/users/${username}/topics/personal`}>个人题库</a>
 							<a className={types==="publicly"?"topicstopfont fl topcsactive":"topicstopfont fl"}
-								 href={`/users/innov/topics/publicly`}
+								 href={`/topicbank/${username}/publicly`}
 							>公共题库</a>
 						</div>:<div className={"topcschild"}>
 							<a className={types==="personal"?"topicstopfont fl topcsactive":"topicstopfont fl"}
-								 href={`/users/innov/topics/personal`}>我的题库</a>
+								 href={`/users/${username}/topics/personal`}>我的题库</a>
 							<a className={types==="publicly"?"topicstopfont fr topcsactive":"topicstopfont fr"}
-								 href={`/users/innov/topics/publicly`}
+								 href={`/topicbank/${username}/publicly`}
 							>公共题库</a>
 						</div>}
 
-
-
 						{isshowprofes===false?
 						<div>
 
@@ -383,6 +405,16 @@ class InfosTopics extends Component{
 								</div>
 
 						</div>:<div className={"professional_certificationbox"}>
+
+								<style>
+									{
+										`
+										.topicsmb141{
+										    margin-bottom: 141px !important;
+										}
+										`
+									}
+								</style>
 									<p className="clearfix ">
 										<div className={"stud-class-set pd115200 coursenavbox edu-back-white"}>
 											<div className={"sumbtongs mb10"}><img className={"topicsItemimg"} src={Withoutpermission}/></div>
@@ -423,7 +455,7 @@ class InfosTopics extends Component{
 
 
 					{isshowprofes===true?"":data===undefined?<NoneData></NoneData>:data.question_banks===undefined||data.question_banks.length===0?<NoneData></NoneData>:
-						<Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+						<Checkbox.Group style={{ width: '100%' ,minHeight:'297px'}} onChange={this.onCheckBoxChange} value={checkBoxValues}>
 							{data.question_banks.map((item,key)=>{
 					  return(
 						<div className="mt20 edu-back-white pd1323 relativef" key={key} >
@@ -458,7 +490,7 @@ class InfosTopics extends Component{
 												 href={category==="normal"?`/courses/ordinarywork/${item.id}?tab=0`:
 															 category==="group"?`/courses/groupingwork/${item.id}?tab=0`:
 															 category==="poll"?`/courses/questreediting/${item.id}/edit`:
-															 category==="exercise"?`/courses/poll/${item.id}`:
+															 category==="exercise"?`/courses/exercise/${item.id}`:
 															 category==="gtask"?`/courses/completetask/${item.id}`:
 															 category==="gtopic"?`/courses/completetopic/${item.id}`:""
 												 }

public/stylesheets/educoder/edu-main.css

@@ -170,7 +170,7 @@ input::-ms-clear{display:none;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
 .newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;}/*padding-bottom根据底部的高度而定*/
-.newMain{ padding-bottom: 120px !important; }
+.newMain{ padding-bottom: 124px !important; }
 
 /*高度*/
 .height-100{height: 100%;}