Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners

app/controllers/managements_controller.rb

@@ -1222,7 +1222,7 @@ end
 
 
   def add_partner
-    school_ids = params[:ids]
+    school_ids = params[:school]
     if school_ids.count > 0
       print school_ids
       school_ids.each do |s|

app/views/managements/_partner_addUnit.html.erb

@@ -28,21 +28,20 @@
     $(function() {
         unitDownOption();
         showprovince("province");
-        submit_add_partner();
 
         var i = 1; //设置当前页数
         var msg_list_loading = false;
         $(function() {
             var totalpage = <%= @total_pages.to_i %>; //总页数，防止超过总页数继续滚动
             var winH = $(window).height(); //页面可视区域高度
-            get_schools(1)
+
             $("#search_user_list").scroll(function() {
                 if (i < totalpage) { // 当滚动的页数小于总页数的时候，继续加载
                     var pageH = $(document.body).height();
 
                     var scrollT = $(window).scrollTop(); //滚动条top
                     var aa = (pageH - winH - scrollT) / winH;
-                    console.log(aa)
+                    console.log(aa);
                     if ( !msg_list_loading ){
                         if (aa < 0.01 ) {
                             get_schools(i+1)
@@ -51,60 +50,53 @@
                 }
             });
         });
-        function get_schools(page) {
-            var msg_list = $('#search_user_list');
-            var limit_page = 1
-            if (page > 1){
-                limit_page = page
-            }else{
-                limit_page = 1
-            }
-            if (msg_list.height() + msg_list[0].scrollTop >= msg_list[0].scrollHeight - 60) {
-                msg_list_loading = true;
-                $.getJSON("<%= all_path %>?page="+limit_page, function(schools) {
-                    if (schools) {
-                        msg_list_loading = false;
-                        let s_html = "";
-                        $.each(schools,function (index,array) {
-                            s_html =s_html+ "<p class='clearfix mt5'>" +
-                                "          <span class='fl with70'>" +
-                                "            <span>" +
-                                "                <input type='checkbox' name='school[id]' value='"+array["school"]["id"]+"' id='school_'"+array["school"]["id"]+"'class='magic-checkbox'>" +
-                                "                <label for='school_'"+array["school"]["id"]+">"+array["school"]["name"]+"</label>" +
-                                "            </span>\n" +
-                                "          </span>\n" +
-                                "          <span class='fl with30'>"+array["school"]["province"]+"</span>" +
-                                "        </p>"
-                        });
-                        $("#search_user_list").html(s_html);
-                        i ++;
-                    }
-                });
-            }
-        }
-        function submit_add_partner(){
-            if($("input[name='school[id]']:checked").length==0){
-                $("#checkNotice").html("请选择需要添加的内容").removeClass("none");
-                return;
-            }else{
-                let checked_array = [];
-                $("input[name='school[id]']:checked").each(function () {
-                    checked_array.push($(this).val())
-                });
-                let check_ids = {ids:checked_array};
-                $.ajax({
-                    url: "/managements/add_partner",
-                    type: 'POST',
-                    data: check_ids,
-                    success: function (e) {
-                        if(e.status === 1){}
-                        $("#popupAll").remove()
-                    }
-                })
-            }
-        }
-
     });
 
+    function get_schools(page) {
+        var msg_list = $('#search_user_list');
+        if (msg_list.height() + msg_list[0].scrollTop >= msg_list[0].scrollHeight - 60) {
+            msg_list_loading = true;
+            $.getJSON("<%= all_path %>?page="+page, function(schools) {
+                if (schools) {
+                    msg_list_loading = false;
+                    var s_html = "";
+                    $.each(schools,function (index,array) {
+                        s_html = s_html+ "<p class='clearfix mt5'>" +
+                            "          <span class='fl with70'>" +
+                            "            <span>" +
+                            "                <input type='checkbox' name='school[id]' value='"+array["school"]["id"]+"' id='school_'"+array["school"]["id"]+"'class='magic-checkbox'>" +
+                            "                <label for='school_'"+array["school"]["id"]+">"+array["school"]["name"]+"</label>" +
+                            "            </span>\n" +
+                            "          </span>\n" +
+                            "          <span class='fl with30'>"+array["school"]["province"]+"</span>" +
+                            "        </p>"
+                    });
+                    $("#search_user_list").append(s_html);
+                    i ++;
+                }
+            });
+        }
+    }
+    function submit_add_partner(){
+        if($("input[name='school[]']:checked").length==0){
+            $("#checkNotice").html("请选择需要添加的内容").removeClass("none");
+            return;
+        }else{
+            let checked_array = [];
+            $("input[name='school[]']:checked").each(function () {
+                checked_array.push($(this).val())
+            });
+            let check_ids = {ids:checked_array};
+            $.ajax({
+                url: "/managements/add_partner",
+                type: 'POST',
+                data: check_ids,
+                success: function (e) {
+                    if(e.status === 1){}
+                    $("#popupAll").remove()
+                }
+            })
+        }
+    }
 
 </script>

app/views/managements/_partners_list.html.erb

@@ -0,0 +1,11 @@
+<% @schools.each do |school| %>
+  <p class='clearfix mt5'>
+    <span class='fl with70'>
+      <span>
+        <input type='checkbox' name='school[]' value='<%= school.id %>' id='school_<%= school.id %>' class='magic-checkbox'>
+        <label for='school_<%= school.id %>'></label>
+      </span>
+    </span>
+    <span class='fl with30'><%= school.province %></span>
+  </p>
+<% end %>

app/views/managements/partners.html.erb

@@ -47,7 +47,7 @@
               <span><a href="javascript:void(0)" class="color-blue">+添加</a></span>
               <span>添加时间</span>
             </li>
-            <% @current_partner.customers.each do |customer| %>
+            <% @current_partner.try(:customers).try(:each) do |customer| %>
               <li>
                 <span><%= customer.school.id %></span>
                 <span class="task-hide"><%= customer.school.name %></span>