From 92f4506504d9faffa797c8ac458fa1eae75a776e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 18 Sep 2017 17:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=9E=E8=AE=AD=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=89=E5=8F=89=EF=BC=8C=E4=B9=9F=E4=BC=9A?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixuns/_shixun_list.html.erb | 21 ++++++++++++++-------
 app/views/shixuns/index.html.erb        | 12 ------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/views/shixuns/_shixun_list.html.erb b/app/views/shixuns/_shixun_list.html.erb
index 0c31c3df1..7b425c6be 100644
--- a/app/views/shixuns/_shixun_list.html.erb
+++ b/app/views/shixuns/_shixun_list.html.erb
@@ -56,13 +56,20 @@
 <% end %>
 </div>
 <script>
-       // $(function(){
-
-       // })
-
-
-
-
+    //关闭搜索框
+    function colse_searchbox(){
+        $('.searchinput').val('');
+        <% unless @search.blank? %>
+        $.ajax({
+            url: '/shixuns/search',
+            type: 'post',
+            data: $("#shixun_index_search_form").serialize(),
+            remote: true,
+            success: function(data){
+            }
+        });
+        <% end %>
+    }
 
     var timer="";
     $(".task-index-list-box").hover(function(ev){
diff --git a/app/views/shixuns/index.html.erb b/app/views/shixuns/index.html.erb
index 9144340ef..284f439ac 100644
--- a/app/views/shixuns/index.html.erb
+++ b/app/views/shixuns/index.html.erb
@@ -348,18 +348,6 @@
             }
         });
     }
-    //关闭搜索框
-    function colse_searchbox(){
-        $('.searchinput').val('');
-        $.ajax({
-            url: '/shixuns/search',
-            type: 'post',
-            data: $("#shixun_index_search_form").serialize(),
-            remote: true,
-            success: function(data){
-            }
-        });
-    }
 
     // 新建实训
     function shixun_new(mail){