diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb
index 1dc20f046..f880ce945 100644
--- a/app/views/courses/_set_join.js.erb
+++ b/app/views/courses/_set_join.js.erb
@@ -1,10 +1,11 @@
 <% if object_id%>
     $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(course, user)) %>");
+    $("#try_join_course_link").replaceWith("<a href='<%=url_for(:controller => 'homework_common', :action => 'index',:course=>course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品</a>");
 <% end %>
 <% if @state %>
 	<% if @state == 0 %>
 		alert("加入成功");
-        hideModal($("#popbox"));
+        hideModal($("#popbox02"));
 	<% elsif @state == 1 %>
 		alert("密码错误");
 	<% elsif @state == 2 %>
diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb
index 3a6b317f0..dc277805c 100644
--- a/app/views/users/_course_form.html.erb
+++ b/app/views/users/_course_form.html.erb
@@ -30,7 +30,10 @@
         <td>学生人数：</td>
         <td><a href="<%= url_for(:controller => 'courses', :action=>"member", :id=>item.id,:role=>2, :host=>Setting.host_course) %>"><%= studentCount(item) %></a></td>
         <td>开课学期：</td>
-        <td><%= item.time %><%= get_course_term_locales item %></td>
+        <td>
+          <%= item.time %>
+          <%= get_course_term_locales item %>
+        </td>
       </tr>
       </tbody></table>
     </div>
@@ -39,8 +42,10 @@
     <span class="grey_n_btn fr mt20">课程结束</span>
   <% elsif(can_edit_flag) %>
     <a href="<%=url_for(:controller => 'homework_common', :action => 'new',:course=>item.id, :host=>Setting.host_course)%>" target="_blank" class="blue_n_btn fr mt20">发布作业</a>
-  <% else %>
+  <% elsif User.current.member_of_course? item %>
     <a href="<%=url_for(:controller => 'homework_common', :action => 'index',:course=>item.id, :host=>Setting.host_course)%>" target="_blank" class="blue_n_btn fr mt20">提交作品</a>
+  <% elsif User.current.logged?%>
+    <%= link_to "加入课程",try_join_path(:object_id => item.id), :class => "blue_n_btn fr mt20", :remote => "true",:id => "try_join_course_link"%>
   <% end %>
   <div class="cl"></div>
 </div>
\ No newline at end of file