Merge branches 'dev_Ysm' and 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

dev_aliyun_beta
杨树明 6 years ago
commit f49e561e90

@ -12,7 +12,7 @@ class AttachmentsList extends Component{
{ {
attachments.map((item,key)=>{ attachments.map((item,key)=>{
return( return(
<p key={key}> <p key={key} className="clearfix mb3">
<a className="color-grey fl"> <a className="color-grey fl">
<i className="font-14 color-green iconfont icon-fujian mr8"></i> <i className="font-14 color-green iconfont icon-fujian mr8"></i>
</a> </a>

@ -59,7 +59,7 @@ class GraduateTopicDetailTable extends Component{
</div> </div>
{ {
topicInfo && topicInfo.attachment_list.length>0 && topicInfo && topicInfo.attachment_list.length>0 &&
<p className="mt30"> <div className="mt30">
{/* { {/* {
topicInfo.attachment_list.map((item,key)=>{ topicInfo.attachment_list.map((item,key)=>{
return( return(
@ -75,7 +75,7 @@ class GraduateTopicDetailTable extends Component{
}) })
} */} } */}
<AttachmentList {...this.props} {...this.state} attachments = {topicInfo.attachment_list}></AttachmentList> <AttachmentList {...this.props} {...this.state} attachments = {topicInfo.attachment_list}></AttachmentList>
</p> </div>
} }
</div> </div>
<div className="mt30"> <div className="mt30">

Loading…
Cancel
Save