Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/views/event/components/view/table.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="eventTable height_100">
     <el-table :data="tableData" header-row-class-name="custom-table-header" @sort-change="sortChange"
-      :infinite-scroll-distance="10"
+    v-el-table-infinite-scroll="getList"
+    :infinite-scroll-distance="10"
       :infinite-scroll-disabled="disabled"
       :height="row?300:auto">
       <el-table-column label="#" width="60" type="index" align="center">