From fc8af80443973b68a1b0a04c73d61d77f2869918 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 24 Oct 2019 10:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascripts/admins/competition_settings/index.js      | 4 ++--
 app/views/admins/competition_settings/index.html.erb      | 8 +++++++-
 .../competitions/competitions/common_header.json.jbuilder | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admins/competition_settings/index.js b/app/assets/javascripts/admins/competition_settings/index.js
index 40a14fe1c..cd10aeb4f 100644
--- a/app/assets/javascripts/admins/competition_settings/index.js
+++ b/app/assets/javascripts/admins/competition_settings/index.js
@@ -145,8 +145,8 @@ $(function () {
             '          <div class="col-md-label mt-1"><input type="text" name="link_name_'+length+'" class="form-control"></div>\n' +
             '          <div class="col-md-1 mt-1"><input type="text" name="link_index_'+length+'" class="form-control"></div>\n' +
             '          <div class="col-md-3 mt-1"><input type="text" name="link_info_'+length+'" class="form-control"></div>\n' +
-            '          <button class="btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn">+</button>\n' +
-            '          <button class="btn btn-icon waves-effect btn-default waves-light setBtn_s ml10 del_linkBtn">×</button>\n' +
+            '          <button class="mt-1 btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn">+</button>\n' +
+            '          <button class="mt-1 btn btn-icon waves-effect btn-default waves-light setBtn_s ml10 del_linkBtn">×</button>\n' +
             '        </div>'
         $("#linkForm").append(html)
     })
diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index 5a20cc81e..47a6c6678 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -152,6 +152,12 @@
   </div>
   <div class="card-body row">
     <div class="container competition-mode-container">
+      <% @competition.competition_modules.each do |com_module| %>
+        <% case com_module.module_type  %>
+        <% when 'home' %>
+
+        <% end %>
+      <% end %>
       <div id="MD_typeFrom">
         <div class="row MD_type">
           <div class="col-1 text-right">
@@ -250,7 +256,7 @@
           <div class="col-md-label mt-2">资料下载</div>
           <div class="col-md-1 mt-1"><input type="text" name="link_index_1" class="form-control"></div>
           <div class="col-md-3 mt-1"><input type="text" name="link_info_1" class="form-control"></div>
-          <button class="btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn">+</button>
+          <button class="mt-1 btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn">+</button>
         </div>
       </div>
       <div class="row mt-2">
diff --git a/app/views/competitions/competitions/common_header.json.jbuilder b/app/views/competitions/competitions/common_header.json.jbuilder
index a90ab14ee..0ecf6cfd5 100644
--- a/app/views/competitions/competitions/common_header.json.jbuilder
+++ b/app/views/competitions/competitions/common_header.json.jbuilder
@@ -9,6 +9,7 @@ json.enroll_end_time @competition.enroll_end_time&.strftime("%Y-%m-%d %H:%M:%S")
 
 json.published @competition.published?
 json.nearly_published @competition.published_at.present?
+json.competition_status @competition.competition_status
 
 json.competition_modules @competition_modules do |com_module|
   json.(com_module, :id, :name, :position, :module_type)