From 3b9e24a9f8c68095cca83245f4587737d932f72b Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 11 May 2020 14:18:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E9=A6=96=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E5=A4=B4=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/demo_index.html | 186 ++- public/css/edu-purge.css | 65 +- public/css/iconfont.css | 44 +- public/css/iconfont.eot | Bin 93780 -> 95748 bytes public/css/iconfont.js | 2 +- public/css/iconfont.json | 56 + public/css/iconfont.svg | 24 + public/css/iconfont.ttf | Bin 93612 -> 95580 bytes public/css/iconfont.woff | Bin 58876 -> 60168 bytes public/css/iconfont.woff2 | Bin 49260 -> 50424 bytes src/AppConfig.js | 130 +- src/forge/Images/banner_list.png | Bin 263449 -> 604310 bytes src/forge/Index.js | 43 +- src/forge/Main/Index.js | 45 +- src/forge/Main/IndexItem.js | 12 +- src/forge/Main/list.css | 85 +- src/forge/css/index.css | 8 +- src/modules/login/LoginDialog.js | 362 ++-- src/modules/question/Question.js | 9 - src/modules/tpm/NewHeader.js | 1451 ++++++++--------- src/modules/tpm/TPMIndex.css | 47 +- src/modules/tpm/TPMIndexHOC.js | 47 - .../user/usersInfo/video/InfosVideo.js | 4 +- 23 files changed, 1239 insertions(+), 1381 deletions(-) diff --git a/public/css/demo_index.html b/public/css/demo_index.html index 38893ea4..979e6cfe 100644 --- a/public/css/demo_index.html +++ b/public/css/demo_index.html @@ -3,7 +3,7 @@ IconFont Demo - + @@ -30,6 +30,54 @@
- + {user === undefined ? + + this.educoderlogin()} className="mr5 color-grey-3">登录 + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && + 注册 + } + + : user.login === "" ? + + this.educoderlogin()} className="mr5 color-grey-3">登录 + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && + 注册 + } + + : +
+ + + + +
    + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.edit_account && +
  • 修改资料
    • + } + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses && +
  • 我的课程
    • + } + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects && +
  • 我的项目
    • + } + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_organ && +
  • 我的组织
    • + } +
  • + this.educoderloginysl()}>退出 +
    • +
+
+ } + - ); } } diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 7ced4806..dde8c34c 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -15,7 +15,49 @@ body>.-task-title { #root .search-all { width: 219px; } +.newContainers{ + min-width: 1200px; + max-width: unset; + height: 100%; + min-height: 100%; + overflow: hidden; +} +.newHeaders{ + max-width: unset; + background: #fff !important; + width: 100%; + height:70px; + min-width: 1200px; + z-index: 1000; + -moz-box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1); + background:rgba(255,255,255,1); + box-shadow:0px 2px 10px 0px rgba(0,0,0,0.1); +} +.headerContent{ + width:1200px; + margin:0px auto; + display: flex; + align-items: center; + height: 100% +} +.globalSpin { + max-height: 700px !important; +} +.indexHOC > .ant-spin-nested-loading { + background: #000; + height: 100%; +} +.indexHOC > .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot { + top: 50% !important; +} +.globalSpin .ant-spin-text { + text-shadow: none !important; + color: #fff; +} +.globalSpin .ant-spin-dot-item { + background-color: #fff; +} /*Header START*/ .newHeader .logoimg { margin-top: 16px; @@ -23,11 +65,6 @@ body>.-task-title { width: 97px; } -.head-right i { - font-size: 20px; - float: none !important; -} - .headIcon, #header_keyword_search { padding-top: 13px !important; diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index c8c7b27b..19db1c1a 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -1,7 +1,6 @@ import React from 'react'; import NewHeader from './NewHeader' import NewFooter from './NewFooter' -import SiderBar from './SiderBar' import { downloadFile } from 'educoder' import axios from 'axios'; import { Spin } from 'antd'; @@ -662,49 +661,6 @@ export function TPMIndexHOC(WrappedComponent) { {...this.dialogObj} /> : ""} - - - - - - - {videoModalObj.visible && } + {/* {videoModalObj.visible && } */}