Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/question/component/QuestionModal.js

@@ -41,7 +41,13 @@ class QuestionModal extends Component {
 							""
 					}
 					<div className="clearfix mt30 edu-txt-center">
-						<a className="task-btn mr30 w80" onClick={()=>this.props.modalCancel()}>取消</a>
+						{
+							this.props.titilesm&&this.props.titilesm==="功能正在内测中，敬请期待"?
+								""
+								:
+								<a className="task-btn mr30 w80" onClick={()=>this.props.modalCancel()}>取消</a>
+						}
+
 						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.setDownload()}>{this.props.boolok?this.props.boolok:"确定"}</a>
 					</div>
 				</div>

public/react/src/modules/user/usersInfo/video/InfosVideo.css

@@ -14,6 +14,7 @@
     margin-right: 26px;
     margin-bottom: 26px;
     position: relative;
+    max-height: 258px;
 }
 .videoItem:nth-child(4n+0) {
     margin-right: 0px;