Merge branch 'develop' into szzh

app/views/student_work/_evaluation_un_work.html.erb

@@ -26,10 +26,12 @@
     </ul>
   </li>
   <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <% if student_work.created_at && @homework.end_time%>
         <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
         <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
             <span class="c_red">[迟交]</span>
         <% end %>
+    <% end %>
   </li>
   <li class="hworkList50 <%= score_color student_work.teacher_score%>">
     <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>

app/views/users/new_user_commit_homework.html.erb

@@ -105,7 +105,10 @@
 
         <% @student_work.student_work_tests.each_with_index do |test, index| %>
           <div class="ProResultTop">
-             <p class="c_blue fl">第<%= @student_work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
+             <p class="c_blue fl">
+               第<%= @student_work.student_work_tests.count - index%>次测试
+             </p>
+            <span class="fr c_grey"><%= format_time(test.created_at).to_s%></span>
                <div class="cl"></div>
           </div>
           <% if test.status.to_i == -2 %>