From 754637502b9a6f9c293f1439d38a4a8bbc9939f1 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Thu, 12 Mar 2020 16:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8D=A1-=E5=BC=80=E5=90=AF=E6=8C=91?=
 =?UTF-8?q?=E6=88=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpm/shixunchild/Challenges/Challenges.js  | 132 ++++++++++++------
 .../shixunchild/shixunchildCss/Challenges.css |  24 ++++
 2 files changed, 117 insertions(+), 39 deletions(-)

diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index bec9f5dde..e5494e8e3 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -24,15 +24,15 @@ class Challenges extends Component {
       startbtns: false,
       sumid: "",
       sumidtype: false,
-      startshixunCombattype: false,
-      shixunsreplace: false,
-      shixunsmessage: "",
-      hidestartshixunsreplacevalue: "",
-      operationstrue: false,
-      isSpin: false,
-      boxoffsetHeigh: 0,
-      opentitletype: true,
-      isopentitletype: "Less",
+      startshixunCombattype:false,
+      shixunsreplace:false,
+      shixunsmessage:"",
+      hidestartshixunsreplacevalue:"",
+      operationstrue:false,
+			isSpin:false,
+      boxoffsetHeigh:0,
+      opentitletype:true,
+      isopentitletype:"Less"
     }
   }
 
@@ -357,6 +357,50 @@ class Challenges extends Component {
     })
   }
 
+  // 开启挑战
+  beginChallenge=(url)=>{
+    if (this.props.checkIfLogin() === false) {
+      this.props.showLoginDialog()
+      return;
+    }
+    if (this.props.checkIfProfileCompleted() === false) {
+      this.setState({
+        AccountProfiletype: true
+      })
+      return;
+    }
+    this.setState({
+      startbtns:true
+    })
+    if(url.indexOf(".json")>-1){
+      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) {
+          this.setState({
+            startbtns: false
+          })
+        }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;
+        }
+      }).catch((error) => {
+
+      });
+    }else{
+      window.location.href=url;
+    }
+  }
+
   render() {
     let { ChallengesDataList, startbtns, sumidtype, startshixunCombattype, shixunsreplace, shixunsmessage, hidestartshixunsreplacevalue, operationstrue, AccountProfiletype } = this.state;
     let { loadingContent } = this.props;
@@ -695,38 +739,31 @@ class Challenges extends Component {
                             </span>
                           </div>
 
-
-                          <div className="clearfix mb5">
-                            {/*onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editquestion")}*/}
-                            {this.props.identity < 5 ?
-                              item.st === 1 ?
-                                <div className="font-16 color05101a fonthiddens">{item.name}</div>
-                                :
-                                <div className="font-16 color05101a fonthiddens">{item.name}</div> : <div
+                        <div className="challengtes_Item">
+                          <div className="flex1">   
+                            <div className="clearfix mb5">
+                              {/*onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editquestion")}*/}
+                              {this.props.identity<5?
+                                item.st === 1 ?
+                                  <div className="font-16 color05101a fonthiddens">{item.name}</div>
+                                  :
+                                  <div className="font-16 color05101a fonthiddens">{item.name}</div>:<div
                                   // onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
                                   className="font-16 color05101a fonthiddens">{item.name}</div>
-                            }
-                            {/* onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editcheckpoint")}*/}
-
-                            <Modal
-                              keyboard={false}
-                              visible={startbtns}
-                              closable={false}
-                              footer={null}
-                              className="startbtnModal"
-                            >
-                              <Spin size="large" />
-                            </Modal>
+                              }
+                              {/* onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editcheckpoint")}*/}
 
-                          </div>
-                          <div className="clearfix">
+                              
+
+                            </div>
+                            <div className="clearfix">
                             <style>
                               {
                                 `
-                              .task-colspan {
-                                min-width: 18% !important;
-                                }
-                              `
+                                .task-colspan {
+                                  min-width: 18% !important;
+                                  }
+                                `
                               }
                             </style>
                             <span className="task-colspan"><span className={"shixunbingbaocun12"}>正在挑战： </span><span className={"shixunbingbaocun33312"}>{item.playing_count}人</span></span>
@@ -734,10 +771,28 @@ class Challenges extends Component {
                             <span className="task-colspan"><span className={"shixunbingbaocun12"}>可获经验： </span><span className={"shixunbingbaocun33312"}>{item.score}点</span></span>
 
                           </div>
-                        </div>
-                      )
-                    })}
+                          </div>
+                          {
+                            item.open_game ?
+                            <a onClick={()=>this.beginChallenge(item.open_game)} className="challengeBtn blue">开启挑战</a>   
+                            :
+                            <span className="challengeBtn">开启挑战</span>   
+                          }
+                        </div> 
+                      </div>
+                    )
+                  })}
             </div>
+            <Modal
+              keyboard={false}
+              visible={startbtns}
+              closable={false}
+              footer={null}
+              className="startbtnModal"
+              centered={true}
+            >
+              <Spin size="large" />
+            </Modal>
             <Modal
               keyboard={false}
               title="提示"
@@ -760,7 +815,6 @@ class Challenges extends Component {
               </div>
 
             </Modal>
-
             <Modal
               keyboard={false}
               title="提示"
diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
index abfafc46a..69661463d 100644
--- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
+++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
@@ -262,4 +262,28 @@
 
 .boreee{
     border-bottom: 1px solid #F4F4F4;
+}
+.challengtes_Item{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.flex1{
+    flex: 1;
+    width: 0;
+}
+.challengeBtn{
+    height:40px;
+    line-height: 38px;
+    padding:0px 27px;
+    color: #C0C4CC!important;
+    font-size: 16px;
+    border:1px solid rgba(235,235,235,1);
+    border-radius:4px;
+    margin-left: 15px;
+}
+.challengeBtn.blue{
+    background: #F2F8FE;
+    border:1px solid rgba(64,158,255,1);
+    color: #409EFF!important;
 }
\ No newline at end of file