From 520f035afc9429372454539d0a8171b36c5ba5c9 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 7 May 2020 14:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=92=8C=E9=87=8C=E7=A8=8B=E7=A2=91=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/merge.js                  |   2 +-
 src/forge/Order/Milepost.js               |   2 +-
 src/forge/Order/order.css                 |   3 +-
 src/modules/user/usersInfo/InfosBanner.js | 247 +++++++++++-----------
 4 files changed, 128 insertions(+), 126 deletions(-)

diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 75948ae98..dd8cd440a 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { Input, Dropdown, Menu, Icon, Pagination, Spin } from 'antd';
 import './merge.css';
-
+import '../Order/order.css';
 import NoneData from '../Nodata';
 import OrderItem from './MergeItem';
 
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index 2d2bc494c..b8607834b 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -277,7 +277,7 @@ class Milepost extends Component {
               <li className={closeselect ? "active" : ""} onClick={() => this.opneMilelist(2)}>{data && data.closed_count}个已关闭</li>
             </div>
             <div className="topWrapper_select">
-              <ul className="topWrapper_select">
+              <ul className="topWrapper_select mb-0">
                 <li>
                   <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
                     <span>排序<Icon type="caret-down" className="ml5" /></span>
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 6455566d0..57032348b 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -554,4 +554,5 @@ a.issue-type-button.active:hover{background: #f4f4f4; color: #4CACFF;}
 }
 .amplifyContent{
   text-align: center;
-}
\ No newline at end of file
+}
+.mb-0{margin-bottom: 0 !important;}
\ No newline at end of file
diff --git a/src/modules/user/usersInfo/InfosBanner.js b/src/modules/user/usersInfo/InfosBanner.js
index e84612d7e..f4326759a 100644
--- a/src/modules/user/usersInfo/InfosBanner.js
+++ b/src/modules/user/usersInfo/InfosBanner.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 
-import { Link } from 'react-router-dom';
-import { Tooltip, Menu } from 'antd';
-import { getImageUrl } from 'educoder';
+import {Link} from 'react-router-dom';
+import {Tooltip,Menu} from 'antd';
+import {getImageUrl} from 'educoder';
 
 import "./usersInfo.css"
 import "../../courses/css/members.css"
@@ -10,152 +10,153 @@ import "../../courses/css/Courses.css"
 
 import { LinkAfterLogin } from 'educoder'
 
-class InfosBanner extends Component {
-  constructor(props) {
+class InfosBanner extends Component{
+  constructor(props){
     super(props);
   }
-  render() {
-    let {
-      data,
+  render(){
+    let { 
+      data ,
       id,
       login,
       moduleName,
       current_user,
-    } = this.props;
-    let is_current = this.props.is_current;
-    let { username } = this.props.match.params;
-    let { pathname } = this.props.location;
-    moduleName = pathname.split("/")[3];
+     }=this.props;
+     let  is_current=this.props.is_current;
+     let {username}= this.props.match.params;
+     let {pathname}=this.props.location;
+     moduleName=pathname.split("/")[3];
 
-    let user_id = this.props.current_user && this.props.current_user.user_id;
-    let user_type = this.props.current_user && this.props.current_user.user_identity;
-    let targetuserid = this.props.data && this.props.data.id;
+    // let user_id=this.props.current_user&&this.props.current_user.user_id;
+		// let user_type=this.props.current_user&&this.props.current_user.user_identity;
+		// let targetuserid=this.props.data&&this.props.data.id;
 
-    // console.log(is_current)
-    // console.log(current_user)
-    // console.log(current_user.is_teacher)
-    let shixuntype = false;
-    let pathstype = false;
-    let coursestypes = false;
-    if (this.props && this.props.mygetHelmetapi != null) {
-      let shixun = "/shixuns";
-      let paths = "/paths";
-      let courses = "/classrooms";
-      this.props.mygetHelmetapi.navbar.map((item, key) => {
-        var reg = RegExp(item.link);
-        if (shixun.match(reg)) {
-          if (item.hidden === true) {
-            shixuntype = true
-          }
-        }
-        if (paths.match(reg)) {
-          if (item.hidden === true) {
-            pathstype = true
-          }
-        }
-        if (courses.match(reg)) {
-          if (item.hidden === true) {
-            coursestypes = true
-          }
-        }
-      })
-    }
+		 // console.log(is_current)
+		 // console.log(current_user)
+		// console.log(current_user.is_teacher)
+		// let shixuntype=false;
+		// let pathstype=false;
+		// let coursestypes=false;
+		// let projectstypes=false;
 
-    return (
+		// if(this.props&&this.props.mygetHelmetapi!=null){
+    //   console.log("this.props", this.props.mygetHelmetapi)
+		// 	let shixun="/shixuns";
+		// 	let paths="/paths";
+		// 	let courses="/courses";
+		// 	let projects = "/projects";
+		// 	this.props.mygetHelmetapi.navbar.map((item,key)=>{
+		// 		var reg = RegExp(item.link);
+		// 		if(shixun.match(reg)){
+		// 			if(item.hidden===true){
+		// 				shixuntype=true
+		// 			}
+		// 		}
+		// 		if(paths.match(reg)){
+		// 			if(item.hidden===true){
+		// 				pathstype=true
+		// 			}
+		// 		}
+		// 		if(courses.match(reg)){
+		// 			if(item.hidden===true){
+		// 				coursestypes=true
+		// 			}
+		// 		}
+    //     if(projects.match(reg)){
+    //       if(item.hidden===true){
+    //         projectstypes=true
+    //       }
+    //     }
+		// 	})
+		// }
+
+    return(
       <div className="bannerPanel mb60">
         <div className="educontent">
           <div className="clearfix color-white mb25">
-            <p className="myPhoto mr20 fl"><img alt="头像" src={data && `${getImageUrl('images/' + data.avatar_url)}`} /></p>
+            <p className="myPhoto mr20 fl"><img alt="头像" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/></p>
             <div className="fl">
               <p className="clearfix mt20">
-                <span className="username task-hide" style={{ "maxWidth": '370px' }}>{data && data.name}</span>
+                <span className="username task-hide" style={{"maxWidth":'370px'}}>
+                  {data && data.name}
+                </span>
                 {/*{*/}
-                {/*data && is_current == false && data.identity =="学生" ? "" : */}
-                {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
+                  {/*data && data.identity &&*/}
+                  {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
                 {/*}*/}
               </p>
-              <p className="mt15">
-                <Tooltip placement='bottom' title={data && data.professional_certification ? "已职业认证" : "未职业认证"}>
-                  <i className={data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-blue mr20 ml2" : "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>
-                </Tooltip>
-                <Tooltip placement='bottom' title={data && data.authentication ? "已实名认证" : "未实名认证"}>
-                  <i className={data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-blue" : "iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>
-                </Tooltip>
-              </p>
+              {/*{*/}
+                {/*data && data.brief_introduction &&*/}
+                {/*<p className="mt15 text-grey-e">{data.brief_introduction}</p>*/}
+              {/*}*/}
+              {/*<p className="mt15">*/}
+                {/*<Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>*/}
+                  {/*<i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-blue mr20 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>*/}
+                {/*</Tooltip>*/}
+                {/*<Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>*/}
+                  {/*<i className={ data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-blue":"iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>*/}
+                {/*</Tooltip>*/}
+              {/*</p>*/}
             </div>
             <div className="fr">
               <div className="fl headtab mt20">
-                <span>{is_current ? "我" : "TA"}的经验值</span>
-                <a style={{ "cursor": "default" }}>{data && data.experience}</a>
+                <span>全部项目数</span>
+                <a style={{"cursor": "default"}}>{data && data.projects_count}</a>
               </div>
-              <div className="fl headtab mt20 pr leftTransform pl20">
-                <span>{is_current ? "我" : "TA"}的金币</span>
-                <a style={{ "cursor": "default" }}>{data && data.grade}</a>
-              </div>
-              {
-                is_current ?
-                  <span className="fl mt35 ml60">
-                    {
-                      data && data.attendance_signed ?
-                        <span className="user_default_btn user_grey_btn font-18">已签到</span>
-                        :
-                        <a herf="javascript:void(0);" onClick={this.props.signFor} className="user_default_btn user_yellow_btn fl font-18">签到</a>
-                    }
-                  </span>
-                  :
-                  <span className="fl mt35 ml60">
-                    <LinkAfterLogin
-                      {...this.props}
-                      {...this.state}
-                      className="user_default_btn user_yellow_btn fl font-18"
-                      to={`/messages/${login}/message_detail?target_ids=${id}`}
-                    >
-                      私信
-                  </LinkAfterLogin>
-                  </span>
-              }
+              {/*<div class="fl headtab mt20">*/}
+                {/*<span>{is_current ? "我":"TA"}的经验值</span>*/}
+                {/*<a style={{"cursor":"default"}}>{data && data.experience}</a>*/}
+              {/*</div> */}
+              {/*<div class="fl headtab mt20 pr leftTransform pl20">*/}
+                {/*<span>{is_current ? "我":"TA"}的金币</span>*/}
+                {/*<a style={{"cursor":"default"}}>{data && data.grade}</a>*/}
+              {/*</div> */}
+              {/*{*/}
+                {/*is_current ? */}
+                {/*<span className="fl mt35 ml60">*/}
+                  {/*{*/}
+                    {/*data && data.attendance_signed ? */}
+                    {/*<span className="user_default_btn user_grey_btn font-18">已签到</span>*/}
+                    {/*:*/}
+                    {/*<a herf="javascript:void(0);" onClick={this.props.signFor} className="user_default_btn user_yellow_btn fl font-18">签到</a>*/}
+                  {/*}*/}
+                {/*</span> */}
+                {/*:*/}
+                {/*<span className="fl mt35 ml60">*/}
+                  {/*<LinkAfterLogin */}
+                    {/*{...this.props} */}
+                    {/*{...this.state} */}
+                    {/*className="user_default_btn user_yellow_btn fl font-18" */}
+                    {/*to={`/messages/${login}/message_detail?target_ids=${id}`}*/}
+                  {/*>*/}
+                  {/*私信*/}
+                  {/*</LinkAfterLogin>*/}
+                {/*</span>*/}
+              {/*}*/}
             </div>
           </div>
           <div className="userNav">
-            {coursestypes === true ? "" : <li className={`${moduleName == 'classrooms' || moduleName == undefined ? 'active' : ''}`}>
+						{/*{coursestypes===true?"":<li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>*/}
+              {/*<Link*/}
+                {/*onClick={() => this.setState({moduleName: 'courses'})}*/}
+                {/*to={`/users/${username}/courses`}>翻转课堂</Link>*/}
+            {/*</li>}*/}
+						{/*{shixuntype===true?"":<li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>*/}
+              {/*<Link*/}
+                {/*onClick={() => this.setState({moduleName: 'shixuns'})}*/}
+                {/*to={`/users/${username}/shixuns`}>实训项目</Link>*/}
+            {/*</li>}*/}
+						{/*{pathstype===true?"":<li className={`${moduleName == 'paths' ? 'active' : '' }`}>*/}
+              {/*<Link */}
+                {/*onClick={() => this.setState({moduleName: 'paths'})}*/}
+                {/*to={`/users/${username}/paths`}>实践课程</Link>*/}
+            {/*</li>}*/}
+            <li className={`${moduleName === 'projects' ? 'active' : '' }`}>
               <Link
-                onClick={() => this.setState({ moduleName: 'classrooms' })}
-                to={`/users/${username}/classrooms`}>教学课堂</Link>
-            </li>}
-            {shixuntype === true ? "" : <li className={`${moduleName == 'shixuns' ? 'active' : ''}`}>
-              <Link
-                onClick={() => this.setState({ moduleName: 'shixuns' })}
-                to={`/users/${username}/shixuns`}>实训项目</Link>
-            </li>}
-            {pathstype === true ? "" : <li className={`${moduleName == 'paths' ? 'active' : ''}`}>
-              <Link
-                onClick={() => this.setState({ moduleName: 'paths' })}
-                to={`/users/${username}/paths`}>实践课程</Link>
-            </li>}
-            {this.props.user && this.props.user.main_site === true ? <li className={`${moduleName == 'projects' ? 'active' : ''}`}>
-              <Link
-                onClick={() => this.setState({ moduleName: 'projects' })}
+                onClick={() => this.setState({moduleName: 'projects'})}
                 to={`/users/${username}/projects`}>开发项目</Link>
-            </li> : ""}
-            {/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
-            {/*  <Link*/}
-            {/*    onClick={() => this.setState({moduleName: 'package'})}*/}
-            {/*    to={`/users/${username}/package`}>众包</Link>*/}
-            {/*</li>*/}
-            {this.props.user && this.props.user.main_site === true ? ((is_current && current_user && current_user.is_teacher) || current_user && current_user.admin)
-              && <li className={`${moduleName == 'videos' ? 'active' : ''}`}>
-                <Link
-                  onClick={() => this.setState({ moduleName: 'videos' })}
-                  to={`/users/${username}/videos`}>视频</Link>
-              </li> : ""}
+            </li>
 
-            {/*自己的主页且不是学生显示题库按钮*/}
-            {this.props.user && this.props.user.main_site === true ? (is_current && current_user && current_user.is_teacher)
-              && <li className={`${moduleName == 'topics' ? 'active' : ''}`}>
-                <Link
-                  onClick={() => this.setState({ moduleName: 'topics' })}
-                  to={`/users/${username}/topics/personal`}>题库</Link>
-              </li> : ""}
 
           </div>
         </div>
@@ -163,4 +164,4 @@ class InfosBanner extends Component {
     )
   }
 }
-export default InfosBanner;
+export default InfosBanner;
\ No newline at end of file