From 80724a458ded0fba429287abfa8533907d4bb55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 28 Oct 2019 15:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competitioncommon/CompetitionCommon.js    | 42 ++++++++++++++-----
 .../CompetitionContentsChart.js               |  2 +
 .../page/layers/ImageLayerOfCommentHOC.js     |  2 +-
 public/react/src/modules/tpm/TPMIndexHOC.js   |  4 +-
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index 8712ec907..6fa5f0c9f 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -31,6 +31,9 @@ class CompetitionCommon extends Component{
 		window.document.title = '竞赛';
 		if(this.props.match.params.identifier!=null){
 			this.getbannerdata();
+			// this.setState({
+			// 	thiskeys:this.props.location.search.replace('?menu=', '')
+			// })
 			// let url=`/competitions/${this.props.match.params.identifier}.json`;
 			// axios.get(url).then((response) => {
 			// 	if(response.status===200){
@@ -45,19 +48,34 @@ class CompetitionCommon extends Component{
 	}
 
 	getbannerdata=()=>{
+		let menuid=this.props.location.search.replace('?menu=', '');
 		let url=`/competitions/${this.props.match.params.identifier}/common_header.json`;
 		axios.get(url).then((response) => {
 			if(response.status===200){
 				this.setState({
-					data:response.data,
-					thiskeys:response.data.competition_modules[0].id
+					 data:response.data,
+					 thiskeys:menuid===undefined||menuid===""?response.data.competition_modules[0].id:menuid
 				})
-				this.getrightdata(
-					response.data.competition_modules[0].id,
-					response.data.competition_modules[0].module_type,
-				  response.data.competition_modules[0].module_url,
-					response.data.competition_modules[0].has_url
-				)
+				if(menuid===undefined||menuid===""){
+					this.getrightdata(
+						response.data.competition_modules[0].id,
+						response.data.competition_modules[0].module_type,
+						response.data.competition_modules[0].module_url,
+						response.data.competition_modules[0].has_url
+					)
+				}else{
+					let newlist=response.data.competition_modules;
+					newlist.map((item,key)=>{
+						if(`${item.id}`===`${menuid}`){
+							this.getrightdata(
+								item.id,
+								item.module_type,
+								item.module_url,
+								item.has_url
+							)
+						}
+					})
+				}
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -83,6 +101,7 @@ class CompetitionCommon extends Component{
 	getrightdatas=(e)=>{
      let keys=parseInt(e.key);
 	   this.getlistdata(keys)
+		 this.props.history.replace(`?menu=${keys}`);
 	}
 
 	getlistdata=(keys,listkey)=>{
@@ -109,7 +128,7 @@ class CompetitionCommon extends Component{
 					if(response.status===200){
 						this.setState({
 							chart_rules:response.data,
-							tabkey:tabkey===undefined?response.data.stages[0].id===null?"0":`${response.data.stages[0].id}`:tabkey
+						  tabkey:tabkey===undefined?response.data.stages[0].id===null?"0":`${response.data.stages[0].id}`:tabkey
 						})
 
 
@@ -121,6 +140,7 @@ class CompetitionCommon extends Component{
 	}
 
 	getrightdata=(id,typeid,module_url,has_url,listkey)=>{
+
 		// if(typeid==="enroll"){
 		// 	this.props.history.replace(`/competitions/${this.props.match.params.identifier}/enroll`);
     //   return
@@ -234,8 +254,8 @@ class CompetitionCommon extends Component{
 	}
 
 	render() {
-		let {data,has_url,module_type,Competitionedittype,mdContentdata}=this.state;
-
+		let {data,thiskeys,Competitionedittype}=this.state;
+    console.log(thiskeys)
 		return (
 			data===undefined?"":<div className={"educontent clearfix mt20 "}>
 
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
index f4c3a94d5..5e2dec3bc 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
@@ -30,6 +30,7 @@ class CompetitionContents extends Component{
 			}).catch((error) => {
 			console.log(error)
 		})
+		this.props.MdifHasAnchorJustScorll();
 	}
 
 	derivefun=(url)=>{
@@ -65,6 +66,7 @@ class CompetitionContents extends Component{
 		});
 	}
 	render() {
+		this.props.MdifHasAnchorJustScorll();
 		const operations = <div>
 				<Button className={"fr"} type="primary" ghost onClick={()=>this.props.Competitionedit()}>编辑</Button>
 				<Button className={"fr mr20"} type="primary" ghost>
diff --git a/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js b/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
index 7c10b90d7..bb55fa6c3 100644
--- a/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
+++ b/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
@@ -67,7 +67,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
 					let anchorElement = document.getElementsByName(anchor);
 					if (anchorElement) {
 						if (anchorElement.length!=0) {
-							anchorElement[0].scrollIntoView();
+							anchorElement[anchorElement.length-1].scrollIntoView();
 						}
 					}
 				}
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 77f04c0be..7b665ba0a 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -617,8 +617,8 @@ export function TPMIndexHOC(WrappedComponent) {
 				if (!!anchor) {
 					let anchorElement = document.getElementsByName(anchor);
 					if (anchorElement) {
-						if (anchorElement.length!=0) {
-							anchorElement[1].scrollIntoView();
+						if (anchorElement.length>0){
+							anchorElement[anchorElement.length-1].scrollIntoView();
 						}
 					}
 				}