Merge branch 'dev_partners' into develop

app/views/cooperates/partner_list.html.erb

@@ -35,7 +35,7 @@
 
 
     function submit_search_major(){
-        $.get('/cooperates/partner_list',
+        $.get('/cooperates/<%= @partner.id %>/partner_list',
             { search: $("input[name='search']").val().trim()});
     }
 

app/views/managements/partners.html.erb

@@ -2,7 +2,7 @@
   <div class="clearfix edu-back-white padding20-30">
     <input class="fl task-form-20 task-height-30" placeholder="输入合作伙伴名称进行搜索" id="partner_search">
     <a href="javascript:void(0)" class="fl task-btn task-btn-orange ml10" onclick="submit_search_partner()">搜索</a>
-    <a href="javascript:void(0)" class="fl task-btn ml10">清除</a>
+    <a href="javascript:void(0)" class="fl task-btn ml10" onclick="$('#partner_search').val('')">清除</a>
   </div>
   <div class="clearfix mt20">
     <div class="with25 fl edu-back-white">