Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/assets/javascripts/admins/competition_settings/index.js

@@ -11,7 +11,7 @@ $(document).on('turbolinks:load', function(){
         var timeOptions = {
             autoclose: 1,
             language: 'zh-CN',
-            format: 'yyyy-mm-dd hh:ii:ss',
+            format: 'yyyy-mm-dd hh:ii',
             minuteStep: 30
         };
 
@@ -27,6 +27,8 @@ $(document).on('turbolinks:load', function(){
 
         $(".competition-start-end-date .end-date").datetimepicker(timeOptions);
 
+        $(".nav-setting-form .enroll_end_time").datetimepicker(timeOptions);
+
         defineDateRangeSelect('.teaching-mode-date');
         // defineTimeRangeSelect('.competition-start-end-date');
 

app/views/admins/competition_settings/index.html.erb

@@ -35,8 +35,8 @@
             起止时间
           </div>
           <div class="col-5 competition-start-end-date d-flex">
-            <%= text_field_tag :start_time, @competition.start_time&.strftime('%Y-%m-%d %H:%M:%S'), autocomplete: 'off', class: 'form-control start-date mx-0 mr-2', placeholder: '竞赛开始时间' %>
-            <%= text_field_tag :end_time, @competition.end_time&.strftime('%Y-%m-%d %H:%M:%S'), autocomplete: 'off', class: 'form-control end-date mx-0', placeholder: '竞赛截止时间' %>
+            <%= text_field_tag :start_time, @competition.start_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'form-control start-date mx-0 mr-2', placeholder: '竞赛开始时间' %>
+            <%= text_field_tag :end_time, @competition.end_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'form-control end-date mx-0', placeholder: '竞赛截止时间' %>
           </div>
         </div>
 
@@ -192,7 +192,7 @@
                 报名截止时间
               </div>
               <div class="col-md-3">
-                <%= text_field_tag :enroll_end_time, @competition.enroll_end_time&.strftime('%Y-%m-%d'), autocomplete: 'off', class: 'form-control enroll_end_time', placeholder: '报名截止时间' %>
+                <%= text_field_tag :enroll_end_time, @competition.enroll_end_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'form-control enroll_end_time', placeholder: '报名截止时间' %>
               </div>
             </div>
             <div class="row mt-2">

app/views/competitions/competition_modules/show.json.jbuilder

@@ -4,6 +4,7 @@ mds = @module.competition_module_md_contents
 json.md_contents mds.each do |md|
   json.md_name md.name
   json.md_content md.content
+  json.competition_stage_id md.competition_stage_id
   json.created_at md.created_at.strftime('%Y-%m-%d %H:%M:%S')
   json.attachments do
     json.array! md.attachments, partial: 'attachments/attachment_simple', as: :attachment