Merge branch 'feature/9月-基础迭代' into dev

src/components/tag/batch-list.vue

@@ -12,7 +12,7 @@
           <p class="batch-txt">{{ list.length ? '存在分组正在被以下模块使用，请先删除对应的内容后再来删除分组。' : '删除后无法恢复，确认要删除该分组吗？' }}</p>
         </div>
         <div v-if="operNum == 2">
-          选择分类：<el-select v-model="groupId" placeholder="清选择分类" v-loadmore="loadMoreGroupList" filterable remote :remote-method="searchGroupList" class="select-classify">
+          选择分类：<el-select v-model="groupId" placeholder="请选择分类" v-loadmore="loadMoreGroupList" filterable remote :remote-method="searchGroupList" class="select-classify">
             <el-option v-for="el in groupList" :key="el.memberTagGroupClassifyId" :value="el.memberTagGroupClassifyId" :label="el.classifyName"></el-option>
             <i class="el-icon-search" slot="prefix"></i>
           </el-select>
@@ -78,7 +78,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.scrollHeight - this.scrollTop <= this.clientHeight;
+          const CONDITION = this.scrollHeight - this.scrollTop -100 <= this.clientHeight;
           if (CONDITION) {
             binding.value();
           }