From 86ae7000241abbd6cfeb942c19451c3b399a75cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 17 Aug 2019 11:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paths/PathDetail/PathDetailIndex.js       | 59 +++++++++++--------
 .../react/src/modules/paths/ShixunPathCard.js |  2 +-
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index 98ae10a51..00594b921 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -69,6 +69,9 @@ class PathDetailIndex extends Component{
   constructor(props){
     super(props)
     this.state={
+			progress:undefined,
+			tags:undefined,
+			members:undefined,
       detailInfoList:undefined,
       clickdetailInfoListtype:false,
       Modalstype:false,
@@ -95,16 +98,17 @@ class PathDetailIndex extends Component{
 
     }
     const items = reorder(
-        this.state.detailInfoList.members,
+        this.state.members,
         result.source.index,
         result.destination.index
     );
-     this.state.detailInfoList.members=items;
+
     this.setState({
       detailInfoList:this.state.detailInfoList,
+			members:items,
       items
     });
-    console.log(this.state.detailInfoList.members)
+    console.log(this.state.members)
     console.log("items 数组数组数组数组")
     console.log(items)
   }
@@ -166,7 +170,7 @@ class PathDetailIndex extends Component{
     })
 
 
-		let righturl="/paths/"+pathid+"right_banner.json";
+		let righturl="/paths/"+pathid+"/right_banner.json";
 		axios.get(righturl).then((result)=>{
 			if (result.data.status === 407 || result.data.status === 401) {
 				debugger
@@ -181,6 +185,9 @@ class PathDetailIndex extends Component{
 
 			this.setState({
 				// detailInfoList:result.data,
+				tags:result.data.tags,
+				progress:result.data.progress,
+				members:result.data.members,
 				items:  getItems(result.data.members.length),
 			})
 
@@ -305,9 +312,10 @@ class PathDetailIndex extends Component{
         console.log("上移");
         // console.log(this.state.detailInfoList.members);
         // console.log(response);
-        this.state.detailInfoList.members=response.data.members;
+
         this.setState({
           detailInfoList:this.state.detailInfoList,
+					members:response.data.members
         });
         // console.log(this.state.detailInfoList.members);
 
@@ -330,9 +338,9 @@ class PathDetailIndex extends Component{
          console.log("下移");
          // console.log(this.state.detailInfoList.members);
          // console.log(response);
-         this.state.detailInfoList.members=response.data.members;
          this.setState({
            detailInfoList:this.state.detailInfoList,
+					 members:response.data.members
          });
          // console.log(this.state.detailInfoList.members);
        }
@@ -352,10 +360,13 @@ class PathDetailIndex extends Component{
       Modalsbottomval,
       cardsModalcancel,
       cardsModalsave,
-      loadtype
+      loadtype,
+			progress,
+			members,
+			tags,
     } = this.state
 
-
+     console.log(this.props.checkIfLogin())
     return(
       <div className="newContainer">
 				<style>
@@ -426,14 +437,14 @@ class PathDetailIndex extends Component{
                     }
                   </div>
                 </div>
-                {detailInfoList === undefined ? "" : detailInfoList.tags === null ? "":
+                {tags === undefined ? "" :tags === null ? "":
                   <div className="edu-back-white padding40-20 mb10 relative">
-                    <p className="font-16 mb20">技能标签 <span className="color-grey-c">{detailInfoList.tags.length}</span></p>
+                    <p className="font-16 mb20">技能标签 <span className="color-grey-c">{tags.length}</span></p>
 
                       <div className={clickdetailInfoListtype===false?"newedbox newedboxheight":"newedbox newminheight"}>
                           <div className="clearfix" id="boxheight">
                             {
-                              detailInfoList.tags && detailInfoList.tags.map((item,key)=>{
+                             tags && tags.map((item,key)=>{
                                 return(
                                   <span value={key} className = {item.status == true ? "edu-filter-btn29BD8B fl" : "newedu-filter-btn fl"}>{item.tag_name}</span>
                                 )
@@ -443,7 +454,7 @@ class PathDetailIndex extends Component{
                       </div>
 
 										<Tooltip placement="bottom" title={"显示全部"}>
-                    <div className={detailInfoList.tags.length>15&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
+                    <div className={tags.length>15&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
                          onClick={()=>this.clickNewsubscript(0)}
                     ><span className="mr8">...</span><Icon type="caret-down" />
                     </div>
@@ -458,29 +469,29 @@ class PathDetailIndex extends Component{
                   </div>
                 }
                 {
-									this.props.checkIfLogin()===false?"":detailInfoList === undefined ? "" : detailInfoList.progress === null ? "" :
+									this.props.checkIfLogin()===false?"123213":progress === undefined ? "" : progress === null ? "" :
                   <div className="edu-back-white myProgress padding40-20 mb10">
                     <p className="mb20">
                       <span className="font-16 mr10">我的进展</span>
                       <Tooltip placement="bottom" title="获得经验值/总经验值">
-                          <span className="color-green"  >{detailInfoList.progress.my_score} / {detailInfoList.progress.all_score}</span>
+                          <span className="color-green"  >{progress.my_score} / {progress.all_score}</span>
                       </Tooltip>
                     </p>
                     <p className="clearfix mb10">
-                      <span className="fl color-green">已学 {detailInfoList.progress.learned}%</span>
-                      <span className="fr color-grey-9" id="time-consuming">学习耗时{this.timeStamp(detailInfoList.progress.time)} </span>
+                      <span className="fl color-green">已学 {progress.learned}%</span>
+                      <span className="fr color-grey-9" id="time-consuming">学习耗时{this.timeStamp(progress.time)} </span>
                     </p>
-                    <div className="myProgressNav"><div className="myProgressGreen" style={{"width":`${detailInfoList.progress.learned+"%"}`}}></div></div>
+                    <div className="myProgressNav"><div className="myProgressGreen" style={{"width":`${progress.learned+"%"}`}}></div></div>
                   </div>
                 }
 
                 {
-                  detailInfoList ===undefined ?"":detailInfoList.members === null ?"":
+									members ===undefined ?"":members === null ?"":
                   <div className="teacherTeam edu-back-white clearfix" id="subject_members">  
                     <p className="font-16 clearfix">教学团队</p>
 
-                    { detailInfoList===undefined?
-                      detailInfoList.members && detailInfoList.members.map((item,key)=>{
+                    { members===undefined?
+                       members && members.map((item,key)=>{
                         return(
                             <div className="teacherTeamItem clearfix df" key={key}>
                               <a href={item.user_url} target="_blank" className="fl">
@@ -501,8 +512,8 @@ class PathDetailIndex extends Component{
                             </div>
                         )
                       })
-                    :detailInfoList.allow_add_member===true?
-                            detailInfoList.members && detailInfoList.members.map((item,key)=>{
+                    :detailInfoList===undefined?"":detailInfoList.allow_add_member===true?
+                            members && members.map((item,key)=>{
                               return(
                                   <div className="teacherTeamItem clearfix df" key={key}>
                                     <a href={item.user_url} target="_blank" className="fl">
@@ -524,7 +535,7 @@ class PathDetailIndex extends Component{
                                       {
                                         detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
 																						{key!=0?<div className="fr ml15 flex1"><a onClick={()=>this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div>:""}
-																						{key+1!=detailInfoList.members.length?<div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>:""}
+																						{key+1!= members&&members.length?<div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>:""}
                                             </div>
                                               :""
                                       }
@@ -533,7 +544,7 @@ class PathDetailIndex extends Component{
                                   </div>
                               )
                             })
-                            : detailInfoList.members && detailInfoList.members.map((item,key)=>{
+                            : members && members.map((item,key)=>{
                           return(
                               <div className="teacherTeamItem clearfix df" key={key}>
                                 <a href={item.user_url} target="_blank" className="fl">
diff --git a/public/react/src/modules/paths/ShixunPathCard.js b/public/react/src/modules/paths/ShixunPathCard.js
index 9df1c7700..79b9c1e13 100644
--- a/public/react/src/modules/paths/ShixunPathCard.js
+++ b/public/react/src/modules/paths/ShixunPathCard.js
@@ -60,7 +60,7 @@ class ShixunPathCard extends Component{
 
 
 											{
-												item.excellent === true ? "" :
+												item.excellent === false ? "" :
 													<div className="tag-orange">
 														<span className="tag-name">开放课程</span>
 													</div>