From e70e0f54f39a4fc474f5afe2b7350d47ca9f5886 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 24 Oct 2019 10:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competition_settings/index.html.erb       | 31 ++++++++++---------
 app/views/users/get_user_info.json.jbuilder   |  1 +
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index 47a6c6678..7133b7254 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -155,22 +155,25 @@
       <% @competition.competition_modules.each do |com_module| %>
         <% case com_module.module_type  %>
         <% when 'home' %>
-
+          <div id="MD_typeFrom">
+            <div class="row MD_type">
+              <div class="col-1 text-right">
+                <label class="checkbox checkbox-primary mt-1">
+                  <%= check_box_tag('navbar[][hidden]', 0, !com_module.hidden, id: nil, class: 'font-16') %>
+                </label>
+              </div>
+              <div class="col-md-4">
+                <%= text_field_tag('navbar[][name]', com_module.name, id: nil, class: 'form-control', placeholder: '首页') %>
+                <input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]">
+              </div>
+              <div class="col-md-1">
+                <%= text_field_tag('navbar[][position]', com_module.position, id: nil, class: 'form-control', placeholder: '位置') %>
+              </div>
+            </div>
+          </div>
         <% end %>
       <% end %>
-      <div id="MD_typeFrom">
-        <div class="row MD_type">
-          <div class="col-1 text-right">
-            <label class="checkbox checkbox-primary mt-1">
-              <input id="checkbox_MD_1" name="checkbox_MD_1" type="checkbox">
-              <label for="checkbox_MD_1">&nbsp;</label>
-            </label>
-          </div>
-          <div class="col-md-4"><input type="text" class="form-control" name="MD_type_value_1" placeholder="导航名称"></div>
-          <div class="col-md-1"><input type="text" class="form-control" name="MD_type_index_1"></div>
-          <button class="btn btn-primary waves-effect waves-light btn-xs setBtn_s add_MD_type">+</button>
-        </div>
-      </div>
+
       <div class="row mt-2">
         <div class="col-1 text-right">
           <label class="checkbox checkbox-primary mt-1">
diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder
index e18ccfe05..06794b31e 100644
--- a/app/views/users/get_user_info.json.jbuilder
+++ b/app/views/users/get_user_info.json.jbuilder
@@ -4,6 +4,7 @@ json.login @user.login
 json.user_id @user.id
 json.image_url url_to_avatar(@user)
 json.admin @user.admin?
+json.business @user.business?
 json.is_teacher @user.user_extension&.teacher?
 json.user_identity @user.identity
 json.tidding_count 0