Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

上传通知的修改

This commit is contained in:
何童崇 2021-09-07 11:16:05 +08:00
parent 6665a15aa3
commit 244881f142
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/forge/Head/Header.js
View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import AccountProfile from "../../modules/user/AccountProfile"; import AccountProfile from "../../modules/user/AccountProfile";
import { getImageUrl } from 'educoder' import { getImageUrl } from 'educoder'
import axios from 'axios'; import axios from 'axios';
import { Input , notification , Dropdown , Menu,Badge, Button } from 'antd'; import { Input , notification , Dropdown ,Popover, Menu,Badge, Button } from 'antd';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import LoginDialog from '../../modules/login/LoginDialog'; import LoginDialog from '../../modules/login/LoginDialog';
@ -415,7 +415,7 @@ class NewHeader extends Component {
{ {
settings.navbar && settings.navbar.map((item, key) => { settings.navbar && settings.navbar.map((item, key) => {
var new_link = item.link; var new_link = item.link;
var user_login = this.props.user && this.props.user.login; var user_login = current_user && current_user.login;
var is_hidden = item.hidden var is_hidden = item.hidden
if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) { if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
if (user_login) { if (user_login) {
@ -451,23 +451,20 @@ class NewHeader extends Component {
{ {
current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)? current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
<Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight"> <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
<i className="iconfont icon-tianjiafangda color-grey-6 ml30"></i> <i className="iconfont icon-tianjiafangda color-grey-6 ml30 mr15"></i>
</Dropdown>:"" </Dropdown>:""
} }
{/* {this.props.user && this.props.user.login && notice_url ? */} {/* {current_user && current_user.login && notice_url ? */}
{this.props.user && this.props.user.login ? {current_user && current_user.login ?
<div className="ml30 edu-menu-panel"> <Popover placement={`bottomRight`} content={this.messageList(settings && settings.personal)}>
{user && user.login && <a href={`/settings/notice/myNotice`} >
<Dropdown placement={`bottomRight`} overlay={this.messageList(settings && settings.personal)}> <i className="iconfont icon-xiaoxilingdang color-grey-6 ml15 mr15"></i>
<a href={`/settings/notice/myNotice`} style={{ position: 'relative' }}>
<i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
<span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}> <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
</span> </span>
</a> </a>
</Dropdown> </Popover>
} :""
</div>:""
} }
</div> </div>
{!user || (user && !user.login) ? {!user || (user && !user.login) ?

2
src/forge/Head/header.scss
View File

@ -24,7 +24,7 @@
width: 34px; width: 34px;
height: 34px; height: 34px;
border-radius: 50%; border-radius: 50%;
margin-left: 30px; margin-left: 15px;
} }
.messageHoverDiv{ .messageHoverDiv{