Merge branch 'newVersion_forge' into dev_devOps

src/forge/UsersList/focus_button.js

@@ -53,7 +53,6 @@ class FocusButton extends Component {
       })
       .catch((error) => {
         this.setState({ isSpin: false })
-        console.log(error);
       });
   };
 

src/modules/tpm/NewHeader.js

@@ -12,6 +12,7 @@ import 'antd/lib/checkbox/style/index.css';
 import 'antd/lib/radio/style/index.css';
 import 'antd/lib/input/style/index.css';
 import './TPMIndex.css';
+import logo from './images/logo.png';
 
 const $ = window.$
 // TODO 这部分脚本从公共脚本中直接调用
@@ -721,12 +722,12 @@ class NewHeader extends Component {
             <GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool) => this.setgoshowqqgtounp(bool)}></GotoQQgroup>
             :""
           }
-          <a href={mygetHelmetapi2 && mygetHelmetapi2.new_course.default_url} className={"fl mr30"}>
+          <a href={mygetHelmetapi2 && mygetHelmetapi2.new_course.default_url} className={"fl mr30"} style={{minWidth:"45px"}}>
             {
-              mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url && mygetHelmetapi2.nav_logo_url ?
+              mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url ?
               <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(mygetHelmetapi2.nav_logo_url)}></img>
               :
-              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
+              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={logo}></img>
             }
           </a>
           {