Merge pull request '修改提案提交文字' (#404) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military

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;

src/managements/index.js

@@ -136,7 +136,7 @@ const MenuList = Loadable({
 const Managements = (propsF) => {
 
   return (
-    <div className="newMain clearfix">
+    <div className="newMain clearfix managementMain">
       <Layouts {...propsF} >
         <Switch {...propsF}>
         
@@ -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}))))
 );

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;
     }

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 {

src/military/competition/refer/index.jsx

@@ -123,7 +123,8 @@ function Introduce({ form, showNotification, match, history, enrollStatus, curre
           <Button className="upload" disabled={!upload}><Icon type="upload"/>{!upload ? '已' : ''}上传</Button>
         </Upload>
         <Modal/>
-        {enrollStatus && enrollStatus.upload_status && enrollStatus.status === 1 && <div className="refer_tip mt15 cover"><i className="iconfont icon-erciqueren_icon mr10"></i>您的作品被打回，可以再次提交作品，未重新提交前保留您原来的提交记录。</div>}
+        {/* {enrollStatus && enrollStatus.upload_status && enrollStatus.status === 1 && <div className="refer_tip mt15 cover"><i className="iconfont icon-erciqueren_icon mr10"></i>您的作品被打回，可以再次提交作品，未重新提交前保留您原来的提交记录。</div>} */}
+        <div className="refer_tip mt15 cover"><i className="iconfont icon-erciqueren_icon mr10"></i>{enrollStatus && enrollStatus.upload_status && enrollStatus.status === 1 ?"您的作品被打回，可以再次提交作品，未重新提交前保留您原来的提交记录。":"提案提交后不允许再修改，如有问题请联系分赛区管理员"}</div>
         <div className="refer_tip mt20">上传单个作品压缩包（仅限上传一个压缩包）</div>
         <div className="refer_bor"></div>
         <Button type="primary" onClick={()=>{changeFiles ? setVisible(true) : message.error("您暂未上传作品文件")}} loading={loading} disabled={!upload}>{!upload ? '已' : ''}提交作品</Button>