app/views/educode_sales/activities/index.html.erb in educode_sales-0.3.8 vs app/views/educode_sales/activities/index.html.erb in educode_sales-0.3.9

@@ -1,10 +1,11 @@
 <script type="text/html" id="activity_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">活动列表</span>
     <% if can? :create, EducodeSales::Activity %>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加活动</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import">导入数据</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加活动</button>
     <% end %>
   </div>
 </script>
 <div class="min-height-table">
 <table class="layui-hide" id="activities_table" lay-filter="activities_table"></table>
@@ -82,10 +83,11 @@
                   align: "center"
                 }
               ]
             ],
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true
         });
 
       var sort = {};
       table.on('sort(activities_table)', function (obj) {
@@ -116,9 +118,26 @@
               }
             });
             $(window).on("resize", function () {
               layer.full(index);
             });
+          }
+          else if (obj.event === 'import') {  //
+              var content = miniPage.getHrefContent('/missions/teachers/import');
+              var openWH = miniPage.getOpenWidthHeight();
+              import_index = layer.open({
+                  title: '导入数据',
+                  type: 1,
+                  shade: 0.2,
+                  shadeClose: true,
+                  area: ['200px', '100px'],
+                  offset: 'auto',
+                  closeBtn: 0,
+                  content: content,
+              });
+              $(window).on("resize", function () {
+                  layer.full(index);
+              });
           }
         });
 
         table.on('tool(activities_table)', function (obj) {
             var data = obj.data;
\ No newline at end of file