Merge branch 'dev-jcq' into dev-ly

src/views/marketing/config/index.vue

@@ -8,7 +8,7 @@
 					筛选分组：<el-input placeholder="请输入分组名称" clearable
 						style="display: inline-block; width: 200px; margin-left: 5px;"
 						v-model="queryIPName" />
-					<div v-if="ipData.length > 0" class="overflow-y-auto mt-2" style="height: calc(100vh - 250px)">
+					<div v-if="ipData.length > 0" class="overflow-y-auto mt-2" style="height: calc(100vh - 300px)">
 						<JCollapse
 							@update="(item) => onClickEdit(item, 'ip')"
 							@delete="(item) => onOpenDelete(item, 'ip')"
@@ -27,7 +27,7 @@
 					筛选分组：<el-input placeholder="请输入分组名称" clearable
 					style="display: inline-block; width: 200px; margin-left: 5px;"
 					v-model="queryDomainName" />
-					<div v-if="domainData.length > 0" class="overflow-y-auto mt-2" style="height: calc(100vh - 250px)">
+					<div v-if="domainData.length > 0" class="overflow-y-auto mt-2" style="height: calc(100vh - 300px)">
 						<JCollapse
 							@update="(item) => onClickEdit(item, 'domain')"
 							:data="showDomainData"