diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a230ea47e..53a03715c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -44,22 +44,29 @@ class CoursesController < ApplicationController
     @user = User.current
     @search = params[:search].nil? ? '' : params[:search]
     @select = params[:select].nil? ? '' : params[:select]
-    # 全部课堂
+    @is_end = params[:is_end].nil? ? 0 : params[:is_end].to_i  #是否归档
+
     @syllabuses_num  = Course.where("is_end = 0 and is_delete = 0").count
-    all_syllabuses  = Course.where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'").order("created_at desc")
-    # 我参与的课堂
-    join_syllabuses = @user.courses.where("is_end = 0 and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'").order("created_at desc")
+    #@syllabus_count = all_syllabuses.count
     # 我创建的课堂
-    create_syllabuses = Course.where(:tea_id => @user.id).where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'").order("created_at desc")
-    @syllabus_count = all_syllabuses.count
+    create_syllabuses = Course.where(:tea_id => @user.id).where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'")
+    # 我参与的课堂
+    join_syllabuses = @user.courses.where("is_end = #{@is_end} and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'")
     @join_syllabuses_count = join_syllabuses.count
     @create_syllabuses_count = create_syllabuses.count
+
     # 页面筛选的课程
     if @select == "create"
       @syllabuses = create_syllabuses
     elsif @select == "join"
       @syllabuses = join_syllabuses
+    elsif @select == "end"
+      # 归档的课堂
+      end_syllabuses = Course.where("is_end = #{@is_end} and name like '%#{@search}%'")
+      @syllabuses = end_syllabuses
     else
+      # 全部课堂
+      all_syllabuses  = Course.where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'")
       @syllabuses = all_syllabuses
     end
 
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index 82d6a1405..db5dd17a8 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -8,15 +8,16 @@
     <ul class="task-index-head-info clearfix">
       <li><span class="color-orange font-bd"><%= @syllabuses_num %></span><br/><span >全部课堂</span></li>
       <li><span class="color-orange font-bd"><%= @create_syllabuses_count + @join_syllabuses_count %></span><br/><span>我的课堂</span></li>
-<!--      <li><span class="color-orange font-bd"><%#= @create_syllabuses_count %></span><br/><span>你已创建</span></li>-->
+      <!--      <li><span class="color-orange font-bd"><%#= @create_syllabuses_count %></span><br/><span>你已创建</span></li>-->
     </ul>
   </div>
   <div class="clearfix mb15 fl">
-    <a href="<%= courses_path(:select => "all", :search => @search) %>" class="course_filtrate fl course_filtrate_bg" data-tab="all" data-remote="true">全部课堂</a>
-    <a href="<%= courses_path(:select => "create", :search => @search) %>" class="course_filtrate fl" data-tab="create" data-remote="true">我管理的</a>
-    <a href="<%= courses_path(:select => "join", :search => @search) %>" class="course_filtrate fl" data-tab="join" data-remote="true">我参与的</a>
+    <a href="<%= courses_path(:select => "all", :is_end => @is_end,:search => @search) %>" id="courses_index_syllabuses_1" class="course_filtrate fl course_filtrate_bg" data-tab="all" data-remote="true">全部课堂</a>
+    <a href="<%= courses_path(:select => "create", :is_end => @is_end, :search => @search) %>" id="courses_index_syllabuses_2" class="course_filtrate fl" data-tab="create" data-remote="true">我管理的</a>
+    <a href="<%= courses_path(:select => "join", :is_end => @is_end, :search => @search) %>" id="courses_index_syllabuses_3" class="course_filtrate fl" data-tab="join" data-remote="true">我参与的</a>
 
-<!--    <li class="edu-dropdown fl ml15 mr5" id="thirdly_select" style="width: 100px">
+
+    <!--    <li class="edu-dropdown fl ml15 mr5" id="thirdly_select" style="width: 100px">
       <a href="javascript:void(0);" class="edu-dropdown-toggle" id="all_syllabuses" >所有课程<i class="fa fa-caret-down ml20"></i></a>
       <ul class="edu-dropdown-menu" id="all_syllabuses_list">
         <li onclick="change_language(this);"><a id="courses_index_syllabuses_1" href="<%#= courses_path(:select => "all", :search => @search) %>" data-remote="true">所有课程</a></li>
@@ -29,6 +30,7 @@
       <div class="search-wrapper">
         <div class="input-holder">
           <input type="hidden" name="select" id="input_select_val" value="<%= @select %>">
+          <input type="hidden" name="is_end" id="input_select_text" value="<%= @is_end %>">
           <input type="text" class="search-input" name="search" placeholder="输入课程关键字进行搜索" />
           <button class="search-icon" onclick="searchToggle(this, event);"><i class="fa fa-search font-16 mt5"></i></button>
         </div>
@@ -36,7 +38,8 @@
       </div>
     </form>
   </div>
-
+  <a href="<%= courses_path(:select => "end", :is_end => 1) %>" id="courses_index_syllabuses_4" class="color-grey fr" data-tab="end" data-remote="true">查看归档</a>
+  <a href="<%= courses_path(:select => "return", :is_end => 0) %>" class="color-grey fr undis" id="courses_index_syllabuses_5" data-remote="true">返回</a>
   <div class="cl"></div>
   <div class="content clearfix" id="intelligence_course_list">
     <%= render :partial => 'courses/courseList' %>
@@ -62,9 +65,9 @@
     function submit_select_syllabuses(value){
         console.log(value);
         $.ajax({
-           url: "<%= courses_path %>",
-           remote: true,
-           data: { select: value, search: $("#course_search").val() }
+            url: "<%= courses_path %>",
+            remote: true,
+            data: { select: value, search: $("#course_search").val() }
         });
     }
 
@@ -137,5 +140,21 @@
             $(".course_filtrate").removeClass("course_filtrate_bg");
             $(this).addClass("course_filtrate_bg");
         }
-    })
+    });
+
+    /* -------------------恢复标签到初始位置-------------------- */
+    function reset_label_status(){
+        $(".course_filtrate").removeClass("course_filtrate_bg");
+        $("#courses_index_syllabuses_1").addClass("course_filtrate_bg");
+        $("input[name='search']").val("");
+    }
+    /* ---------------点击查看归档的返回----------------- */
+    $("#courses_index_syllabuses_5").on("click", function(){
+        reset_label_status()
+    });
+
+    /* ------------------查看归档----------------------- */
+    $("#courses_index_syllabuses_4").on("click", function(){
+        reset_label_status()
+    });
 </script>
diff --git a/app/views/courses/index.js.erb b/app/views/courses/index.js.erb
index 43375cf34..ed6add425 100644
--- a/app/views/courses/index.js.erb
+++ b/app/views/courses/index.js.erb
@@ -1,5 +1,13 @@
 $("#intelligence_course_list").html("<%= j(render :partial => "courses/courseList") %>");
-$("#courses_index_syllabuses_1").attr('href','<%= courses_path(:select => "all", :search => @search) %>');
-$("#courses_index_syllabuses_2").attr('href','<%= courses_path(:select => "create", :search => @search) %>');
-$("#courses_index_syllabuses_3").attr('href','<%= courses_path(:select => "join", :search => @search) %>');
-$("#input_select_val").val('<%= @select %>');
\ No newline at end of file
+$("#courses_index_syllabuses_1").attr('href', '<%= courses_path(:select => "all", :is_end => @is_end, :search => @search) %>');
+$("#courses_index_syllabuses_2").attr('href', '<%= courses_path(:select => "create", :is_end => @is_end, :search => @search) %>');
+$("#courses_index_syllabuses_3").attr('href', '<%= courses_path(:select => "join", :is_end => @is_end, :search => @search) %>');
+<% if params[:select] == "end" %>
+    $("#courses_index_syllabuses_4").hide();
+    $("#courses_index_syllabuses_5").show();
+<% elsif params[:select] == "return" %>
+    $("#courses_index_syllabuses_4").show();
+    $("#courses_index_syllabuses_5").hide();
+<% end %>
+$("#input_select_val").val('<%= @select %>');
+$("#input_select_text").val('<%= @is_end %>');
\ No newline at end of file