From e3ff332d27a52f145999a34e4a07a280099d63b2 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 13:57:05 +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

---
 public/react/src/modules/courses/Resource/index.js  | 13 ++++++-------
 .../tpm/shixunchild/Challenges/Challenges.js        | 11 ++++++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 8ce285ae1..f26d97ad3 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -176,8 +176,8 @@ class Fileslists extends Component{
           let list=result.data.data;
           this.setState({
             total_count:list.total_count,
-            public_count:list.public_count,
-            private_count:list.private_count,
+						publish_count:list.publish_count,
+						unpublish_count:list.unpublish_count,
             files:list.files,
             filesId:list.id,
             name:list.name,
@@ -625,13 +625,12 @@ class Fileslists extends Component{
 		})
 	}
   render(){
-
     let { searchValue,
       checkBoxValues,
       checkAllValue,
       total_count,
-      public_count,
-      private_count,
+			publish_count,
+			unpublish_count,
       files,
       sorttype,
       Modalstype,
@@ -766,8 +765,8 @@ class Fileslists extends Component{
                 secondRowLeft={
                   <div style={{"display":"inline-block", "marginTop": "22px"}}>
                     <span>共 {total_count} 个资源</span>
-                    <span style={{"marginLeft":"16px"}}>已发布：{public_count}个</span>
-                    <span style={{"marginLeft":"16px"}}>未发布：{private_count}个</span>
+                    <span style={{"marginLeft":"16px"}}>已发布：{publish_count}个</span>
+                    <span style={{"marginLeft":"16px"}}>未发布：{unpublish_count}个</span>
                   </div>
                 }
                 onPressEnter={this.onPressEnter}
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 04cbaf6a3..d0a6acbef 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -479,7 +479,7 @@ class Challenges extends Component {
 
                           {/*判断比较复杂 有排第一不能是灰色按钮*/}
                           {item.status === 2 ?
-                            <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+                            <a className={"edu-default-btn edu-blueline-btn fr Finish_button mtf3"}
 															 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
                                // onClick={() => this.startshixunCombat(false)}
 															 title={"查看挑战关卡"}
@@ -510,12 +510,17 @@ class Challenges extends Component {
 
 
                           {
-                           item.status === 0 ?
+                           item.status === 0 ?this.props.identity>2?
                               <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>: ""
+                              </Tooltip>: <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)}
+														 >直接挑战</a>:""
                           }