From 64cfcc3eb7c6fb9c72a4d4a30929f0542ae7a887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 14 Feb 2020 14:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=BE=E5=A0=82=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/Video/Live.js   | 16 +++++------
 .../shixunHomework/ShixunhomeWorkItem.js      | 27 ++++++++++---------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/public/react/src/modules/courses/Video/Live.js b/public/react/src/modules/courses/Video/Live.js
index 5a808633f..66221fc3c 100644
--- a/public/react/src/modules/courses/Video/Live.js
+++ b/public/react/src/modules/courses/Video/Live.js
@@ -10,10 +10,10 @@ import tencent from './images/tencent.png';
 import WeiBaiTong from './images/WeiBaiTong.png';
 import douyu from './images/douyu.jpg';
 class Live extends Component{
- 
+
    render(){
       const { liveData , lives , successFunc , pageSize , changePage , page } = this.props;
-    
+
       return(
        <div className="livePanel">
           <p className="mt30 mb10 color-grey-9 pl10">EduCoder支持所有第三方直播平台，特别推荐：</p>
@@ -37,7 +37,7 @@ class Live extends Component{
               <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml20">(简明手册)</a>
             </li>
             <li>
-              <a href="https://vbconsole.zznode.com/download" target="_blank"><img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
+              <a><img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">威佰通</label>
               </a>
               <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml20">(简明手册)</a>
@@ -51,11 +51,11 @@ class Live extends Component{
                 {
                   lives.map((item,key)=>{
                     return(
-                      <LiveItem 
+                      <LiveItem
                       key={key}
-                      item={item} 
-                      {...this.props} 
-                      {...this.state} 
+                      item={item}
+                      {...this.props}
+                      {...this.state}
                       successFunc={()=>successFunc()}
                       ></LiveItem>
                     )
@@ -74,7 +74,7 @@ class Live extends Component{
             // <div className="edu-back-white">
             //   <NoneData style={{width: '100%'}}></NoneData>
             // </div>
-          } 
+          }
        </div>
      )
    }
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 5c12fe3b9..1e99756ed 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -128,7 +128,7 @@ class ShixunhomeWorkItem extends Component{
   stopPro = (event) => {
     event.stopPropagation()
   }
-  
+
   editname = (name,id,event) => {
     this.setState({
       ModalsRenametype:true,
@@ -373,8 +373,8 @@ class ShixunhomeWorkItem extends Component{
 
 
 							{this.props.isAdmin?<span onClick={(event)=>this.stopPro(event)} className={discussMessage&&discussMessage.shixun_status>1?this.props.isAdminOrCreator()?" newhomepagePostSettingname fr":" homepagePostSettingbox fr":" newwidthSettin fr"} style={{"right":"-2px","top":"6px","display":"block"}}>
-                {discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400 mr20" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>:
-                <a className={"btn colorfff font-16 fontweight400 "}>实训详情</a>
+                {discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400 mr20" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>进入学习</Link>:
+                <a className={"btn colorfff font-16 fontweight400 "}>进入学习</a>
                 }
 
 
@@ -388,26 +388,27 @@ class ShixunhomeWorkItem extends Component{
                 discussMessage.time_status<5?
 								<WordsBtn  style="blue" className="colorblue font-16 mr20 fr mt2 ">
 									{startbtn===false?
-										(discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ?
+										(discussMessage.task_operation[0] == '进入学习' || discussMessage.task_operation[0] == '进入学习' ?
 											<a className="btn colorblue" href={getTaskUrlById(discussMessage.task_operation[1])}>
-												{discussMessage.task_operation[0]}
+												{/*{discussMessage.task_operation[0]}*/}
+                        进入学习
 											</a>
 											:
 											<a className="btn colorblue" onClick={()=>this.taskoperationId(discussMessage.task_operation[1])}>
-												{discussMessage.task_operation[0]}
-											</a>):<a className="btn colorblue" >开启中</a>}
+                        进入学习
+											</a>):<a className="btn colorblue" >进入中</a>}
 								</WordsBtn>:"":"":"":""
 							}
 
-              {  this.props.isAdmin?<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品详情</a>:""}
+              {  this.props.isAdmin?<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品列表</a>:""}
 
               {
-                this.props.isStudent? <a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr mt2">作品详情</a>:""
+                this.props.isStudent? <a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr mt2">作品列表</a>:""
               }
 
               {
                 this.props.isNotMember===true? this.props.discussMessage.private_icon===true?""
-                  :<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品详情</a>:""
+                  :<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品列表</a>:""
               }
 
 
@@ -440,9 +441,9 @@ class ShixunhomeWorkItem extends Component{
                     { <div className=" color-grey9 task-hide fr" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5||discussMessage.time_status===6?{"maxWidth":"216px"}:{"maxWidth":"550px"}} title={discussMessage.upper_category_name}>所属目录：{discussMessage.upper_category_name}</div>}
                   </ConditionToolTip>
                 }
-                
-                
-                
+
+
+
 
                 {/* { discussMessage.replies_count != 0 && <span className="mr15 color-grey9">{discussMessage.replies_count} 回复</span> }
                 { discussMessage.praise_num != 0 && <span className="mr15 color-grey9">{discussMessage.praise_num} 点赞</span> }