调整

public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js

@@ -42,7 +42,7 @@ class CompetitionsIndex extends Component{
 		axios.get(Url,{params:{
 				category:category,
 				page:page,
-				per_page:6,
+				per_page:20,
 			}
 		}).then((response) => {
 				if(response.status===200){
@@ -123,7 +123,7 @@ class CompetitionsIndex extends Component{
 									size="large"
 									dataSource={datas&&datas}
 									renderItem={(item,key) => (
-										<Link to={`/newcompetitions/${item.identifier}/common_header`}>
+										<Link to={item.competition_status==="ended"?"":`/newcompetitions/${item.identifier}/common_header`}>
 											<div className={"CompetitionsList"} >
 											{item.description===null||item.description===undefined||item.description===""?<style>
 												{
@@ -135,7 +135,7 @@ class CompetitionsIndex extends Component{
 												}
 											</style>:""}
 											<img className={"competitonimg"}
-													 src={item.nearly_published===true?groups2:item.published===true?groups2:groups1} />
+													 src={item.competition_status==="ended"?groups1:item.competition_status==="nearly_published"?groups2:item.competition_status==="progressing"?groups3:""} />
 											<List.Item
 												key={key}
 												actions={[
@@ -186,13 +186,13 @@ class CompetitionsIndex extends Component{
 									}
 								/>
 
-								{datas===undefined?'none':datas.task_count >6 ?<div className="mb40 edu-txt-center padding20-30"
+								{datas===undefined?'none':datas.task_count >20 ?<div className="mb40 edu-txt-center padding20-30"
 								>
 
 									<Pagination
 										showQuickJumper
 										defaultCurrent={1}
-										pageSize={6}
+										pageSize={20}
 										total={count===undefined?"":count}
 										current={page}
 										onChange={this.PaginationCourse}

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js

@@ -42,8 +42,6 @@ class CompetitionCommon extends Component{
 				this.setState({
 					data:response.data
 				})
-
-				let datalist=response.data.competition_modules
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -51,6 +49,10 @@ class CompetitionCommon extends Component{
 
 	}
 
+	getrightdata=(id,typeid)=>{
+debugger
+	}
+
 	render() {
 		let {data,bannerdata}=this.state;
 		// console.log(bannerdata)
@@ -119,7 +121,11 @@ class CompetitionCommon extends Component{
 									{data&&data.competition_modules.map((item,key)=>{
 										return(
 											<Menu.Item key={item.position}>
-												<span>{item.name}</span>
+												{item.module_url===null?<span onClick={()=>this.getrightdata(item.id,item.module_type)}>{item.name}</span>:<a
+													// target="_blank"
+													// href={item.module_url}
+													onClick={()=>this.getrightdata(item.id,item.module_type)}
+												>{item.name}</a>}
 											</Menu.Item>
 										)
 									})}