小修

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(
+      <Menu className="currentMenu">
+        <Menu.Item>
+          <span title={current_user && current_user.username}>{current_user && current_user.username}</span>
+        </Menu.Item>
+          {
+            personal && personal.length > 0 && personal.map((item,key)=>{
+              return(
+                <li key={key}><a href={item.url} target="_blank">{item.name}</a></li>
+              )
+            })
+          }
+        <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
+      </Menu>
+    )
+  }
+
   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 ?
-              <GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool) => this.setgoshowqqgtounp(bool)}></GotoQQgroup>
-              :""
-            }
             {
               settings && settings.nav_logo_url ?
               <a href={settings && settings.new_course.default_url} className={"fl mr50"} style={{minWidth:"45px"}}>
@@ -522,32 +466,6 @@ class NewHeader extends Component {
                 }
               </div>:""
             }
-            <Modal
-              keyboard={false}
-              title="提示"
-              visible={submitapplications}
-              closable={false}
-              footer={null}
-            >
-              <div className="task_popup_con ml30">
-                <div className="mr15">
-                  <ul>
-                    <div className="task-popup-content">
-                      <p className="task-popup-text-center font-16">
-                        {submitapplicationsvalue}
-                      </p>
-                    </div>
-                    <li className="clearfix mt10 edu-txt-center">
-                      <a className="task-btn mr10"
-                        onClick={this.hidesubmitapplications}>取消</a>
-                      <a
-                        className="task-btn task-btn-orange ml20"
-                        onClick={this.submitsubmitapplications}>确定</a>
-                    </li>
-                  </ul>
-                </div>
-              </div>
-            </Modal>
           </div>
           {!user || (user && !user.login)  ?
             <span className="font-15 ml30">
@@ -558,25 +476,11 @@ class NewHeader extends Component {
               }
             </span>
             :
-            <div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
-              <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}`}>
-                <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`/${user.image_url}`)} width="34">
-                </img>
+            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
+              <a href={`/users/${this.props.current_user  && this.props.current_user.login}`}>
+                <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
               </a>
-              <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
-                <li className="bor-bottom-greyE task-hide" title={this.props.current_user.username} style={{cursor:"default",background:"#fff"}}>{this.props.current_user.username}</li>
-                {
-                  settings && settings.personal && settings.personal.length > 0 && settings.personal.map((item,key)=>{
-                    return(
-                      <li key={key}><a href={item.url} target="_blank">{item.name}</a></li>
-                    )
-                  })
-                }
-                <li className="bor-top-greyE">
-                  <a onClick={() => this.educoderloginysl()}>退出</a>
-                </li>
-              </ul>
-            </div>
+            </Dropdown>
           }
         </div>
       </div>

src/forge/users/Infos.js

@@ -213,7 +213,7 @@ class Infos extends Component {
                     </span>
                   </span>
                   
-                  <div className="text-center mt15 font-16 fwb task-hide" title={user && user.username}>
+                  <div className="text-center mt15 font-24 task-hide" title={user && user.username}>
                     {user && user.username}
                   </div>
                   <div className="userDescription">

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=>{})
     }