Merge branch 'xinyan' into test

src/views/efTools/automation/components/adActivityDialog.vue

@@ -129,8 +129,6 @@ const gridOptions = reactive({
   ]),
   data: []
 });
-console.log('gridOptions', gridOptions);
-console.log('activeModel', activeModel.value);
 
 function handleCurrentChange(newPage) {
   currentPage.value = newPage;
@@ -241,7 +239,6 @@ function updateSelectedAds() {
         campaignGroupInfo: ad.campaignGroupInfo.filter(group => group.isSelected),
         page: currentPage.value
       }));
-  console.log('selectedAds.value', selectedAds.value);
 }
 
 // 树形结构的表格选择变化
@@ -383,6 +380,7 @@ async function confirm() {
 
   let campaignKeywordInfo = [];
   let campaignTargetInfo = [];
+  let adGroupInfo = [];
 
   selectedAds.value.forEach(campaign => {
     campaign.campaignGroupInfo.forEach(group => {
@@ -404,6 +402,11 @@ async function confirm() {
             }))
         );
       }
+      if(activeModel.value === 'adGroup'){
+        if (!adGroupInfo.includes(group.adGroupId)) {
+          adGroupInfo.push(group.adGroupId); // 直接推送 adGroupId
+        }
+      }
     });
   });
 
@@ -411,11 +414,10 @@ async function confirm() {
     profileId: profile.value.profile_id,
     templateId: templateId.value,
     campaignItems: campaignItems,
-    adGroupInfo: [],
+    adGroupInfo: adGroupInfo,
     campaignTargetInfo,
     campaignKeywordInfo
   };
-  console.log('requestData', requestData);
   try {
     const response = await updateAdCampaign(requestData);
     if (response.code === 2000) {