From 2d8776952ca00d068fd95c9e5710ffa16b43658e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 3 Jul 2019 17:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=8A=9F=E8=83=BD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpm/challengesnew/TPMevaluation.js        |  4 +-
 .../tpm/shixunchild/Challenges/Challenges.js  | 77 ++++++++++---------
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 036197229..61c5dd977 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -914,11 +914,9 @@ export default class TPMevaluation extends Component {
                     <div className="edu-back-white mb10 clearfix">
                         <div className="padding40-20">
                             <p className="color-grey-6 font-16 mb20">效果展现方式</p>
-                            <div className="pr" onMouseLeave={this.handpathoptionvaluess}>
+                            <div className="pr">
                                 <Select className="winput-240-40"
                                         value={pathoptionvalue}
-                                        onMouseEnter={this.handpathoptionvalues}
-                                        open={handpathopt}
                                         onChange={this.handpathoptionvalue}>
                                     <Option value={-1}>请选择效果展现方式</Option>
                                     <Option value={1}>图片</Option>
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index a0f354e4a..071b8ff93 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -174,43 +174,48 @@ class Challenges extends Component {
   }
   //开始实战按钮
   startshixunCombat = (type, ids, path) => {
-    let { ChallengesDataList } = this.state;
-    let id = this.props.match.params.shixunId;
-    if (type > 3 || type === false) {
-      this.setState({
-        startbtns: true
-      })
-      let url = "/shixuns/" + id + "/shixun_exec.json";
-      axios.get(url).then((response) => {
+		let { ChallengesDataList } = this.state;
+  	if(path===null){
+			let id = this.props.match.params.shixunId;
+				this.setState({
+					startbtns: true
+				})
+				let url = "/shixuns/" + id + "/shixun_exec.json";
+				axios.get(url).then((response) => {
+
+					if (response.data.status === -2) {
+						this.setState({
+							startbtns:false,
+							shixunsreplace:true,
+							hidestartshixunsreplacevalue:response.data.message+".json"
+						})
+					} else if (response.data.status === -1) {
+						console.log(response)
+					}else if(response.data.status===-3){
+						this.setState({
+							shixunsmessage:response.data.message,
+							startshixunCombattype:true,
+							startbtns:false
+						})
+					} else {
+						window.location.href = "/tasks/" + response.data.game_identifier;
+						// window.location.href = path
+						// let path="/tasks/"+response.data.game_identifier;
+						// this.props.history.push(path);
+					}
+				}).catch((error) => {
+					this.setState({
+						startbtns: false
+					})
+				});
+		}else{
+			if (type > 4 || type === false) {
+				window.location.href = path;
+			} else {
+				window.location.href = "/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + ids + path;
+			}
+		}
 
-        if (response.data.status === -2) {
-          this.setState({
-            startbtns:false,
-            shixunsreplace:true,
-            hidestartshixunsreplacevalue:response.data.message+".json"
-          })
-        } else if (response.data.status === -1) {
-          console.log(response)
-        }else if(response.data.status===-3){
-          this.setState({
-            shixunsmessage:response.data.message,
-            startshixunCombattype:true,
-            startbtns:false
-          })
-        } else {
-           window.location.href = "/tasks/" + response.data.game_identifier;
-           // window.location.href = path
-          // let path="/tasks/"+response.data.game_identifier;
-          // this.props.history.push(path);
-        }
-      }).catch((error) => {
-        this.setState({
-          startbtns: false
-        })
-      });
-    } else {
-      window.location.href = "/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + ids + path;
-    }
 
   }
   hidestartshixunCombattype=()=>{