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 5554e0370..4ef6abfa3 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -479,48 +479,43 @@ 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-blueline-btn fr Finish_button mtf3"}
+															 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>: ""
+                              </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