From 3c322a38c3d1c201305b2d6fac6d79fea4b002ab 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, 29 Aug 2019 09:30:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A2=98=E5=BA=93=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/user/usersInfo/InfosTopics.js | 104 ++++++++++--------
 .../src/modules/user/usersInfo/usersInfo.css  |  10 +-
 2 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index ff06f1522..e7a35b851 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -117,7 +117,8 @@ class InfosTopics extends Component{
 			category,
 			course_list_id,
 			isSpin,
-			data
+			data,
+			page
 		} = this.state;
 
 		let categorylist=[
@@ -128,9 +129,53 @@ class InfosTopics extends Component{
 			{val:"试卷",type:"exercise"},
 			{val:"问卷",type:"poll"},
 			]
+
+		let types=this.props.match.params.topicstype;
+
+		console.log(types)
+
+		//types===publicly  公共
+		//types===personal  私有
 		return(
 			<div className="educontent mb50">
 				{/*提示*/}
+				<style>
+
+					{
+						`
+							.shaiContent li.shaiItem {
+									padding: 3px 15px;
+									float: left;
+									border-radius: 4px;
+									color: #4C4C4C;
+									cursor: pointer;
+									margin-right: 20px;
+									display: block;
+									margin-bottom: 5px;
+							}
+
+							.mr38{
+							  margin-right:38px;
+							}
+
+							.maxwidth900{
+									max-width: 900px;
+									overflow:hidden;
+									text-overflow:ellipsis;
+									white-space:nowrap
+							}
+
+						 .homepagePostSettingname{
+							 width:192px !important;
+						 }
+
+						 .homepagePostSettingbox{
+							 width:139px !important;
+						 }
+
+						 	`
+					}
+				</style>
 				<Modals
 					modalsType={this.state.Modalstype}
 					modalsTopval={this.state.Modalstopval}
@@ -148,30 +193,14 @@ class InfosTopics extends Component{
 						<div className={"topcsmid"}>
 							{categorylist.map((item,key)=>{
 								return(
-									<span key={key} className={category===item.type?"topicsmidfont fl mr20 topcsactive":"topicsmidfont fl mr20"} onClick={()=>this.searchCategory(item.type)}>{item.val}</span>
+									<span key={key} className={category===item.type?"topicsmidfont fl mr38 topcsactive":"topicsmidfont fl mr38"} onClick={()=>this.searchCategory(item.type)}>{item.val}</span>
 								)
 							})}
 
 						</div>
-           <style>
 
-						 {
-						 	`
-							.shaiContent li.shaiItem {
-									padding: 3px 15px;
-									float: left;
-									border-radius: 4px;
-									color: #4C4C4C;
-									cursor: pointer;
-									margin-right: 20px;
-									display: block;
-									margin-bottom: 5px;
-							}
-						 	`
-						 }
-					 </style>
 						<div className={"shaiContent"}>
-							<div className="fl pr shaiAllItem pagetype mb20">
+							<div className="fl pr topicsItem pagetype mb20">
 								<li className={course_list_id===undefined?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"}  onClick={()=>this.searchCourselistid(undefined)}>全部</li>
 								{data===undefined?"":data.course_list===undefined||data.course_list.length===0?"":data.course_list.map((item,key)=>{
 									return(
@@ -191,35 +220,28 @@ class InfosTopics extends Component{
 						<p className="font-12 alltopiscright ml25 fr">
 								<span className="fr color-grey-9 mr10">最近更新</span>
 								<span className="fr mr30 topcsactive">发送</span>
-								<span className="fr mr30 topcsactive">删除</span>
+							{types==="personal"?<span className="fr mr30 topcsactive">删除</span>:""}
 						</p>
 					</div>
 
 
 					{data===undefined?<NoneData></NoneData>:data.question_banks===undefined||data.question_banks.length===0?<NoneData></NoneData>:data.question_banks.map((item,key)=>{
 					return(
-						<div className="mt20 edu-back-white pd1323" key={key} >
+						<div className="mt20 edu-back-white pd1323 relativef" key={key} >
 							<div className="clearfix">
 								{/*id: 4269*/}
 
 								<div className="item-body">
 
 									<div className="clearfix ds pr pt5 contentSection" >
-										<style>{`
-													.maxwidth580{
-															max-width: 580px;
-															overflow:hidden;
-															text-overflow:ellipsis;
-															white-space:nowrap
-													}
-												`}
-										</style>
 
 									  <a title={item.name} className="fl mt3 font-16  color-dark maxwidth580">
 											{item.name}
 									  </a>
 
-										{item.is_public===true?<span className="edu-filter-btn ml15 fl typestyle mt7 topiscfilterbtn">公开</span>:""}
+										{item.is_public===false?<span className="edu-filter-btn ml15 fl typestyle mt7 topiscfilterbtn">公开</span>:""}
+
+										{types==="personal"&&item.is_public===false?<a className="btn colorblue mr25 fr font-16">设为公开</a>:""}
 
 										<div className="cl"></div>
 
@@ -232,23 +254,9 @@ class InfosTopics extends Component{
 											<span className="topicsbtn">{item.course_list_name}</span>
 										</p>
 
-										<style>
-											{
-												`
-												 .homepagePostSettingname{
-													 width:192px !important;
-												 }
-												 .homepagePostSettingbox{
-													 width:139px !important;
-												 }
-												`
-											}
-										</style>
-
-									   {/*<div className={"homepagePostSetting homepagePostSettingname"} style={{"right":"-2px","top":"44px","display":"block"}}>*/}
-											{/*<a className="btn colorblue font-16" target={"_blank"}>实训详情</a>*/}
-										{/*</div>*/}
-
+										<div className="homepagePostSetting homepagePostSettingname topscisright">
+											{types==="personal"?<a className="btn colorblue mr25 font-16 fr">编辑</a>:""}
+										</div>
 									</div>
 								</div>
 								
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 0374dd765..c1e7bf849 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -339,4 +339,12 @@
     border-radius: 5px;
     border: 1px solid #4CACFF !important;
     line-height: 23px !important;
-}
\ No newline at end of file
+}
+
+.topscisright{
+    right: -2px;
+    top: 50px;
+    display: block;
+    position: absolute;
+}
+