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 { "" }
- this.props.modalCancel()}>取消 + { + this.props.titilesm&&this.props.titilesm==="功能正在内测中,敬请期待"? + "" + : + this.props.modalCancel()}>取消 + } + this.props.setDownload()}>{this.props.boolok?this.props.boolok:"确定"}
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 {