From 50b9600b8080f408d46c741bd91ae9eba30e1229 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Sat, 29 Jun 2019 10:20:40 +0800
Subject: [PATCH] fix competition

---
 app/views/competitions/_qg_second_competition.html.erb | 5 ++++-
 app/views/competitions/enroll.html.erb                 | 7 +------
 public/stylesheets/educoder/edu-all.css                | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/views/competitions/_qg_second_competition.html.erb b/app/views/competitions/_qg_second_competition.html.erb
index 675fa41e..7c69854b 100644
--- a/app/views/competitions/_qg_second_competition.html.erb
+++ b/app/views/competitions/_qg_second_competition.html.erb
@@ -15,8 +15,11 @@
           </p>
           <li class="inline enter_btn">
             <% "@urls[i][j][k]表示： 第i个比赛的第j个对象，的第k个url入口" %>
+            <% is_start = Time.now > section.start_time %>
             <% section.competition_entries.each_with_index do |entry| %>
-              <a class="li-1" href="<%= Time.now > section.start_time ? "#{entry.url}" : "javascript:void(0);" %>" <%= Time.now > section.start_time ? 'target="_blank"' : "" %> ><%= entry.name %></a>
+              <a class="li-1 <%= is_start ? 'active' : '' %>"
+                 href="<%= is_start ? "#{entry.url}" : "javascript:void(0);" %>"
+                 <%= Time.now > section.start_time ? 'target="_blank"' : "" %> ><%= entry.name %></a>
             <% end %>
           </li>
         </ul>
diff --git a/app/views/competitions/enroll.html.erb b/app/views/competitions/enroll.html.erb
index 43e37099..1c5e68dc 100644
--- a/app/views/competitions/enroll.html.erb
+++ b/app/views/competitions/enroll.html.erb
@@ -109,11 +109,6 @@
             </div>
           <% end %>
         </div>
-      <% elsif !User.current.admin? %>
-        <div class="edu-txt-center">
-          <p class="font-30 color-green mb30">您还未参与报名哦，赶紧来挑战吧~</p>
-          <img src="/images/educoder/competition/noTeam.png"/>
-        </div>
       <% end %>
       <% if User.current.admin? && @teams.present? %>
         <input class="fl ml20 mb5" style="padding: 5px; width: 200px; line-height: 20px;" maxlength="10" placeholder="输入学校名称进行搜索" type="text" id="school_name">
@@ -124,7 +119,7 @@
         <div class="cl"></div>
         <%= render :partial => "competitions/team_list" %>
       <% else %>
-        <% unless @teams.present? %>
+        <% if @teams.blank? %>
           <div class="edu-txt-center">
             <p class="font-30 color-green mb30">您还未参与报名哦，赶紧来挑战吧~</p>
             <img src="/images/educoder/competition/noTeam.png"/>
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 0721252f..d014e4e4 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -748,7 +748,7 @@ li.challenge_box:last-child{
 .enrollItemContent{padding: 0px 10px;width: 100%;box-sizing: border-box;height: 100%;overflow: hidden;}
 .enrollItemContent li{border-bottom: 1px solid #EAEAEA;padding: 20px;line-height: 20px}
 .team-p-s{width: 20px;height: 20px;line-height: 12px;text-align: center;border-radius: 50%;background: #BCBCBC;color: #fff;float: left}
-.enroll-in-b{display: block;border:4px solid #fff;width: 216px;height: 62px;text-align: center;line-height: 62px;margin: 0px 40px;font-size: 32px;color: #fff!important;background: #4CACFF}
+.enroll-in-b{display: block;border:4px solid #fff;width: 216px;height: 62px;text-align: center;line-height: 62px;margin: 0px 40px;font-size: 32px;color: #fff!important;background: #4CACFF;cursor: pointer;}
 .main_title{
     font-size: 50px;
     font-family:MicrosoftYaHei-Bold;