diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index ad6b2e504..0c38335bf 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -41,7 +41,7 @@
<% when 1 %>
<%= link_to '关闭匿评', stop_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true %>
<% when 2 %>
- 已关闭匿评
+ 匿评结束
<% end %>
<%= link_to(
diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb
index 0b38d07d9..9265f23f0 100644
--- a/app/views/bids/_homework.html.erb
+++ b/app/views/bids/_homework.html.erb
@@ -29,7 +29,8 @@
window.onready = function()
{
- <% if !@is_teacher && @homework_list.count > 0%>
+ <% if !@is_teacher && @homework_list.count > 0 && @bid.comment_status == 1%>
+ //登录者不是老师,且作业列表数目不为0,且作业处于开启匿评阶段
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_attach/praise_alert') %>');
showModal('ajax-modal', '480px');
$('#ajax-modal').css('height','240px');
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 828474acb..2b7b87b0f 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -34,9 +34,12 @@
<%= link_to "我的作品", get_my_homework_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
-
- <%= link_to "所有作品", get_homeworks_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
-
+ <% if @bid.comment_status == 2 %>
+
+
+ <%= link_to "所有作品", get_homeworks_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
+
+ <% end %>
<%= link_to "留言", get_homework_jours_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
(
diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb
index e9252edf3..c6b7895cc 100644
--- a/app/views/homework_attach/_homework.html.erb
+++ b/app/views/homework_attach/_homework.html.erb
@@ -61,13 +61,24 @@
<% end %>
<% elsif is_student_batch_homework%>
-
-
- <%= link_to l(:label_work_rating),homework_attach_path(homework),:remote => true %>
- <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
- 迟交!
- <% end %>
-
+
+ <% if @bid.comment_status == 1 %>
+
+
+ <%= link_to l(:label_work_rating),homework_attach_path(homework),:remote => true %>
+ <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
+ 迟交!
+ <% end %>
+
+ <% elsif @bid.comment_status == 2%>
+
+
+ 评分
+ <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
+ 迟交!
+ <% end %>
+
+ <% end %>
<% else %>