From 2c34d6991fafccf20ae75f751df8c1f35b9d89ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 10 Mar 2020 19:05:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/question/component/QuestionModal.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/question/component/QuestionModal.js b/public/react/src/modules/question/component/QuestionModal.js
index 87338faa7..65224f26d 100644
--- a/public/react/src/modules/question/component/QuestionModal.js
+++ b/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>

From 3f3d33a671cc8da27afd5db1b82c57124f1bf5c1 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Tue, 10 Mar 2020 19:15:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/usersInfo/video/InfosVideo.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/usersInfo/video/InfosVideo.css b/public/react/src/modules/user/usersInfo/video/InfosVideo.css
index 60813fb0c..fb78f9e85 100644
--- a/public/react/src/modules/user/usersInfo/video/InfosVideo.css
+++ b/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;
@@ -65,7 +66,7 @@
 .videoItem .square-main .title{
     max-width: 256px;
     line-height: 18px;
-
+    
 }
 
 .videoItem .time {