Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into project_pack

app/services/sources_service.rb

@@ -102,9 +102,10 @@ class SourcesService
 
   # games start ############################################
   def myshixuns_index params
-    time = Time.parse(params[:time].to_s)
+    endTime = Time.parse(params[:time].to_s)
+    beginTime = Time.parse(params[:begin_time].to_s)
     offset = ((params[:page] || 1).to_i - 1) * 50
-    Myshixun.select([:id, :user_id, :shixun_id]).where("created_at < ?", time).offset(offset).limit(50)
+    Myshixun.select([:id, :user_id, :shixun_id]).where("created_at < ? and created_at > ?", endTime, beginTime).offset(offset).limit(50)
   end
 
   def search_myshixun params

app/views/competitions/_header.html.erb

@@ -4,7 +4,7 @@
       <% @competition.competition_modules.where(:hidden => 0).each do |com_module| %>
         <% case com_module.name %>
           <% when '首页' %>
-            <% if params[:action] == 'show' %>
+            <% if params[:controller] == 'competitions' && params[:action] == 'show' %>
               <li class="<%= params[:action] == 'show' ? 'active' : '' %>">
                 <a href="javascript:void(0)" id="jump_page1" onclick="jump_to('page1')">首页</a>
               </li>
@@ -19,7 +19,7 @@
             <% end %>
           <% when '赛事说明' %>
             <li>
-              <% if params[:action] == 'show' %>
+              <% if params[:controller] == 'competitions' && params[:action] == 'show' %>
                 <a href="javascript:void(0)" id="jump_page3" onclick="jump_to('page3')">赛事说明</a>
               <% else %>
                 <a href="<%= competition_path(@competition, :page => 3) %>">赛事说明</a>
@@ -27,7 +27,7 @@
             </li>
           <% when '大赛机构' %>
             <li>
-              <% if params[:action] == 'show' %>
+              <% if params[:controller] == 'competitions' && params[:action] == 'show' %>
                 <a href="javascript:void(0)" id="jump_page7" onclick="jump_to('page7')">大赛机构</a>
               <% else %>
                 <a href="<%= competition_path(@competition, :page => 7) %>">大赛机构</a>

app/views/competitions/index.html.erb

@@ -75,7 +75,7 @@
               <a href="<%= url %>" class="competition-Img">
                 <%= image_tag(url_to_avatar(competition), :width => "100%", :height => "100%") %>
               </a>
-              <div class="pt20 pl20 mb10 clearfix">
+              <div class="pt30 pb30 pl20 mb10 clearfix">
                 <a href="<%= url %>" style="max-width: 400px;" class="font-16 task-hide fl"><%= [competition.name, competition.sub_title.presence].compact.join('——') %></a>
                 <div class="fr status-orange">
                   <img src="/images/educoder/competition/home/orange.png" class="fl">

public/stylesheets/educoder/edu-all.css

@@ -642,7 +642,7 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important;
 .position-shixun{position: absolute;z-index: 2;bottom: 40px;text-align: center;width: 100%}
 .ccf-position-shixun .shixun-btn,.position-shixun .shixun-btn,.ccf-position-shixun-2 .shixun-btn{display: block;float: left;width: 160px;text-align:center;letter-spacing: 1px;height: 40px;line-height: 40px;color:#fff!important;margin:0px 20px;background: linear-gradient(to right, #ff8634 , #ff9d5b);box-shadow: 6px 4px 11px #f7ece4;}
 /*第二次竞赛-全国*/
-.second_1{min-height: 832px;}
+.second_1{min-height: 825px;}
 .second_2{min-height: 446px;}
 .second_3{min-height: 766px;padding-top: 190px;box-sizing: border-box;position: relative}
 .second_3_small{min-height: 595px;padding-top: 190px;box-sizing: border-box;position: relative}
@@ -898,7 +898,7 @@ table.tBodyScroll thead th{
 .homePageBtn{position: absolute;width: 100%;top: 510px;}
 .homeBtn{display: block;float: left;border-radius: 30px;width: 168px;height: 60px;line-height: 60px;background-color: #21B351;font-size: 30px;color: #fff!important;text-align: center}
 
-.competitionsList-item{width: 50%;float: left;box-sizing: border-box;position: relative}
+.competitionsList-item{width: 50%;float: left;box-sizing: border-box;position: relative;height: 463px}
 .competitionsList-item:nth-of-type(odd){padding-right: 10px;}
 .competitionsList-item:nth-of-type(even){padding-left: 10px;}
 .competitionsList-item-tip{