From 8dad3b231cc6430adea3f5ad198638ebeed12bb6 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 8 May 2021 17:20:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/edu-purge.css | 18 ++--- src/Nav/Footer.jsx | 66 +++++++++++++++++ src/Nav/Index.scss | 68 ++++++++++++++++++ src/index.css | 12 ---- src/modules/modals/Bottomsubmit.js | 3 - src/modules/question/Paperreview.js | 10 --- src/modules/question/Questionitem_banks.js | 3 - src/modules/testpaper/Intecomponents.js | 10 --- src/modules/testpaper/Paperlibraryeditid.js | 11 --- src/modules/testpaper/Paperlibraryseeid.js | 10 --- src/modules/tpm/NewFooter.js | 80 +++++++++++---------- src/modules/tpm/TPMIndexHOC.js | 12 +--- 12 files changed, 184 insertions(+), 119 deletions(-) create mode 100644 src/Nav/Footer.jsx create mode 100644 src/Nav/Index.scss diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 5279a0c4..eda246bd 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -2343,8 +2343,11 @@ input::-ms-clear { /*中间部分宽度固定为1200*/ .newMain { margin: 0 auto; - padding-bottom: 110px; min-width: 1200px; + height: 100%; + min-height: 100%; + padding-top: 70px; + background-color: #fafafa; } @@ -4106,20 +4109,7 @@ em.vertical-line { /* 右侧内容宽度变化的话，需要调整posi-search right的值*/ /*底部*/ -.newFooter { - max-height: 110px; -} -.newFooter { - position: absolute; - bottom: 0; - width: 100%; - background: #323232; - clear: both; - min-width: 1200px; - z-index: 8; - left: 0px; -} .footercon { border-bottom: 1px solid #47494d; diff --git a/src/Nav/Footer.jsx b/src/Nav/Footer.jsx new file mode 100644 index 00000000..eb3019e2 --- /dev/null +++ b/src/Nav/Footer.jsx @@ -0,0 +1,66 @@ +import React, { useEffect , useState } from 'react'; +import './Index.scss'; + +function Footer(){ + const [ value , setValue ] = useState(undefined); + + useEffect(()=>{ + try { + var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); + setValue(chromesettingArray.footer); + } catch (e) { + } + },[]) + + function showhtml(htmlString){ + var html = {__html:htmlString}; + return
; + } + + return( +
+
+
+ {value && showhtml(value)} + {/*
+ + + +
    +
  • 合作伙伴
    • +
  • 热线：
    • +
  • QQ群：1071514693
    • +
+
+

© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE 湘ICP备 17009477号

*/} +
+
+ ) +} +export default Footer; diff --git a/src/Nav/Index.scss b/src/Nav/Index.scss new file mode 100644 index 00000000..0ae8f48e --- /dev/null +++ b/src/Nav/Index.scss @@ -0,0 +1,68 @@ + +.dropdownFlex{ + display:flex; + padding:5px; + background:#fff; + border-radius: 3px; + .ant-menu-vertical > .ant-menu-item{ + border:none; + height: 35px; + line-height: 35px; + margin:0px; + } + .ant-menu-vertical{ + border:none; + } +} + +.newFooter { + position: absolute; + bottom: 0; + width: 100%; + background: #323232; + clear: both; + min-width: 1200px; + z-index: 8; + left: 0px; + p { + margin-top: 0; + margin-bottom:0px !important; + } + .footerInfos{ + display: flex; + max-width: 1200px; + margin:0px auto; + justify-content: space-around; + padding:60px 0px; + & >ul{ + padding:0px 40px; + box-sizing: border-box; + max-width: 25%; + text-align: left; + li{ + color: #fff; + font-weight: 300; + &:first-child{ + font-size: 17px; + } + &>a,&>span{ + color: #bbb; + } + &>a:hover{ + color: #4cacff; + } + } + } + } + .footerCopy{ + color: #bbb; + border-top: 1px solid #4e4e4e; + padding:10px 0px; + a{ + color: #bbb; + &:hover{ + color: #4cacff; + } + } + } +} \ No newline at end of file diff --git a/src/index.css b/src/index.css index cd6f30b9..8971f4de 100644 --- a/src/index.css +++ b/src/index.css @@ -67,18 +67,6 @@ li { font-size: 25px !important; } -.newFooter { - position: absolute; - bottom: 0; - width: 100%; - background: #323232; - clear: both; - min-width: 1200px; - z-index: 8; - left: 0px; - max-height: 110px; -} - .markdown-body { text-align: justify; word-break: break-all; diff --git a/src/modules/modals/Bottomsubmit.js b/src/modules/modals/Bottomsubmit.js index 09038aa9..970e106e 100644 --- a/src/modules/modals/Bottomsubmit.js +++ b/src/modules/modals/Bottomsubmit.js @@ -32,9 +32,6 @@ class Bottomsubmit extends Component {
{ diff --git a/src/modules/question/Questionitem_banks.js b/src/modules/question/Questionitem_banks.js index 4ba33f55..704c840d 100644 --- a/src/modules/question/Questionitem_banks.js +++ b/src/modules/question/Questionitem_banks.js @@ -534,9 +534,6 @@ class Questionitem_banks extends Component { width: 100%!important; } - .newFooter{ - display: none; - } ` } diff --git a/src/modules/testpaper/Intecomponents.js b/src/modules/testpaper/Intecomponents.js index 3b4f7858..c49cce80 100644 --- a/src/modules/testpaper/Intecomponents.js +++ b/src/modules/testpaper/Intecomponents.js @@ -379,16 +379,6 @@ class Intecomponents extends Component {
-
diff --git a/src/modules/testpaper/Paperlibraryeditid.js b/src/modules/testpaper/Paperlibraryeditid.js index 831e84e6..0980f4cb 100644 --- a/src/modules/testpaper/Paperlibraryeditid.js +++ b/src/modules/testpaper/Paperlibraryeditid.js @@ -241,17 +241,6 @@ class Paperlibraryeditid extends Component { : "" } - -
diff --git a/src/modules/testpaper/Paperlibraryseeid.js b/src/modules/testpaper/Paperlibraryseeid.js index bfecf0cc..69121546 100644 --- a/src/modules/testpaper/Paperlibraryseeid.js +++ b/src/modules/testpaper/Paperlibraryseeid.js @@ -131,16 +131,6 @@ class Paperlibraryseeid extends Component {
-
diff --git a/src/modules/tpm/NewFooter.js b/src/modules/tpm/NewFooter.js index 65f89eeb..13d8088b 100644 --- a/src/modules/tpm/NewFooter.js +++ b/src/modules/tpm/NewFooter.js @@ -1,8 +1,4 @@ import React, { Component } from 'react'; -import moment from 'moment'; -import { Link } from 'react-router-dom'; - - class NewFooter extends Component { constructor(props) { super(props) @@ -29,14 +25,10 @@ class NewFooter extends Component { render() { const {forge_footer} = this.state; return ( -
- - { - forge_footer && this.showhtml(forge_footer) - } - - {/*
*/} - {/*
    */} - {/*
  • 网站首页
    • */} - {/*
  • 关于我们
    • */} - {/*
  • 联系我们
    • */} - {/*
  • 合作伙伴
    • */} - {/*
  • 服务协议
    • */} - {/*
  • 帮助中心
    • */} - {/*
  • 意见反馈
    • */} - {/*
*/} - {/*
*/} - {/*
*/} - {/*

*/} - {/*© {moment().year()} EduCoder*/} - {/*湘ICP备17009477号*/} - {/**/} - {/*湘公网安备43019002000962号*/} - {/**/} - {/*Trustie   &   IntelliDE inside. 版权所有 湖南智擎科技有限公司*/} - {/*

*/} - {/*
*/} - {/*
*/} +
+
+ {forge_footer && this.showhtml(forge_footer)} + {/* +

© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE 湘ICP备 17009477号

*/}
+
); } } diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 0084c333..addf598c 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -1,6 +1,6 @@ import React from 'react'; -import NewHeader from './NewHeader' -import NewFooter from './NewFooter' +import NewHeader from './NewHeader'; +import Footer from '../../Nav/Footer'; import { downloadFile } from 'educoder' import axios from 'axios'; import { Spin } from 'antd'; @@ -396,7 +396,6 @@ export function TPMIndexHOC(WrappedComponent) { size="large" tip={this._gLoadingTip || "加载中..."} > -
{ current_user && this.initCommonState(user)} @@ -405,13 +404,8 @@ export function TPMIndexHOC(WrappedComponent) { > } - -
- +
); }