diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 9b19a5c5..8c4cdd15 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -2,13 +2,12 @@ import React, { Component } from 'react'; import AccountProfile from "../../modules/user/AccountProfile"; import { getImageUrl } from 'educoder' import axios from 'axios'; -import { Modal, Input, message, notification , Dropdown , Menu } from 'antd'; +import { Input , notification , Dropdown , Menu } from 'antd'; import LoginDialog from '../../modules/login/LoginDialog'; import GotoQQgroup from '../../modal/GotoQQgroup' import '../../modules/tpm/TPMIndex.css'; -import logo from '../../modules/tpm/images/logo.png'; import './header.scss'; const $ = window.$ @@ -33,11 +32,9 @@ class NewHeader extends Component { Checkboxteachertype: false, Checkboxteachingtype: false, code_notice: false, - checked_notice: false, RadioGroupvalue: undefined, submitapplications: false, isRender: false, - showSearchOpentype: false, showTrial: false, setevaluatinghides: false, occupation: 0, @@ -45,7 +42,6 @@ class NewHeader extends Component { headtypesonClickbool: false, headtypess: "/", settings: null, - goshowqqgtounp: false, visiblemyss: false, openSearch:false, } @@ -130,43 +126,7 @@ class NewHeader extends Component { } } - submitsubmitapplications = () => { - let { - submitapplicationssum, - submitapplicationsvaluedata - } = this.state; - this.setState({ - submitapplications: false, - RadioGroupvalue: undefined - }) - if (submitapplicationssum === 0) { - if (submitapplicationsvaluedata !== undefined) { - window.location.href = "/courses/" + submitapplicationsvaluedata; - } - } else if (submitapplicationssum === 1) { - if (submitapplicationsvaluedata !== undefined) { - window.location.href = "/projects/" + submitapplicationsvaluedata; - } - } - } - hidesubmitapplications = () => { - this.setState({ - Addcoursestypes: false, - tojoinitemtype: false, - tojoinclasstitle: undefined, - rolearr: ["", ""], - Checkboxteacherchecked: false, - Checkboxstudentchecked: false, - Checkboxteachingchecked: false, - Checkboxteachertype: false, - Checkboxteachingtype: false, - code_notice: false, - checked_notice: false, - submitapplications: false, - RadioGroupvalue: undefined - }) - } educoderlogin = () => { //登录账号 this.setState({ @@ -205,23 +165,6 @@ class NewHeader extends Component { }; - hidetojoinclass = () => { - this.setState({ - tojoinclasstype: false, - tojoinitemtype: false, - tojoinclasstitle: undefined, - rolearr: ["", ""], - Checkboxteacherchecked: false, - Checkboxstudentchecked: false, - Checkboxteachingchecked: false, - Checkboxteachertype: false, - Checkboxteachingtype: false, - code_notice: false, - checked_notice: false, - RadioGroupvalue: undefined - }) - } - // 关闭 cancelModulationModels = () => { this.setState({ isRenders: false }) @@ -313,14 +256,6 @@ class NewHeader extends Component { } } - - // 处理弹框 - setgoshowqqgtounp = (bool) => { - this.setState({ - goshowqqgtounp: bool - }) - } - addMenu=(list)=>{ return( list && list.length >0 && @@ -338,6 +273,25 @@ class NewHeader extends Component { ) } + renderMenu=(personal)=>{ + const { current_user } = this.props; + return( + + + {current_user && current_user.username} + + { + personal && personal.length > 0 && personal.map((item,key)=>{ + return( +
  • {item.name}
  • + ) + }) + } + this.educoderloginysl()}>退出 +
    + ) + } + render() { const { match} = this.props; let current_user = this.props.user; @@ -345,17 +299,12 @@ class NewHeader extends Component { tojoinitemtype, tojoinclasstitle, code_notice, - checked_notice, AccountProfiletype, - submitapplications, - submitapplicationsvalue, user, isRender, - showSearchOpentype, headtypesonClickbool, headtypess, settings, - goshowqqgtounp, openSearch, } = this.state; /*用户名称 用户头像url*/ @@ -452,11 +401,6 @@ class NewHeader extends Component { {...this.props} {...this.state} /> : ""} - { - goshowqqgtounp === true ? - this.setgoshowqqgtounp(bool)}> - :"" - } { settings && settings.nav_logo_url ? @@ -522,32 +466,6 @@ class NewHeader extends Component { } :"" } - -
    -
    - -
    -
    - {!user || (user && !user.login) ? @@ -558,25 +476,11 @@ class NewHeader extends Component { } : -
    - - - + + + 头像 - -
    + } diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index a415b3d5..77ab795a 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -213,7 +213,7 @@ class Infos extends Component { -
    +
    {user && user.username}
    diff --git a/src/forge/users/Material/Base.jsx b/src/forge/users/Material/Base.jsx index a708d2f4..6ece348f 100644 --- a/src/forge/users/Material/Base.jsx +++ b/src/forge/users/Material/Base.jsx @@ -45,6 +45,7 @@ export default Form.create()( if(result && result.data){ props.showNotification("资料修改成功!") resetUser && resetUser(result.data); + props.history.push(`/users/${username}`) } }).catch(error=>{}) }