From fd51fed8a1d77537f062384d43ca0be1da3a23e6 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 23 Jul 2019 19:23:40 +0800
Subject: [PATCH 1/2] welcome

---
 public/react/src/modules/tpm/NewHeader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index ed2c68e6..649fd651 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -467,14 +467,14 @@ class NewHeader extends Component {
                             <ul className="fl with50 edu-txt-center">
                                 <li>
                                     {isLogin?
-                                        <a href="/courses/join_private_courses" data-remote="true">加入课堂</a>:
+                                        <a href="/welcome/join_private_courses" data-remote="true">加入课堂</a>:
                                         <a href="/login" data-remote="true">加入课堂</a>
                                        }
 
                                 </li>
-                                <li>
+                                {/* <li>
                                     <a href="/applied_project/applied_join" data-remote="true">加入项目</a>
-                                </li>
+                                </li> */}
                             </ul>
 				      	</div>
 				    </div>

From 28afe3128281088484b0963dfbec3b7ddfb58263 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 24 Jul 2019 09:38:54 +0800
Subject: [PATCH 2/2] icon

---
 app/views/competitions/_header.html.erb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index 698238cb..f26eb6ab 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -1,5 +1,9 @@
-<div id="competition-header" class="edu-txt-right">
-  <div class="inline">
+<div id="competition-header" class="clearfix">
+  <a href="/" style="margin: 10px 20px; display: inline-block;">
+    <img alt="高校智能化教学与实训平台" class="logoimg" 
+          src="/images/educoder/headNavLogo.png?1526520218" style="width:40px">
+  </a>
+  <div class="inline fr">
     <ul class="nav-game fl">
       <% @competition.competition_modules.where(:hidden => 0).each do |com_module| %>
         <% case com_module.name %>