Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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>

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -175,8 +175,8 @@ class Challenges extends Component {
   //开始实战按钮
   startshixunCombat = (type, ids, path) => {
 		let { ChallengesDataList } = this.state;
+  	if(path===null){
 			let id = this.props.match.params.shixunId;
-    if (type > 3 || type === false) {
 				this.setState({
 					startbtns: true
 				})
@@ -208,9 +208,14 @@ class Challenges extends Component {
 						startbtns: false
 					})
 				});
+		}else{
+			if (type > 4 || type === false) {
+				window.location.href = path;
 			} else {
 				window.location.href = "/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + ids + path;
 			}
+		}
+
 
   }
   hidestartshixunCombattype=()=>{