From fedefe7b959357401269bd46bfd9f2c7de6ad61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 26 Mar 2020 00:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/css_min_all.css | 2 +- public/react/public/css/edu-all.css | 4 +- public/react/public/css/edu-common.css | 2 +- public/react/src/modules/tpm/TPMIndexHOC.js | 58 ++++++++++++++------- public/stylesheets/css/edu-common.css | 2 +- public/stylesheets/educoder/edu-all.css | 2 +- 6 files changed, 44 insertions(+), 26 deletions(-) diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css index 93b1c7f96..001427afa 100755 --- a/public/react/public/css/css_min_all.css +++ b/public/react/public/css/css_min_all.css @@ -6,7 +6,7 @@ html{height:100%;} .newFooter{ max-height: 110px; } -.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} +.newFooter{ width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} .newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998} /* 重置样式 */ body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;} diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 5700120c8..e40043884 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -74,7 +74,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .newFooter{ max-height: 110px; } -.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} +.newFooter{ width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} .footercon{border-bottom:1px solid #47494d;} .inner-footernav{width: 560px;margin: 0px auto} .inner-footernav li{float: left;height: 50px;width: 80px;text-align: center} @@ -3502,4 +3502,4 @@ a.singlepublishtwo{ .ant-notification{ z-index: 10001 !important; -} \ No newline at end of file +} diff --git a/public/react/public/css/edu-common.css b/public/react/public/css/edu-common.css index 25f758144..7daa7ef47 100755 --- a/public/react/public/css/edu-common.css +++ b/public/react/public/css/edu-common.css @@ -6,7 +6,7 @@ html{height:100%;} .newFooter{ max-height: 110px; } -.newFooter{ position: absolute; bottom: 0; width: 100%; background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} +.newFooter{ width: 100%; background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} .newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998} /* 重置样式 */ body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;} diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index d8ff0de3c..fea63dae7 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -4,12 +4,12 @@ import NewFooter from './NewFooter' import SiderBar from './SiderBar' import { getUrl, downloadFile } from 'educoder' import axios from 'axios'; -import { Spin } from 'antd'; +import { Spin,Layout } from 'antd'; import './TPMIndex.css'; import LoginDialog from '../login/LoginDialog'; import AccountProfile from '../user/AccountProfile'; import AccountPhoneemail from '../user/AccountPhoneemail'; - +const { Header, Footer, Sider, Content } = Layout; const $ = window.$; let _url_origin=''; if(window.location.port === "3007"){ @@ -789,32 +789,50 @@ export default function TPMIndexHOC(WrappedComponent) { } .globalSpin .ant-spin-dot-item { background-color: #fff; + } + .ant-layout-footer { + padding: 0px !important; + + } + .ant-layout-header{ + padding: 0px !important; + height: 60px !important; + line-height: 2 !important; } ` } - - - -
- this.initCommonState(user)} - {...this.props} {...this.state} - showShixun={this.showShixun} aboutFocus={this.aboutFocus} - {...common} + +
+ + - +
+ this.initCommonState(user)} + {...this.props} {...this.state} + showShixun={this.showShixun} aboutFocus={this.aboutFocus} + {...common} + > + + +
+ + + + + + -
- - ); diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index 517d13196..20b0dfc45 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -6,7 +6,7 @@ html{height:100%;} .newFooter{ max-height: 110px; } -.newFooter{ position: absolute; bottom: 0; width: 100%; background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} +.newFooter{width: 100%; background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} /* 重置样式 */ body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;} table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 368ae3738..d3932358c 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -74,7 +74,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .newFooter{ max-height: 110px; } -.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} +.newFooter{ width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} /* 去掉了logo */ .newFooter{ max-height: 110px;