开源创新组的竞赛页面

app/views/competitions/_qg_second_competition.html.erb

@@ -5,10 +5,10 @@
 <% index += 1 %>
 
 <% @competition.competition_stages.each_with_index do |stage, i| %>
-  <div class="second_3" style="background: url(<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>) no-repeat top center;">
+  <div class="<%= i == 1 ? "second_3_small" :"second_3" %>" style="background: url(<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>) no-repeat top center;">
     <div class="enter_panel">
       <% stage.competition_stage_sections.each do |section| %>
-        <ul class="mb40">
+        <ul class="mb30">
           <p class="mb30 font-22 enter_title">
             <span class="mr20 font-bd"><%= section.name %></span>
             <span><%= format_time section.start_time %> ~ <%= com_end_time section.end_time %></span>

app/views/competitions/_qg_second_opensource.html.erb

@@ -0,0 +1,47 @@
+<div class="openSource_1" style="background: url('/images/educoder/competition/qg/qg_open_1.png') no-repeat top center;"></div>
+<div class="openSource_2" style="background: url('/images/educoder/competition/qg/qg_open_2.png') no-repeat top center;"></div>
+<div class="openSource_3" style="background: url('/images/educoder/competition/qg/qg_open_3.png') no-repeat top center;">
+  <div class="enter_panel" style="height: 285px">
+    <ul>
+      <p class="font-22 enter_title padding30 clearfix">
+        <span class="fl ml30">
+            <span class="mr20 font-bd">开源任务征集</span>
+            <span>2019年7月1日~2019年7月20日</span>
+        </span>
+        <span class="fr mr30">
+            <span class="mr20 font-bd">开源任务发布</span>
+            <span>2019年7月21日</span>
+        </span>
+      </p>
+      <li class="inline enter_btn mt20">
+        <a href="javascript:void(0);" class="li-1">项目名称1</a>
+        <a href="javascript:void(0);" class="li-1">项目名称2</a>
+        <a href="javascript:void(0);" class="li-1">项目名称3</a>
+      </li>
+    </ul>
+  </div>
+</div>
+<div class="openSource_4" style="background: url('/images/educoder/competition/qg/qg_open_4.png') no-repeat top center;">
+  <div class="enter_panel" style="height: 285px">
+    <ul>
+      <p class="font-22 enter_title padding30 clearfix">
+        <span class="fl ml30">
+            <span class="mr20 font-bd">开源开发阶段</span>
+            <span>2019年7月1日~2019年7月20日</span>
+        </span>
+        <span class="fr mr30">
+            <span class="mr20 font-bd">成绩发布阶段</span>
+            <span>2019年7月21日</span>
+        </span>
+      </p>
+      <li class="inline enter_btn mt20">
+        <a href="javascript:void(0);" class="li-1">项目名称1</a>
+        <a href="javascript:void(0);" class="li-1">项目名称2</a>
+        <a href="javascript:void(0);" class="li-1">项目名称3</a>
+      </li>
+    </ul>
+  </div>
+</div>
+<div class="openSource_5" style="background: url('/images/educoder/competition/qg/qg_open_5.png') no-repeat top center;"></div>
+<div class="openSource_6" style="background: url('/images/educoder/competition/qg/qg_open_6.png') no-repeat top center;"></div>
+<div class="openSource_7" style="background: url('/images/educoder/competition/qg/qg_open_7.png') no-repeat top center;"></div>

app/views/competitions/enroll.html.erb

@@ -1,5 +1,5 @@
 <div class="enroll-b">
-      <div class="enroll-t" style="background:url('/images/educoder/competition/anon.png') no-repeat top center;">
+  <div class="enroll-t" style="background:url('/images/educoder/competition/anon.png') no-repeat top center;">
     <div class="educontent edu-txt-center">
       <p class="main_title"><%= @competition.name %></p>
       <% if @maximum_staff > 1 %>
@@ -67,7 +67,7 @@
             <div class="clearfix mt30 pr88">
               <% @is_enroll.each do |team| %>
                 <li class="clearfix joinTeamInfo">
-                  <span class="fl mr20 ml35">
+                  <span class="fl mr20 ml20">
                     <%= link_to image_tag(url_to_avatar(team.user), :width => "48", :height => "48", :class => "radius fl mr10"), user_path(team.user), :title => team.user.show_name, :target => "_blank", :alt => "用户头像" %>
                     <span class="fl task-hide mt12 font-16" style="width: 140px;"><span data-tip-down="<%= team.name %>"><%= team.name %></span></span>
                   </span>
@@ -84,22 +84,22 @@
                       <% end %>
                     </span>
                   </span>
-                  <span class="fl mr40 mt13 font-16">邀请码：<label class="color-orange"><%= team.invite_code %></label></span>
+                  <span class="fl mr10 mt13 font-16">邀请码：<label class="color-orange"><%= team.invite_code %></label></span>
                   <% if @competition.enroll_end_time.present? && @competition.enroll_end_time < Time.now %>
                     <% if User.current.admin? || User.current == team.user %>
-                      <a href="<%= edit_competition_team_path(team) %>" data-remote="true" class="fl mt13 mr20" data-tip-down="编辑"><i class="iconfont icon-bianjidaibeijing color-blue fl"></i></a>
+                      <a href="<%= edit_competition_team_path(team) %>" data-remote="true" class="fl mt13 mr10" data-tip-down="编辑"><i class="iconfont icon-bianjidaibeijing color-blue fl"></i></a>
                     <% end %>
                   <% else %>
                     <% if User.current.admin? || User.current == team.user %>
-                      <a href="<%= edit_competition_team_path(team) %>" data-remote="true" class="fl mt13 mr20" data-tip-down="编辑"><i class="iconfont icon-bianjidaibeijing color-blue fl"></i></a>
+                      <a href="<%= edit_competition_team_path(team) %>" data-remote="true" class="fl mt13 mr10" data-tip-down="编辑"><i class="iconfont icon-bianjidaibeijing color-blue fl"></i></a>
                       <a href="javascript:void(0)" class="font-16 color-grey-c fl mt12" onclick="delete_confirm_box('<%= exit_team_competition_team_path(team) %>', '是否确认删除战队')" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15"></i></a>
                     <% else %>
                       <a href="javascript:void(0)" class="font-16 color-grey-c fl mt12" onclick="delete_confirm_box('<%= exit_team_competition_team_path(team) %>', '是否确认退出战队')">退出</a>
                     <% end %>
                   <% end %>
-
+                  <a href="javascript:void(0)" class="enrollOperation">进入大赛</a>
                   <% if @competition.identifier == 'gcc-course-2019' %>
-                    <%= link_to '战队详情', competition_team_path(id: @competition.id) %>
+                    <%= link_to '战队详情', competition_team_path(id: @competition.id),:class => "enrollOperation" %>
                   <% end %>
                 </li>
               <% end %>

public/stylesheets/educoder/edu-all.css

@@ -628,6 +628,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 .enterTo span.f-cart{width: 246px;text-align: center;color: #29BD8B;font-size: 20px;line-height: 20px;float: left;display: block;font-weight: bold;margin-right: 20px;}
 .enterTo span.d-cart{box-sizing:border-box;width: 246px;text-align: center;color: #989898;font-size: 16px;line-height: 22px;float: left;display: block;margin-right: 20px;}
 .partGame.largepart .partborder .enterTo a:last-child,.enterTo span.f-cart:last-child,.enterTo span.d-cart:last-child{margin-right:0px;}
+
 /*.partTime.active .time{color:#ff3232; }*/
 .partTime.active .enterTo a{cursor: pointer;background-color: #29bd8b;box-shadow: 0px 10px 10px rgba(41,189,139,0.2)}
 a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important;box-shadow: none!important;font-size: 14px!important;text-align: left;line-height: 20px;height: 20px;padding-bottom: 1px;border-bottom: 1px solid #418ccd;width: auto!important;border-radius: 0px;}
@@ -643,7 +644,8 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important;
 /*第二次竞赛-全国*/
 .second_1{min-height: 832px;}
 .second_2{min-height: 446px;}
-.second_3{min-height: 595px;padding-top: 190px;box-sizing: border-box;position: relative}
+.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}
 .second_4{min-height: 610px;padding-top: 190px;box-sizing: border-box;position: relative}
 .second_5{min-height: 617px;padding-top: 190px;box-sizing: border-box;position: relative}
 .second_6{min-height: 1053px;}
@@ -659,6 +661,15 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important;
 .second_code_6{min-height: 1060px;}
 .second_code_7{min-height: 1116px;}
 .second_code_8{min-height: 711px;}
+/*开源创新竞赛*/
+.openSource_1{min-height: 803px;}
+.openSource_2{min-height: 427px;}
+.openSource_3{min-height: 524px;padding-top: 190px;box-sizing: border-box;position: relative}
+.openSource_4{min-height: 526px;padding-top: 190px;box-sizing: border-box;position: relative}
+.openSource_5{min-height: 1061px;}
+.openSource_6{min-height: 1090px;}
+.openSource_7{min-height: 683px;}
+
 .challenge_title{
     color: #41ABEF;font-size: 30px;font-weight: bold;text-align: center;letter-spacing: 1px;line-height: 60px;margin-bottom: 20px;
 }
@@ -843,6 +854,18 @@ table.tBodyScroll thead th{
 
 .joinTeamInfo{background-image:url('/images/educoder/competition/enroll-item.png');height:202px;width: 934px;padding: 10px 35px;box-sizing: border-box;margin: 0px auto;padding-top: 60px;}
 .joinTeamInfo span,.joinTeamInfo a{line-height: 30px;}
+.enrollOperation{
+    float: left;
+    padding: 0px 8px;
+    border-radius: 27px;
+    background: #459be5;
+    color: #fff!important;
+    font-size: 12px!important;
+    height: 20px;
+    line-height: 19px;
+    margin-top: 18px;
+    margin-left: 15px;
+}
 /*弹框*/
 .c-l-box{background: rgba(139,163,183,0.08);height: 226px;overflow-y: auto;width: 100%;padding: 20px 20px 0px 20px;box-sizing: border-box;}
 .c-l-box li,.c-r-box li{margin-bottom: 15px;line-height: 25px;}