From 8d81a78ec6f54641402edfebcdc603e4e7e60253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 26 Nov 2019 11:09:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 21 +++ public/react/src/modules/tpm/NewFooter.js | 148 ++++++++++++++++------ public/stylesheets/educoder/edu-all.css | 23 +++- 3 files changed, 154 insertions(+), 38 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index f51e0e630..5988709eb 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -80,6 +80,27 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .inner-footernav li{float: left;height: 50px;width: 80px;text-align: center} .inner-footernav li a{width: 100%;text-align: center;line-height: 50px;color: #888} .inner-footer_con{ width: 1200px; margin: 0 auto;} +.inner-footernavysl{ display: flex;flex-direction:initial;} +.inner-footernavysl li a { + height: 40px; + line-height: 40px; + color:#878786; + font-size: 19px; +} + +.inner-footernavysl li Link { + height: 40px; + line-height: 40px; + color:#878786; +} + +.intermediatecenter{ + width:100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} .footer_con-p{ color: #888; margin-top:10px;} /*banner图*/ .banner{width:100%;height:345px;position: relative;overflow: hidden;border-radius: 10px;} diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js index 4ff1cc46a..f54fa1d3f 100644 --- a/public/react/src/modules/tpm/NewFooter.js +++ b/public/react/src/modules/tpm/NewFooter.js @@ -1,53 +1,127 @@ -import React, { Component } from 'react'; -import { Redirect } from 'react-router'; -import { Link } from 'react-router-dom'; -import { getImageUrl, toPath } from 'educoder' +import React, {Component} from 'react'; +import {Redirect} from 'react-router'; +import {Link} from 'react-router-dom'; +import {getImageUrl, toPath} from 'educoder' import PropTypes from 'prop-types'; class NewFooter extends Component { - constructor(props) { - super(props) + constructor(props) { + super(props) - } + } - componentWillReceiveProps(newProps, newContext) { + componentWillReceiveProps(newProps, newContext) { - } + } - render() { - return ( -
+ render() { + return ( +
{/*newContainers*/} -
- {this.props.user&&this.props.user.main_site===true?
- {/*
+
+ {this.props.user && this.props.user.main_site === true ?
+ {/*
高校智能化教学与实训平台 EduCoder.net
*/} -
    -
  • 网站首页
    • -
  • 关于我们
    • -
  • 联系我们
    • -
  • 合作伙伴
    • -
  • 服务协议
    • -
  • 帮助中心
    • -
  • 意见反馈
    • -
-
:""} -
- {this.props.mygetHelmetapi === null ? "" : - this.props.mygetHelmetapi===undefined|| this.props.mygetHelmetapi.footer===null||this.props.mygetHelmetapi.footer===undefined? +
    +
  • 网站首页
    • +
  • 关于我们
    • +
  • 联系我们
    • +
  • 合作伙伴
    • +
  • 服务协议
    • +
  • 帮助中心
    • +
  • 意见反馈
    • +
+
: ""} + + +
+ {this.props.mygetHelmetapi === null ? "" : + this.props.mygetHelmetapi === undefined || this.props.mygetHelmetapi.footer === null || this.props.mygetHelmetapi.footer === undefined ?

© 2019 EduCoder - 湘ICP备17009477号 - + 湘ICP备17009477号 + 湘公网安备43019002000962号 - Trustie   &   IntelliDE inside. 版权所有 湖南智擎科技有限公司

@@ -56,12 +130,12 @@ class NewFooter extends Component { } -
-
-
-
- ); - } +
+
+
+
+ ); + } } export default NewFooter; diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 3ed8a36c3..6fcbd3b5c 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -84,6 +84,27 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .inner-footernav li{float: left;height: 50px;width: 80px;text-align: center} .inner-footernav li a{width: 100%;text-align: center;line-height: 50px;color: #888} .inner-footer_con{ width: 1200px; margin: 0 auto;} +.inner-footernavysl{ display: flex;flex-direction:initial;} +.inner-footernavysl li a { + height: 40px; + line-height: 40px; + color:#878786; + font-size: 19px; +} + +.inner-footernavysl li Link { + height: 40px; + line-height: 40px; + color:#878786; +} + +.intermediatecenter{ + width:100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} .footer_con-p{ color: #888; margin-top:10px;} /*banner图*/ .banner{width:100%;height:345px;position: relative;overflow: hidden;border-radius: 10px;} @@ -3773,4 +3794,4 @@ a.singlepublishtwo{ .fontweightbold{ font-weight: bold !important; -} \ No newline at end of file +}