调整

public/react/src/modules/courses/coursesPublic/NewShixunModel.js

@@ -22,18 +22,15 @@ class NewShixunModel extends Component{
 		}
 	}
 	componentDidMount() {
-		let{page,type,keyword,order,diff,limit}=this.state;
-		let status=this.props.statustype===undefined?'all':'published';
-		this.setState({
-			status:status
-		})
+		let{page,type,keyword,order,diff,limit,status}=this.state;
 		this.getdatalist(page,type,status,keyword,order,diff,limit)
 	}
 
-	getdatalist=(page,type,status,keyword,order,diff,limit,pagetype)=>{
+	getdatalist=(page,type,newstatus,keyword,order,diff,limit,pagetype)=>{
 		this.setState({
 			isspinning:true
 		})
+		let status=this.props.statustype===undefined?newstatus:'published';
 		let url="/shixun_lists.json"
 		axios.get(url,{params:{
 				page,
@@ -441,7 +438,7 @@ class NewShixunModel extends Component{
 														`
 													}
 												</style>
-												{JSON.stringify(item.description) == "{}"?"":<div className="newshixunmodelmidfont newradioStyles"   dangerouslySetInnerHTML={{__html: item.description}}>
+												{JSON.stringify(item.description) == "{}"?"":<div className="newshixunmodelmidfont newradioStyles" title={item.description}  dangerouslySetInnerHTML={{__html: item.description}}>
 												</div>}
 
 												{item.challenge_names.length===0?"":<div className="newshixunmodelbotfont">
@@ -530,4 +527,28 @@ class NewShixunModel extends Component{
 	}
 }
 
-export default NewShixunModel;
+export default NewShixunModel;
+
+
+// {JSON.stringify(item.content) == "{}"?<div className="newshixunmodelmidfont newradioStyles" title={item.description} dangerouslySetInnerHTML={{__html: item.description}}>
+// </div>:<div className="newshixunmodelbotfont">
+// 	{item.content.description === undefined || item.content.description===0?"":item.content.description.map((item,key)=>{
+// 		return(
+// 			<span dangerouslySetInnerHTML={{__html: item}}>{}</span>
+// 		)
+// 	})}
+// </div>}
+//
+// {JSON.stringify(item.content) == "{}"?item.challenge_names.length===0?"":<div className="newshixunmodelbotfont">
+// 	{item.challenge_names.map((item,key)=>{
+// 		return(
+// 			<span>第{key+1}关：{item}</span>
+// 		)
+// 	})}
+// </div>:<div className="newshixunmodelbotfont">
+// 	{item.content.challenge_names === undefined || item.content.challenge_names===0?"":item.content.challenge_names.map((item,key)=>{
+// 		return(
+// 			<span dangerouslySetInnerHTML={{__html: item}}>{}</span>
+// 		)
+// 	})}
+// </div>}