Merge branch 'dev-jcq' into dev-ly

src/api/marketing/config.ts

@@ -16,7 +16,15 @@ export const pageListIp = (params?: Object) => {
 		params,
 	});
 };
-
+//获取配置ip集合
+export const getConfigIpList = (params?: Object) => {
+	return request({
+		url: '/marketing/config/ipList',
+		// url: 'https://m1.apifoxmock.com/m1/6687089-6396408-default/marketing/config/page',
+		method: 'get',
+		params,
+	});
+};
 //修改域名分组
 export const saveDomains = (data: Object) => {
 	return request({

src/utils/ipUpdate.ts

@@ -24,7 +24,7 @@
     end: `${prefix}.${endLastOctet}`,
   };
 };
-
+//将ip分开由end和start组成
 const ipSplicing = (startIp: string, endIp: string | null | undefined): string => {
   if (!endIp || endIp.trim() === '' || startIp === endIp) {
     return startIp;
@@ -37,4 +37,4 @@ const ipSplicing = (startIp: string, endIp: string | null | undefined): string =
   return `${startIp}/${lastPartOfEndIp}`;
 };
 
-export { ipSplicing,parseIpRange };
+export { ipSplicing, parseIpRange };

src/views/marketing/config/i18n/zh-cn.ts

@@ -28,8 +28,8 @@ export default {
 		ipTip: '请输入IP',
 		groupingName: '分组名称',
 		groupingNameTip: '请输入分组名称',
-		triggerType: '触发类型',
-		triggerTypeTip: '请选择触发类型',
+		triggerType: '触发规格',
+		triggerTypeTip: '请选择触发规格',
 		jumpMode: '触发方式',
 		jumpModeTip: '请选择触发方式',
 		jumpLink: '跳转链接',

src/views/marketing/config/index.vue

@@ -45,7 +45,7 @@
 								<span class="mr-2">白名单</span>
 								<el-popover v-for="item in data" :key="item.id" width="200" trigger="hover" placement="top">
 									<div class="flex flex-wrap">
-										<span v-for="ip in item.ips" :key="ip" class="ml-2">
+										<span v-for="ip in item.list" :key="ip" class="ml-2">
 											{{ ip }}
 										</span>
 									</div>
@@ -60,7 +60,7 @@
 								<span class="mr-2">黑名单</span>
 								<el-popover v-for="item in data" :key="item.id" width="200" trigger="hover" placement="top">
 									<div class="flex flex-wrap">
-										<span v-for="ip in item.ips" :key="ip" class="ml-2">
+										<span v-for="ip in item.list" :key="ip" class="ml-2">
 											{{ ip }}
 										</span>
 									</div>
@@ -165,7 +165,7 @@
 </template>
 
 <script lang="ts" name="marketingConfig" setup>
-import { delGroup, pageListDomain, pageListIp } from '/@/api/marketing/config';
+import { delGroup, pageListDomain, pageListIp ,getConfigIpList } from '/@/api/marketing/config';
 import { useI18n } from 'vue-i18n';
 import { useMessage } from '/@/hooks/message';
 import { rule } from '/@/utils/validate';
@@ -281,6 +281,7 @@ const handleClick = (data: any) => {
 	} else if (data.props.label === '域名分组') {
 		getDomainData();
 	} else {
+		getConfig()
 	}
 };
 const onDel = async (data: any) => {
@@ -314,6 +315,15 @@ const onClickEdit = (item: any, type: string) => {
 const onOpenEditMenu = (type: string, row: any) => {
 	menuDialogRef.value.openDialog(type, row);
 };
+const getConfig = () => { 
+      configIp()
+};
+const configIp = async()=>{
+	await getConfigIpList().then((val) => { 
+		console.log(val.data);
+		
+	});
+}
 const getDomainData = async () => {
 	await pageListDomain().then((val) => {
 		domainActiveId.value = [];