Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/message/js/MessagSub.js

@@ -495,10 +495,10 @@ class MessagSub extends Component{
 			 <div className="bor-top-greyE mycenter">
 				 {/*这里可以进行数据处理*/}
 				 <div className="myw100baifenbi">
-				 <Spin size="large" className="myw100baifenbi" spinning={isSpin}>
+				 <Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
 
 					 {
-						 data===undefined?
+						 data===undefined?"":data.length===0?
 							 <div className="edu-tab-con-box clearfix edu-txt-center">
 								 <img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
 								 <p className="edu-nodata-p mb20">暂无数据哦~</p>
@@ -562,7 +562,7 @@ class MessagSub extends Component{
 													 	`
 													 }
 												 </style>
-												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body mt3" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
+												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body mt10" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
 											 </div>
 
 											 <span className={item.new_tiding===true?"new-point fr mr40 mt22":""}></span>

public/react/src/modules/message/js/MessagePrivate.js

@@ -160,14 +160,13 @@ class MessagePrivate extends Component{
 			<Spin size="large" className="myw100baifenbi" spinning={isSpin}>
 
 					{
-						data===undefined?
+						data===undefined?"":data.length===0?
 							<div className="edu-tab-con-box clearfix edu-txt-center">
 								<img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
 								<p className="edu-nodata-p mb20">暂无数据哦~</p>
 							</div>
 							:data.map((item,key)=>{
 								return(
-
 										<div className="private-item clearfix df" key={key} onClick={()=>this.smyJump(3,item.target.id)}>
 											<a className="fl mr10 private_message_a" onMouseDown={()=>this.myCome(item)}>
 												<img onMouseDown={()=>this.myCome(item)} src={getImageUrl("images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/>
@@ -179,12 +178,11 @@ class MessagePrivate extends Component{
 													<span className="color-grey-c mr20">[{item.message_count}{"条"}]</span>
 													<span className="color-grey-c">{moment(item.send_time).fromNow()}</span>
 												</p>
-												<span className="color-grey-6 break_word_firefox  markdown-body" 	dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}	></span>
+												<div className="color-grey-6 break_word_firefox  markdown-body mt10" 	dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}	></div>
 
 											</div>
 											{item.unread === true ?<span className="new-point fr mt22"></span>:""}
 										</div>
-
 								)
 							})}
 				</Spin>

public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js

@@ -409,7 +409,7 @@ class PackageIndexNEITaskDetails extends Component {
 												return(
 													<div className="ysldivhomediv1s homehove" key={key}>
 														{item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""}
-														<a href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a>
+														<a className={item.status==="bidding_won"?"":"mt20"} href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a>
 														<div className="textall mt10" title={item.name}> <p className="ptext">{item.name}</p></div>
 														{this.props.current_user&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.login}/message_detail?target_ids=${item.id}`}>
 															<img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -1391,13 +1391,13 @@ export default class TPMsettings extends Component {
 											})
 										}
 									</Select>
-									<p
+									{/*<p*/}
-										className="edu-txt-left font-12"
+										{/*className="edu-txt-left font-12"*/}
-										style={{display:operateauthority?"block":'none'}}
+										{/*style={{display:operateauthority?"block":'none'}}*/}
-									>
+									{/*>*/}
-										列表中没有？
+										{/*列表中没有？*/}
-										<a className="color-blue" onClick={this.post_apply}>申请新建</a>
+										{/*<a className="color-blue" onClick={this.post_apply}>申请新建</a>*/}
-									</p>
+									{/*</p>*/}
 
 									<Modal
 										keyboard={false}