diff --git a/src/managements/components/layouts/index.scss b/src/managements/components/layouts/index.scss index 0c05771e..e5cc64d5 100644 --- a/src/managements/components/layouts/index.scss +++ b/src/managements/components/layouts/index.scss @@ -4,6 +4,7 @@ left: 0; width: 13.75rem; height: calc(100vh - 70px); + padding-bottom: 5vh; overflow: hidden; overflow-y: scroll; background-color:#ffffff; diff --git a/src/managements/index.js b/src/managements/index.js index 3e9e8f76..dd29ba4d 100644 --- a/src/managements/index.js +++ b/src/managements/index.js @@ -136,7 +136,7 @@ const MenuList = Loadable({ const Managements = (propsF) => { return ( -
+
@@ -330,5 +330,5 @@ export default withRouter( ImageLayerOfCommentHOC({ imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget", parentSelector: ".newMain", - })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Managements)))) + })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Managements,{noFooter:true})))) ); diff --git a/src/managements/index.scss b/src/managements/index.scss index 3004018a..bf6ea144 100644 --- a/src/managements/index.scss +++ b/src/managements/index.scss @@ -1,8 +1,11 @@ +.managementMain{ + padding:0; +} .managements{ margin-left: 13.75rem; padding:0 1.875rem 1.6rem; background: #f6f9fe; - min-height: 80vh; + min-height: calc(100vh - 70px); .content{ margin-top:1rem; } diff --git a/src/managements/notice/index.css b/src/managements/notice/index.css index ecfa2ff0..a7b79a1a 100644 --- a/src/managements/notice/index.css +++ b/src/managements/notice/index.css @@ -4,7 +4,7 @@ background: #fff; border-radius: 1em; box-shadow: 0 1px 2px #d9d9d9; - overflow-y: scroll; + padding-bottom: 1vh; } .notice-title { diff --git a/src/military/competition/refer/index.jsx b/src/military/competition/refer/index.jsx index c611e04d..4db6a721 100644 --- a/src/military/competition/refer/index.jsx +++ b/src/military/competition/refer/index.jsx @@ -123,7 +123,8 @@ function Introduce({ form, showNotification, match, history, enrollStatus, curre - {enrollStatus && enrollStatus.upload_status && enrollStatus.status === 1 &&
您的作品被打回,可以再次提交作品,未重新提交前保留您原来的提交记录。
} + {/* {enrollStatus && enrollStatus.upload_status && enrollStatus.status === 1 &&
您的作品被打回,可以再次提交作品,未重新提交前保留您原来的提交记录。
} */} +
{enrollStatus && enrollStatus.upload_status && enrollStatus.status === 1 ?"您的作品被打回,可以再次提交作品,未重新提交前保留您原来的提交记录。":"提案提交后不允许再修改,如有问题请联系分赛区管理员"}
上传单个作品压缩包(仅限上传一个压缩包)