Merge branch 'feature/act-code' into dev

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -177,7 +177,7 @@ export default {
       inserted(el, binding) {
         const SELECTDOWN_DOM = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap');
         SELECTDOWN_DOM.addEventListener('scroll', function() {
-          const CONDITION = this.clientHeight + this.scrollTop >= this.scrollHeight;
+          const CONDITION = this.scrollHeight - this.scrollTop <= this.clientHeight;
           if (CONDITION) {
             binding.value();
           }
@@ -498,7 +498,6 @@ export default {
       this.selectHmIds = val.map(item => {
         return item.hmId;
       });
-      console.log(this.selectHmIds, 'this.selectHmIds');
     },
     // 批量分组
     batchGoupEvent() {
@@ -543,8 +542,6 @@ export default {
       this.shopList = [];
     },
     searchList(e) {
-      console.log(e);
-
       this.pageParam.pageNo = 1;
       this.getTableList();
     },