diff --git a/app/assets/javascripts/admins/competition_settings/index.js b/app/assets/javascripts/admins/competition_settings/index.js
index 4804ae16e..03c940b88 100644
--- a/app/assets/javascripts/admins/competition_settings/index.js
+++ b/app/assets/javascripts/admins/competition_settings/index.js
@@ -9,7 +9,7 @@ $(document).on('turbolinks:load', function(){
         };
 
         var timeOptions = {
-            // autoclose: true,
+            autoclose: 1,
             language: 'zh-CN',
             format: 'yyyy-mm-dd hh:ii:ss',
             minuteStep: 30
@@ -23,18 +23,9 @@ $(document).on('turbolinks:load', function(){
                 $(element).find('.end-date').datepicker('setStartDate', e.date);
             });
         };
+        $(".competition-start-end-date .start-date").datetimepicker(timeOptions);
 
-        var defineTimeRangeSelect = function (element) {
-            // var options = $.extend({inputs: $(element).find('.start-date, .end-date')}, timeOptions);
-            $(".start-date").datetimepicker(timeOptions);
-
-            $(element).find('.start-date').datetimepicker().on('changeDate', function (e) {
-                $(element).find('.end-date').datetimepicker('setStartDate', e.date);
-            });
-        };
-        $(".competition-start-end-date .start-date").datetimepicker();
-
-        $(".competition-start-end-date .end-date").datetimepicker();
+        $(".competition-start-end-date .end-date").datetimepicker(timeOptions);
 
         defineDateRangeSelect('.teaching-mode-date');
         // defineTimeRangeSelect('.competition-start-end-date');
@@ -62,13 +53,13 @@ $(document).on('turbolinks:load', function(){
 
             if ($("input[name='mode']:checked").val() == 2) {
                 var $courseId = $("input[name='course_id'");
-                if ($courseId.val() === undefined || $course_id.val().length === 0) {
+                if ($courseId.val() === undefined || $courseId.val().length === 0) {
                     $courseId.addClass('danger text-danger');
                     valid = false;
                 } else {
                     $courseId.removeClass('danger text-danger');
                 }
-            } else if ($("input[name='mode']:checked").val() == 4) {
+            } else if ($("input[name='mode']:checked").val() == 3) {
                 var $techStartTime = $("input[name='teach_start_time'");
                 var $techEndTime = $("input[name='teach_end_time'");
                 if ($techStartTime.val() === undefined || $techStartTime.val().length === 0) {
@@ -84,6 +75,10 @@ $(document).on('turbolinks:load', function(){
                 } else {
                     $techEndTime.removeClass('danger text-danger');
                 }
+            } else {
+                $("input[name='course_id'").removeClass('danger text-danger');
+                $("input[name='teach_start_time'").removeClass('danger text-danger');
+                $("input[name='teach_end_time'").removeClass('danger text-danger');
             }
 
             if (!valid) return;
@@ -113,81 +108,80 @@ $(document).on('turbolinks:load', function(){
 
 $(function () {
     //MD编辑
-    $("#MD_typeFrom").on("click",".add_MD_type",function () {
-
-        var length=$(".MD_type").find(".add_MD_type").length + 1;
-        var html='<div class="row MD_type mt-2">\n' +
-            '        <div class="col-1 text-right">\n' +
-            '          <label class="checkbox checkbox-primary mt-1">\n' +
-            '            <input id="checkbox_MD_'+length+'" type="checkbox" name="checkbox_MD_'+length+'">\n' +
-            '            <label for="checkbox_MD_'+length+'">&nbsp;</label>\n' +
-            '          </label>\n' +
-            '        </div>\n' +
-            '        <div class="col-md-4"><input type="text" class="form-control" name="MD_type_value_'+length+'" placeholder="导航名称"></div>\n' +
-            '        <div class="col-md-1"><input type="text" class="form-control" name="MD_type_index_'+length+'" /></div>\n' +
-            '        <button class="btn btn-primary waves-effect waves-light btn-xs setBtn_s add_MD_type">+</button>\n' +
-            '        <button class="btn btn-icon waves-effect btn-default waves-light setBtn_s ml10 del_MD_type">×</button>\n' +
-            '      </div>';
-        $("#MD_typeFrom").append(html);
-    })
-    $("#MD_typeFrom").on("click",".del_MD_type",function () {
-        $(this).parents(".MD_type").remove();
-    })
-
+    // $("#MD_typeFrom").on("click",".add_MD_type",function () {
+    //
+    //     var length=$(".MD_type").find(".add_MD_type").length + 1;
+    //     var html='<div class="row MD_type mt-2">\n' +
+    //         '        <div class="col-1 text-right">\n' +
+    //         '          <label class="checkbox checkbox-primary mt-1">\n' +
+    //         '            <input id="checkbox_MD_'+length+'" type="checkbox" name="checkbox_MD_'+length+'">\n' +
+    //         '            <label for="checkbox_MD_'+length+'">&nbsp;</label>\n' +
+    //         '          </label>\n' +
+    //         '        </div>\n' +
+    //         '        <div class="col-md-4"><input type="text" class="form-control" name="MD_type_value_'+length+'" placeholder="导航名称"></div>\n' +
+    //         '        <div class="col-md-1"><input type="text" class="form-control" name="MD_type_index_'+length+'" /></div>\n' +
+    //         '        <button class="btn btn-primary waves-effect waves-light btn-xs setBtn_s add_MD_type">+</button>\n' +
+    //         '        <button class="btn btn-icon waves-effect btn-default waves-light setBtn_s ml10 del_MD_type">×</button>\n' +
+    //         '      </div>';
+    //     $("#MD_typeFrom").append(html);
+    // })
+    // $("#MD_typeFrom").on("click",".del_MD_type",function () {
+    //     $(this).parents(".MD_type").remove();
+    // })
 
     //链接
     $(".nav-setting-form").on("click",".add_linkBtn",function () {
         var length=$(".nav-setting-form").find(".linkFormItem").length + 1;
-        var html='<div class="row mt-2 lineFromItem">\n' +
+        var html='<div class="row mt-2 align-items-center linkFormItem">\n' +
             '          <div class="col-1 text-right">\n' +
             '            <label class="checkbox checkbox-primary mt-1">\n' +
-            '              <input id="link_'+length+'" type="checkbox" name="link_'+length+'" />\n' +
-            '              <label for="link_'+length+'">&nbsp;</label>\n' +
+            '              <input type="checkbox" name="navbar[][hidden]" value="0" class="font-16" checked="checked">\n' +
             '            </label>\n' +
             '          </div>\n' +
-            '          <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="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 class="col-md-label mt-1"><input type="hidden" value="md" name="navbar[][module_type]">\n' +
+            '          <input type="text" name="navbar[][name]" value="" class="form-control" placeholder="模块名称"></div>\n' +
+            '          <div class="col-md-1 mt-1"><input type="text" name="navbar[][position]" value="" class="form-control" placeholder="位置"></div>\n' +
+            '          <div class="col-md-3 mt-1"><input type="text" name="navbar[][url]" value="" class="form-control" placeholder="请输入资料下载地址"></div>\n' +
+            '          <a class="mt-1 btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn" href="javascript:void(0)">+</a>\n' +
+            '          <a class="mt-1 btn btn-icon waves-effect btn-default waves-light setBtn_s ml10 del_linkBtn" href="javascript:void(0)">×</a>\n' +
             '        </div>';
-        $(this).parents(".lineFromItem").insertAfter(html);
+        $(this).parents(".linkFormItem").after(html);
     });
 
-    $(".nav-setting-form").on("click",".del_linkBtn",function () {
-        $(this).parents(".lineFromItem").remove();
+    $(".nav-setting-form").on("click", ".del_linkBtn", function () {
+        $(this).parents(".linkFormItem").remove();
     });
 
     //有关报名要求
-    $("#addRequireBtn").on("click",function () {
+    $(".addRequireBtn").on("click",function () {
         var length=$("#requireForm").find(".requireForm_item").length + 1;
         var html='<div class="row mt-2 mb-4 requireForm_item">\n' +
             '          <div class="col-1 text-right">&nbsp;&nbsp;</div>\n' +
             '          <div class="col-1 text-left mt-1">\n' +
-            '            <input type="text" class="form-control" name="min_'+length+'" />\n' +
+            '            <input type="text" class="form-control" name="competition_staffs[][minimum]" value="0">\n' +
             '          </div>\n' +
             '          <span class="mt-2">~</span>\n' +
             '          <div class="col-1 mt-1">\n' +
-            '            <input type="text" class="form-control" name="max_'+length+'" />\n' +
+            '            <input type="text" class="form-control" name="competition_staffs[][maximum]" value="1">\n' +
             '          </div>\n' +
             '          <span class="mt-2">人</span>\n' +
             '          <div class="col-2 mt-1">\n' +
-            '            <select class="form-control" name="choice_'+length+'" >\n' +
-            '              <option>不限</option>\n' +
-            '              <option>教师</option>\n' +
-            '              <option>学生</option>\n' +
-            '              <option>专业人士</option>\n' +
+            '            <select class="form-control" name="competition_staffs[][category]">\n' +
+            '              <option value="all">不限</option>\n' +
+            '              <option value="teacher">教师</option>\n' +
+            '              <option value="student">学生</option>\n' +
+            '              <option value="profession">专业人士</option>\n' +
             '            </select>\n' +
             '          </div>\n' +
             '          <div class="col-2 mt-1">\n' +
             '            <label class="radio checkbox-primary mt-1" value="require_'+length+'_1">\n' +
-            '              <input id="require_'+length+'_1" name="require_1" type="radio">\n' +
+            '              <input id="require_'+length+'_1" class="mutiple-limited-radio" value="false" checked name="competition_staffs[][mutiple_limited]" type="checkbox">\n' +
             '              <label for="require_'+length+'_1">可多次报名</label>\n' +
             '            </label>\n' +
             '          </div>\n' +
             '          <div class="col-2 mt-1">\n' +
             '            <label class="radio checkbox-primary mt-1" value="require_'+length+'_2">\n' +
-            '              <input id="require_'+length+'_2" name="require_1" type="radio">\n' +
+            '              <input id="require_'+length+'_2" class="mutiple-limited-radio" value="true" name="competition_staffs[][mutiple_limited]" type="checkbox">\n' +
             '              <label for="require_'+length+'_2">不可多次报名</label>\n' +
             '            </label>\n' +
             '            <a href="javascript:void(0)" class="ml20 delRequrieBtn">\n' +
@@ -209,5 +203,33 @@ $(function () {
         } else {
             radio.parent().parent().siblings().find('.mutiple-limited-radio').attr('checked', true)
         }
-    })
+    });
+
+    var $navForm = $('form.nav-setting-form');
+    $navForm.on('click', ".submit-btn", function () {
+        $navForm.find('.submit-btn').attr('disabled', 'disabled');
+        $navForm.find('.error').html('');
+        var valid = $navForm.valid();
+
+        if (!valid) return;
+        $.ajax({
+            method: 'POST',
+            dataType: 'json',
+            url: $navForm.attr('action'),
+            data: new FormData($navForm[0]),
+            processData: false,
+            contentType: false,
+            success: function (data) {
+                $.notify({message: '保存成功'});
+                // window.location.reload();
+            },
+            error: function (res) {
+                var data = res.responseJSON;
+                $navForm.find('.error').html(data.message);
+            },
+            complete: function () {
+                $navForm.find('.submit-btn').attr('disabled', false);
+            }
+        });
+    });
 });
\ No newline at end of file
diff --git a/app/services/admins/competition_basic_setting_service.rb b/app/services/admins/competition_basic_setting_service.rb
index e5a7dd6be..d943b1cb0 100644
--- a/app/services/admins/competition_basic_setting_service.rb
+++ b/app/services/admins/competition_basic_setting_service.rb
@@ -21,7 +21,7 @@ class Admins::CompetitionBasicSettingService < ApplicationService
       competition.save!
 
       if competition.mode == 1 || competition.mode == 4
-        competition.competition_mode_setting.destroy
+        competition.competition_mode_setting&.destroy
       else
         setting = competition.competition_mode_setting || CompetitionModeSetting.create!(competition_id: competition.id)
         if competition.mode == 2
diff --git a/app/services/admins/competition_nav_setting_service.rb b/app/services/admins/competition_nav_setting_service.rb
index 9b68450f7..4254dd060 100644
--- a/app/services/admins/competition_nav_setting_service.rb
+++ b/app/services/admins/competition_nav_setting_service.rb
@@ -20,7 +20,7 @@ class Admins::CompetitionNavSettingService < ApplicationService
         else
           com_module = CompetitionModule.create!(competition_id: competition.id, module_type: 'md')
         end
-        com_module.update_attributes!(hidden: nav["hidden"] ? 0 : 1, position: nav["position"], name: nav["name"], url: nav["url"])
+        com_module.update_attributes!(hidden: nav["hidden"] ? 0 : 1, position: nav["position"] ? nav["position"] : com_module.position, name: nav["name"], url: nav["url"])
       end
 
       competition.update_attributes!(enroll_end_time: params[:enroll_end_time])
diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index c2fdabbad..57c6f2fda 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -160,7 +160,8 @@
               <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') %>
+                    <input type="checkbox" name="navbar[][hidden]" value="0" hidden class="font-16" checked="checked">
+                    <input type="checkbox" disabled="disabled" class="font-16" checked="checked">
                   </label>
                 </div>
                 <div class="col-md-4">
@@ -200,7 +201,7 @@
                 报名要求
               </div>
               <div class="col-md-3">
-                <button class="btn btn-primary waves-effect waves-light btn-xs setBtn_s" id="addRequireBtn">+</button>
+                <%= javascript_void_link '+', class: 'btn btn-primary waves-effect waves-light btn-xs setBtn_s addRequireBtn' %>
               </div>
             </div>
 
@@ -213,7 +214,7 @@
                   </div>
                   <span class="mt-2">~</span>
                   <div class="col-1 mt-1">
-                    <input type="text" class="form-control"name="competition_staffs[][maximum]" value="<%= staff.maximum %>" />
+                    <input type="text" class="form-control" name="competition_staffs[][maximum]" value="<%= staff.maximum %>" />
                   </div>
                   <span class="mt-2">人</span>
                   <div class="col-2 mt-1">
@@ -244,7 +245,7 @@
             </div>
 
           <% when 'inform', 'chart', 'resource' %>
-            <div class="row mt-2 new_module_div">
+            <div class="row mt-2 new_module_div linkFormItem">
               <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') %>
@@ -262,7 +263,7 @@
                 <div class="col-md-3 mt-1">
                   <%= text_field_tag('navbar[][url]', com_module.url, id: nil, class: 'form-control', placeholder: '请输入资料下载地址') %>
                 </div>
-                <button class="mt-1 btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn">+</button>
+                <%= javascript_void_link '+', class: 'mt-1 btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn' %>
               <% end %>
             </div>
           <% else %>
@@ -282,8 +283,8 @@
               <div class="col-md-3 mt-1">
                 <%= text_field_tag('navbar[][url]', com_module.url, id: nil, class: 'form-control', placeholder: '请输入资料下载地址') %>
               </div>
-              <button class="mt-1 btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn">+</button>
-              <button class="mt-1 btn btn-icon waves-effect btn-default waves-light setBtn_s ml10 del_linkBtn">×</button>
+              <%= javascript_void_link '+', class: 'mt-1 btn btn-primary waves-effect waves-light btn-xs setBtn_s add_linkBtn' %>
+              <%= javascript_void_link '×', class: 'mt-1 btn btn-icon waves-effect btn-default waves-light setBtn_s ml10 del_linkBtn' %>
             </div>
           <% end %>
         <% end %>
@@ -298,12 +299,13 @@
         <!--        <div class="col-md-label mt-2">获奖证书</div>-->
         <!--      </div>-->
 
+        <div class="error my-2 danger text-danger"></div>
+
         <div class="row mt-2 mb-4">
           <div class="col-1 text-right">
           </div>
           <div class="col-md-label mt-2"><%= javascript_void_link '保存', class: 'btn btn-primary submit-btn' %></div>
         </div>
-
       </div>
     <% end %>
   </div>
diff --git a/db/migrate/20191024075134_migrate_competition_module_manual.rb b/db/migrate/20191024075134_migrate_competition_module_manual.rb
new file mode 100644
index 000000000..3a2f16cff
--- /dev/null
+++ b/db/migrate/20191024075134_migrate_competition_module_manual.rb
@@ -0,0 +1,5 @@
+class MigrateCompetitionModuleManual < ActiveRecord::Migration[5.2]
+  def change
+    CompetitionModule.where(module_type: "manual").update_all(module_type: "md")
+  end
+end