From 769347c77a87b1c25472753c0d55d59cebb297b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 4 Jul 2019 11:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E5=85=B3=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/shixunchild/Challenges/Challenges.js  | 55 +++++++++++--------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 5554e0370..04cbaf6a3 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -479,46 +479,41 @@ class Challenges extends Component {
 
                           {/*判断比较复杂 有排第一不能是灰色按钮*/}
                           {item.status === 2 ?
-                            <a className="edu-default-btn edu-blueline-btn fr Finish_button mtf3"
-                               onClick={() => this.startshixunCombat(false,undefined, item.challenge_id)}
+                            <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+															 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
                                // onClick={() => this.startshixunCombat(false)}
+															 title={"查看挑战关卡"}
                             >已完成</a> : ""
                           }
 
                           {
                             ChallengesDataList.allow_skip === true && item.status === 1?
-                              <a className="edu-default-btn edu-blueback-btn fr Finish_button"
+                              <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+																 title={"直接挑战"}
                                  style={{marginTop: '-2px'}}
-                                 onClick={() => this.startshixunCombat(false,undefined, item.challenge_id)}
+																 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
                                  // onClick={() => this.startshixunCombat(false)}
                               >直接挑战</a> : ""
                           }
 
 
+													{
+														ChallengesDataList.allow_skip === false ? item.status === 1?
+															<Tooltip placement="bottom" title={"直接挑战"}>
+																<a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+																	 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
+																	 style={{marginTop: '-2px'}}>直接挑战</a>
+															</Tooltip>:"":""
 
-                          {
-                            ChallengesDataList.allow_skip === false ? item.status === 1 && newstatus === 2 ?
-                              <Tooltip placement="bottom" title={item.open_game!=""?"直接挑战":"请先完成前序关卡"}>
-                                <a className={item.open_game!=""?"edu-default-btn edu-blueback-btn fr Finish_button":"edu-default-btn edu-greyback-btn fr Finish_button"}
-                                onClick={item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
-                                style={{marginTop: '-2px'}}>直接挑战</a>
-                              </Tooltip>
-
-                              : item.status === 1 && newstatus === 1 ?
-                                <Tooltip placement="bottom" title={this.props.identity<5?"直接挑战":"请先完成前序关卡"}>
-                                  <a className={this.props.identity<5&&item.open_game!=""?"edu-default-btn edu-blueback-btn fr Finish_button":"edu-default-btn edu-greyback-btn fr Finish_button"}
-                                     onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
-                                     style={{marginTop: '-2px'}}>直接挑战</a>
-                                </Tooltip> : "" : ""
+													}
 
-                          }
 
 
                           {
                            item.status === 0 ?
-                              <Tooltip placement="bottom" title={this.props.identity<5&&item.open_game!=""?"直接挑战":"请先完成前序关卡"}>
-                                <a className={this.props.identity<5&&item.open_game!=""?"edu-default-btn edu-blueback-btn fr Finish_button":"edu-default-btn edu-greyback-btn fr Finish_button"}
-                                   onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
+                              <Tooltip placement="bottom" title={"请先完成前序关卡"}>
+                                <a className={"edu-default-btn edu-greyback-btn fr Finish_button"}
+                                   // onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
                                    style={{marginTop: '-2px'}}>直接挑战</a>
                               </Tooltip>: ""
                           }
@@ -598,3 +593,19 @@ class Challenges extends Component {
 }
 
 export default Challenges;
+    // {
+		// 				ChallengesDataList.allow_skip === false ? item.status === 1 && newstatus === 2 ?
+		// 					<Tooltip placement="bottom" title={"直接挑战"}>
+		// 						<a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+		// 							 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
+		// 						style={{marginTop: '-2px'}}>直接挑战</a>
+		// 					</Tooltip>
+		//
+		// 					: item.status === 1 && newstatus === 1 ?
+		// 						<Tooltip placement="bottom" title={"直接挑战"}>
+		// 							<a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+		// 								 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
+		// 								 style={{marginTop: '-2px'}}>直接挑战</a>
+		// 						</Tooltip> : "" : ""
+		//
+		// 			}
\ No newline at end of file