调整

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

@@ -144,7 +144,8 @@ class CompetitionsIndex extends Component{
 													<span>报名截止时间：{item.enroll_end_time}</span>,
 												]}
 												extra={
-													<div className={"pt50"} style={{"width":'305px'}}>
+													<div className={"pt50"} style={{"width":'314px'}}>
+
 														<Row gutter={16}>
 															<Col className="gutter-row" span={6}>
 																<div className="gutter-box CompetitionsIndexdadels">奖金</div>

public/react/src/modules/competitions/Competitimain/Competitionsindex.css

@@ -88,7 +88,8 @@
 }
 
 .CompetitionsIndex .gutter-row{
-   margin-right:20px;
+   /*margin-right:20px;*/
+    width: 33%;
 }
 
 .pt50{

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

@@ -373,7 +373,15 @@ class CompetitionCommon extends Component{
 									className={"color000"}>{data && data.start_time}～{data && data.end_time}</span></Col>
 								{/*<Col></Col>*/}
 							</Col>
-
+							<style>
+								{
+									`
+								  	.ant-col-6{
+												width: 30%;
+										}
+									  `
+								}
+							</style>
 							<Col className={"competitionbannerdiv mt10"}>
 								<Row gutter={16}>
 									<Col className="gutter-row" span={6}>

public/react/src/modules/osshackathon/Osshackathon.js

@@ -11,13 +11,34 @@ class Osshackathon extends Component {
 	constructor(props) {
 		super(props)
 		this.state = {
-
+			page:1,
+			limit:10,
+			search:undefined
 		}
 	}
 
 	componentDidMount() {
+		this.getosshackathon();
 
 	}
+	getosshackathon=()=>{
+		let {page,limit,search}=this.state;
+		let url=`/osshackathon.json`;
+		axios.get(url,{params:{
+				page:page,
+				limit:limit,
+				search:search,
+			}}).then((result)=>{
+			if(result.status==200){
+				console.log(result)
+				this.setState({
+
+				})
+			}
+		}).catch((error)=>{
+			console.log(error);
+		})
+	}
 
 	componentDidUpdate = (prevProps) => {