build

dist/index.html

@@ -12,7 +12,7 @@
 			document.write('<script src="' + src + '"><\/script>');
 			})();
     </script>
-    <script type="module" crossorigin src="./assets/index.6a25e046.js"></script>
+    <script type="module" crossorigin src="./assets/index.be8d1c8e.js"></script>
     <link rel="modulepreload" href="./js/@vue/@vue.5bfcce30.js">
     <link rel="modulepreload" href="./js/vue-router/vue-router.ccba075e.js">
     <link rel="modulepreload" href="./js/vue-demi/vue-demi.4f3c4c97.js">

src/components/businessMoudle/batchGdt3/configArea/basicInfo/sellStrategy.vue

@@ -35,7 +35,7 @@
           <div class="listCon rMar10">
             <div class="flex_between operate">
               <div class="flex f13 c-333">
-                <span class="rMar15">计划数：{{ acc_plan_ad_count[accId]?.plan_count || 0 }}</span>
+                <!-- <span class="rMar15">计划数：{{ acc_plan_ad_count[accId]?.plan_count || 0 }}</span> -->
                 <!-- <span>广告数：{{ acc_plan_ad_count[accId]?.ad_count || 0 }}</span> -->
               </div>
               <div class="f13 c-theme flex pointer" @click="getSync"><el-icon class="rMar5">

src/components/businessMoudle/batchGdt3/configArea/creativeMaterial/index.vue

@@ -12,6 +12,21 @@
         :destroyOnCloseFlag="true"
         dialog-title="创意素材">
       <template v-slot:content>
+
+        <RadioGroup :id="pageInfo.radioId"
+                      :radioList="accountShareRuleRadioList.list"
+                      :echoVal="accountShareRuleRadioList.radioVal"
+                      :title="accountShareRuleRadioList.name"
+                      :haveNotes="accountShareRuleRadioList.haveNotes"
+                      @returnEvent="val=>{accountShareRuleRadioList.radioVal = val;}"></RadioGroup>
+
+        <RadioGroup :id="pageInfo.radioId"
+                      :radioList="creativeRuleRadioList.list"
+                      :echoVal="creativeRuleRadioList.radioVal"
+                      :title="creativeRuleRadioList.name"
+                      :haveNotes="creativeRuleRadioList.haveNotes"
+                      @returnEvent="val=>{creativeRuleRadioList.radioVal = val;}"></RadioGroup>
+
         <template v-if="haveCoverOrVideo == 1">
           <RadioGroup :id="pageInfo.radioId"
                       :radioList="coverRadioList.list"
@@ -126,7 +141,7 @@ const { proxy } = getCurrentInstance() as any;
 const NumberHandle = proxy.$NumberHandle
 
 const emit = defineEmits<{
-  (event: "assignEvent", val: any, videoOnPuse?:any): void; //赋值给父组件
+  (event: "assignEvent", val: any, videoOnPuse?:any, options?:any): void; //赋值给父组件
   (event: "closeLoading"): void; //赋值给父组件
 }>();
 
@@ -137,6 +152,7 @@ const props = withDefaults(defineProps<{
   haveShowVideoObj?:any,
   minNum_imageList?:number,
   maxNum_imageList?:number,
+  directPacketChooseNum?:number,
 }>(), {
   haveCoverOrVideo:1,
   video_tips:{},
@@ -144,6 +160,7 @@ const props = withDefaults(defineProps<{
   haveShowVideoObj:{},
   minNum_imageList:1,
   maxNum_imageList:1,
+  directPacketChooseNum:0,
 })
 
 interface radioFace{
@@ -154,6 +171,28 @@ interface radioFace{
   haveNotes:boolean,
   list:any
 }
+const accountShareRuleRadioList = reactive<radioFace>({
+  value:'1',
+  name:'多账号分配规则',
+  EgName:'accountShareRule',
+  radioVal:'1',
+  haveNotes:true,
+  list:[
+    {name:'全账户复用',value:'1', notes: '所有账户都使用一样的素材'},
+    {name:'平均分配',value:'2', notes: '素材平均分到每个账户中'},
+  ]
+})
+const creativeRuleRadioList = reactive<radioFace>({
+  value:'1',
+  name:'创意组分配规则',
+  EgName:'creativeRule',
+  radioVal:'1',
+  haveNotes:false,
+  list:[
+    {name:'全部相同',value:'1', notes: ''},
+    {name:'平均分配',value:'2', notes: ''},
+  ]
+})
 const coverRadioList = reactive<radioFace>({
   value:1,
   name:'自动生成封面',
@@ -205,7 +244,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
   CreativeTeam_subId:0,//创意组ID LIST下的subId
   resResult:[],//video_id和image_id在里边
   haveCoverOrVideoFlag:false,
-  testNew_text:''
+  testNew_text:'',
 })
 
 //删除创意组的视频或图片
@@ -669,10 +708,24 @@ const confirmEvent = () => {
     return
   }
 
+
+  console.log('props.directPacketChooseNum  => ', props.directPacketChooseNum )
+  console.log('pageInfo.creativeTeamList.length => ', pageInfo.creativeTeamList.length)
+  if (creativeRuleRadioList.radioVal == 2 && accountShareRuleRadioList.radioVal == 2 && props.directPacketChooseNum > pageInfo.creativeTeamList.length) {
+    ElMessage.error('平均分配且创意组平均分配下，创意组数量需要大于等于生成的总广告数量！')
+    return
+  }
+
   if(props.haveShowVideoObj.show){
-    emit('assignEvent',arr,videoRadioList.radioVal)
+    emit('assignEvent',arr,videoRadioList.radioVal, {
+      accountShareRule: accountShareRuleRadioList.radioVal,
+      creativeRule: creativeRuleRadioList.radioVal,
+    })
   }else{
-    emit('assignEvent',arr)
+    emit('assignEvent',arr,false,{
+      accountShareRule: accountShareRuleRadioList.radioVal,
+      creativeRule: creativeRuleRadioList.radioVal,
+    })
   }
   dialogShow.value = false
 }
@@ -784,7 +837,7 @@ const clearAllEvent = async () => {
                              switchShow,
                              clearAllEvent,
                              creatice_reuseEvent,
-                             deleAcEvent
+                             deleAcEvent,
                            });
 
 

src/components/businessMoudle/batchGdt3/configArea/index.vue

@@ -151,7 +151,7 @@
   <RuleConfig ref="RuleConfigRef" @ExposeEvent="val => pageInfo.RuleConfigObj = val"></RuleConfig>
   <!--  创意素材-->
   <CreativeMaterial ref="CreativeMaterialRef" :haveCoverOrVideo="cMaterial.haveCoverOrVideo"
-    :haveShowVideoObj="cMaterial.haveShowVideoObj" :video_tips="cMaterial.video_tips" :image_tips="cMaterial.image_tips"
+    :haveShowVideoObj="cMaterial.haveShowVideoObj" :video_tips="cMaterial.video_tips" :image_tips="cMaterial.image_tips" :directPacketChooseNum="pageInfo.directPacketChooseNum"
     @closeLoading="close_reuse_loading" :maxNum_imageList="cMaterial.array_property?.max_number || 1"
     @assignEvent="assignEvent_CreativeMaterial"></CreativeMaterial>
 
@@ -324,6 +324,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
   },
   acc_plan_ad_count: {}, //各账户对应的计划数、广告数；用于微信视频号的配置
   groupsConfig: {},//已选择的策略组
+  directPacketChooseNum: 0, // 已选择定向包数量（新版广告数量）
 })
 
 //创意基本信息
@@ -380,7 +381,6 @@ watch(() => resuse_complate_flag_creaBasicInfo.value, async (val) => {
   if (val) {
     // 创意素材 - 修改或者新增
     await CreativeMaterialRef.value?.deleAcEvent(pageInfo.accIdsList, false)
-    console.log('cMaterial => ', cMaterial)
     CreativeMaterialRef.value?.creatice_reuseEvent(_.cloneDeep(cMaterial))
   }
 })
@@ -519,13 +519,12 @@ const updateHaveContent = ({ id, chooseNum, minusFlag, clearFlag, type }: IUpdat
         computeCount()
 
         // 定向包变化 => 清空售卖策略配置
-        console.log('sellStrategyRef.value => ', sellStrategyRef.value)
         sellStrategyRef?.value?.handleClear()
         // 定向包变化 => 清空推广产品配置
-        console.log('marketingAssetRef.value => ', marketingAssetRef.value)
         marketingAssetRef?.value?.handleClear()
 
-
+        pageInfo.directPacketChooseNum = chooseNum
+        console.log('pageInfo.directPacketChooseNum => ', pageInfo.directPacketChooseNum)
       }
       pageInfo.adTitleList.forEach(i => {
         i.subList.forEach(s => {
@@ -551,8 +550,6 @@ const updateHaveContent = ({ id, chooseNum, minusFlag, clearFlag, type }: IUpdat
 }
 /**计算广告数、计划数、账号数 并获取计划列表信息 */
 const computeCount = (cb?) => {
-  console.log('computeCount => 1 ')
-
   if (isMock.value) {
     let { pageInfo_mock, cMaterial_mock, basicInfoData_mock } = mockEvent()
     for (let key in pageInfo_mock) {
@@ -567,7 +564,6 @@ const computeCount = (cb?) => {
   } else {
     if (!judgeEvent(7, true)) return; // 创意文案之前未填写，则不进行下面逻辑
   }
-  console.log('computeCount => 2 ')
   previewCompute(pageInfo, cMaterial, basicInfoData).then((res: any) => {
     pageInfo.num_total.accNum = res.num_total.accNum;
     pageInfo.num_total.planNum = res.num_total.planNum;

src/components/businessMoudle/batchGdt3/configArea/landPage/landPageDialog.vue

@@ -26,7 +26,7 @@
         </el-tooltip>
         <div class="num_pre" v-if="multiCopyTesting == 0">
           <span>账户数：</span><span class="num">{{ count_info?.accNum || 0 }}，</span>
-          <span>计划数：</span><span class="num">{{ count_info?.planNum || 0 }}，</span>
+          <!-- <span>计划数：</span><span class="num">{{ count_info?.planNum || 0 }}，</span> -->
           <span>广告数：</span><span class="num">{{ count_info?.adNum || 0 }}；</span>
         </div>
       </div>
@@ -92,7 +92,7 @@ const loadPageRuleList = ref<any[]>([
   { id: 0, name: '全部相同' },
   { id: 1, name: '按账户分配' },
   // { id: 2, name: '分配到计划' },
-  { id: 3, name: '分配到广告' },
+  // { id: 3, name: '分配到广告' },
 ])
 const loadPageRule = ref(0)
 const ruleTooltip = ref<string>()
@@ -137,10 +137,12 @@ const handleClose = () => {
 const multiCopyTestingChange = (newValue) => {
   if(allocation.value = 1) {
     if (newValue == 0) {
-      ruleTooltip.value = `全部相同：全部广告使用同一个落地页；<br/>按账户分配：一个账户内广告使用同一个落地页；<br/>分配到计划：一个计划内广告使用同一个落地页；<br/>分配到广告：一个广告一个落地页；`
+      // ruleTooltip.value = `全部相同：全部广告使用同一个落地页；<br/>按账户分配：一个账户内广告使用同一个落地页；<br/>分配到计划：一个计划内广告使用同一个落地页；<br/>分配到广告：一个广告一个落地页；`
+      ruleTooltip.value = `全部相同：全部广告使用同一个落地页；<br/>按账户分配：一个账户内广告使用同一个落地页；`
     }
     if (newValue == 1) {
-      ruleTooltip.value = `全部相同：全部广告使用同一个落地页；<br/>分配到计划：一个计划内广告使用同一个落地页；<br/>分配到广告：一个广告一个落地页；`
+      // ruleTooltip.value = `全部相同：全部广告使用同一个落地页；<br/>分配到计划：一个计划内广告使用同一个落地页；<br/>分配到广告：一个广告一个落地页；`
+      ruleTooltip.value = `全部相同：全部广告使用同一个落地页；`
       if(AccMinprogramRef.value){
         AccMinprogramRef.value?.initFun(acc_select_count.value)
       }

src/components/businessMoudle/batchGdt3/configArea/ts/material.ts

@@ -23,7 +23,10 @@ export function materialDeclare() {
       val: false,// 视频号是否开启
     },
     imgOrVideoInfo: {},//视频或者图片需要的数据详情
-    testNew_text:''
+    testNew_text:'',
+    CreativeMaterialRef,
+    accountShareRule: '1', // 多账号分配规则 1全账户复用 2平均分配
+    creativeRule: '1', // 创意组分配规则 1全部相同 2平均分配
   })
   return {
     CreativeMaterialRef,
@@ -42,7 +45,6 @@ export function handleMultiple({
   //处理素材返回来的值
   const handle_resResult = (resResult: any) => {
     let resArr: any = []
-    console.log('resResultresResult', resResult)
     resResult.forEach(main => {
       if (!main) return;//跳出本次循环
       let itemObj: any = _.cloneDeep(cMaterial.imgOrVideoInfo)
@@ -98,10 +100,16 @@ export function handleMultiple({
     return resArr
   }
   //创意素材值回显
-  const assignEvent_CreativeMaterial = async (val: any, videoOnPuse?: any) => {
+  const assignEvent_CreativeMaterial = async (val: any, videoOnPuse: any, options: any) => {
+    console.log('assignEvent_CreativeMaterial() val => ', JSON.parse(JSON.stringify(val)))
+    console.log('videoOnPuse() videoOnPuse => ', videoOnPuse)
+    console.log('videoOnPuse() options => ', options)
+    if (options) {
+      cMaterial.accountShareRule = options.accountShareRule
+      cMaterial.creativeRule = options.creativeRule
+    }
     cMaterial.list_copy = _.cloneDeep(val)
     cMaterial.haveShowVideoObj.val = videoOnPuse
-    console.log('val', val)
     //所有素材列表,此时的素材个数已是正确的
     let cMaterial_resResult_list: any = []
     val.forEach(vItem => {
@@ -129,12 +137,10 @@ export function handleMultiple({
 
       cMaterial_resResult_list = cMaterial_resResult_list.concat(acc_arr)
     })
-    console.log(cMaterial_resResult_list, 'cMaterial_resResult_list');
 
     let arr_: any = []
     let cloneRes: any = await handle_resResult(_.cloneDeep(cMaterial_resResult_list))
     //图片形式的originalityBasicInfoData.params格式需要给
-    console.log(cloneRes, 'cloneRes');
     await originalityBasicInfoData.params.forEach(item => {
       cloneRes.forEach(cItem => {
         if (item.account_id == cItem.account_id) {
@@ -149,7 +155,6 @@ export function handleMultiple({
 
     cMaterial.key++
     cMaterial.resResult = arr_
-    console.log('cMaterial.resResult', cMaterial.resResult);
     await computeCount()
     if (val && val.length > 0) {
       close_reuse_loading()

src/components/businessMoudle/batchGdt3/configArea/ts/preview.ts

@@ -11,9 +11,9 @@ export const previewCompute = (pageInfo_cr, cMaterial_cr, basicInfoData_cr,) =>
     pageInfo = _.cloneDeep(pageInfo_cr)
     basicInfoData = _.cloneDeep(basicInfoData_cr)
 
-    console.log('pageInfo', pageInfo)
-    console.log('cMaterial', cMaterial)
-    console.log('basicInfoData', basicInfoData)
+    console.log('previewCompute() => pageInfo', pageInfo)
+    console.log('previewCompute() => cMaterial', cMaterial)
+    console.log('previewCompute() => basicInfoData', basicInfoData)
 
     let accNum = pageInfo.accIdsList.length;
 

src/components/businessMoudle/batchGdt3/previewArea/index.vue

@@ -11,7 +11,7 @@
         预览区
         <div class="lMarauto flex f14" style="font-weight: initial">
           <!-- <span>推广计划总数 : {{ pageInfo.num_total?.planNum }}</span> -->
-          <span class="lMar8">广告总数 : {{ pageInfo.num_total?.adNum }}</span>
+          <!-- <span class="lMar8">广告总数 : {{ pageInfo.num_total?.adNum }}</span> -->
           <el-button type="primary" class="lMar20" @click="auditSubmitBtn"
             v-loading.fullscreen.lock="submitLoading">全部提交审核</el-button>
         </div>
@@ -621,7 +621,6 @@ const auditSubmitEvent = (dialogInfo) => {
   // console.log('ad_common => ', JSON.parse(JSON.stringify(ad_common)))
   // console.log('ad_outer => ', JSON.parse(JSON.stringify(ad_outer)))
   console.log('params => ', JSON.parse(JSON.stringify(params)))
-
   submitLoading.value = true
   adsCreate(params).then((res: any) => {
     submitLoading.value = false
@@ -788,19 +787,19 @@ const objectSpanMethod = ({
   rowIndex,
   columnIndex,
 }) => {
-  // if (columnIndex === 0) {
-  //   if (row.main_info?.ad_list && row.main_info?.ad_list.length > 0) {
-  //     return {
-  //       rowspan: row.main_info.ad_list.length,
-  //       colspan: 1,
-  //     }
-  //   } else {
-  //     return {
-  //       rowspan: 0,
-  //       colspan: 0,
-  //     }
-  //   }
-  // }
+  if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3) {
+    if (row.main_info?.ad_list && row.main_info?.ad_list.length > 0) {
+      return {
+        rowspan: row.main_info.ad_list.length,
+        colspan: 1,
+      }
+    } else {
+      return {
+        rowspan: 0,
+        colspan: 0,
+      }
+    }
+  }
 }
 const selectionChangeEvent = (val: any) => {
   pageInfo.chooseList = val
@@ -819,6 +818,9 @@ const tableHeaderStyle = ({ row, column, rowIndex, columnIndex }: never) => {
 /**点击预览广告 初始化 */
 const initEvent = (infoObj_c) => {
   let infoObj = _.cloneDeep(infoObj_c)
+
+  console.log('<批量预览广告> initEvent() infoObj => ', JSON.parse(JSON.stringify(infoObj)))
+
   nextTick(async () => {
     //复制要用的数据
     pageInfo.copyInfo = _.cloneDeep(infoObj.copyInfo)
@@ -835,6 +837,14 @@ const initEvent = (infoObj_c) => {
     pageInfo.basicInfoData = _.cloneDeep(infoObj.basicInfoData)
     //规则配置
     pageInfo.RuleConfigObj = _.cloneDeep(infoObj.RuleConfigObj)
+
+    //创意素材 多账号分配规则 & 创意组分配规则
+    handleSetMaterialRule({
+      accountShareRule: infoObj.copyInfo.cMaterial.accountShareRule || '1',
+      creativeRule: infoObj.copyInfo.cMaterial.creativeRule || '1',
+      materialItemIds: infoObj.copyInfo.cMaterial.list.map((l) => l.list[0].itemId),
+    })
+
     accItemEvent(pageInfo.accList[0].id)
   })
 }
@@ -852,6 +862,67 @@ defineExpose({
   resetEvent,
   initEvent
 });
+
+
+const handleSetMaterialRule = ({accountShareRule, creativeRule, materialItemIds = []}) => {
+  let _materialItemIds = []
+  for (let i = 0; i < 99; i++) {
+    _materialItemIds = [..._materialItemIds, ...materialItemIds]
+  }
+  // console.log('handleSetMaterialRule => accountShareRule ', accountShareRule)
+  console.log('handleSetMaterialRule => creativeRule ', creativeRule)
+  // console.log('handleSetMaterialRule => materialItemIds ', materialItemIds)
+  // console.log('handleSetMaterialRule => _materialItemIds ', _materialItemIds)
+  // console.log('handleSetMaterialRule => campaign_list ', JSON.parse(JSON.stringify(pageInfo.campaign_list)))
+
+  if (accountShareRule == 2) { // 所选素材按账号平均分配 删除重复素材
+    const _campaign_list = _.cloneDeep(pageInfo.campaign_list)
+    let total:any = materialItemIds.length
+    let count:any = _campaign_list.length;
+    let base:any = Math.floor(total / count);
+    let rest:any = total % count;
+    let arr:any = []; // 记录每个账号分多少个素材
+    for(let i=0; i<count; i++) {
+      let idx = base + (i<rest?1:0)
+      arr.push(idx)
+    }
+    console.log('arr => ', arr)
+
+    _campaign_list.forEach((account) => {
+      account.materialItemIds = []
+    })
+
+    let startIdx = 0
+    arr.forEach((length, idx) => {
+      let _length = length || 1
+      _campaign_list[idx].materialItemIds = _materialItemIds.slice(startIdx, startIdx+_length)
+      startIdx = startIdx + _length
+    })
+
+    _campaign_list.forEach((campaign) => {
+      campaign.chooseList.forEach((campaignItem) => {
+        campaignItem.ad_list.forEach((ad) => {
+          const itemId = ad.adcreatives_info.adcreative_elements.self_info[0].itemId
+          if (!campaign.materialItemIds.includes(itemId)) {
+            ad.delFlag = true
+          }
+        })
+        campaignItem.ad_list = campaignItem.ad_list.filter(ad => !ad.delFlag)
+      })
+    })
+
+    pageInfo.campaign_list = _.cloneDeep(_campaign_list)
+  }
+
+  // if (creativeRule == 2) { // 所选素材按广告(定向包)平均分配 删除重复素材
+  //   console.log('pageInfo.campaign_list => ', JSON.parse(JSON.stringify(pageInfo.campaign_list)))
+  // }
+}
+
+
+
+
+
 </script>
 <style lang="scss" scoped>
 @import "src/assets/style/batchGdt.scss";