.

dist/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <title>广告系统</title>
       <script src="//open.thunderurl.com/thunder-link.js"></script>
-    <script type="module" crossorigin src="./assets/index.ff86c505.js"></script>
+    <script type="module" crossorigin src="./assets/index.45aac075.js"></script>
     <link rel="modulepreload" href="./js/@vue/@vue.e7eafc10.js">
     <link rel="modulepreload" href="./js/vue-router/vue-router.647267ed.js">
     <link rel="modulepreload" href="./js/axios/axios.27022086.js">

src/components/businessMoudle/batchGdt/configArea/basicInfo/index.vue

@@ -389,32 +389,36 @@ const deep_conversion_behavior_spec_fillBack = reactive({
 })
 const computed_deep_conversion_behavior_spec_fillBack = () => {
   let retrunNum = {min: '', max: ''}
-  if (form.deep_conversion_type == 'DEEP_CONVERSION_BEHAVIOR' && deep_conversion_behavior_spec.rate) {
-    let price_obj = {
-      min: ((form.bid_range_1?.min ? form.bid_range_1.min : 0) / Number(deep_conversion_behavior_spec.rate)).toFixed(2),
-      max: ((form.bid_range_1?.max ? form.bid_range_1.max : 0) / Number(deep_conversion_behavior_spec.rate)).toFixed(2)
-    }
-    deep_conversion_behavior_spec.min = price_obj.min
-    deep_conversion_behavior_spec.max = price_obj.max
-    retrunNum = price_obj
-    deep_conversion_behavior_spec_fillBack.min = retrunNum.min;
-    deep_conversion_behavior_spec_fillBack.max = retrunNum.max;
-  } 
-  watch_deep_conversion()
-  get_site_table(1, 'deep_bit_site')
+  nextTick(()=>{
+    if (form.deep_conversion_type == 'DEEP_CONVERSION_BEHAVIOR' && deep_conversion_behavior_spec.rate) {
+      let price_obj = {
+        min: ((form.bid_range_1?.min ? form.bid_range_1.min : 0) / Number(deep_conversion_behavior_spec.rate)).toFixed(2),
+        max: ((form.bid_range_1?.max ? form.bid_range_1.max : 0) / Number(deep_conversion_behavior_spec.rate)).toFixed(2)
+      }
+      deep_conversion_behavior_spec.min = price_obj.min
+      deep_conversion_behavior_spec.max = price_obj.max
+      retrunNum = price_obj
+      deep_conversion_behavior_spec_fillBack.min = retrunNum.min;
+      deep_conversion_behavior_spec_fillBack.max = retrunNum.max;
+    } 
+    watch_deep_conversion()
+    get_site_table(1, 'deep_bit_site')
+  })
 }
 
 const deep_conversion_behavior_spec_fillBack2 = ref('')
 const computed_deep_conversion_behavior_spec_fillBack2 = () => {
   let retrunNum: any = ''
-  if (form.deep_conversion_type == 'DEEP_CONVERSION_BEHAVIOR' && deep_conversion_behavior_spec.rate) {
-    let price = (form.bid_amount / Number(deep_conversion_behavior_spec.rate)).toFixed(2)
-    deep_conversion_behavior_spec.price = price
-    retrunNum = price
-    deep_conversion_behavior_spec_fillBack2.value = retrunNum
-  }
-  watch_deep_conversion()
-  get_site_table(1, 'deep_bit_site')
+  nextTick(()=>{
+    if (form.deep_conversion_type == 'DEEP_CONVERSION_BEHAVIOR' && deep_conversion_behavior_spec.rate) {
+      let price = (form.bid_amount / Number(deep_conversion_behavior_spec.rate)).toFixed(2)
+      deep_conversion_behavior_spec.price = price
+      retrunNum = price
+      deep_conversion_behavior_spec_fillBack2.value = retrunNum
+    }
+    watch_deep_conversion()
+    get_site_table(1, 'deep_bit_site')
+  })
 }
 /**获取默认值 */
 const form: any = reactive(props.dataFillBack || {})
@@ -681,14 +685,12 @@ const onChangeKey = ({ val, key }) => {
 const changeOptimizationGoal = () => {
   optimizationGoal_1.value.forEach((item)=>{
     if(item.goal == form.optimization_goal){
-      console.log(form.deep_conversion_type)
       let deep_info:any[] = []
       if(form.deep_conversion_type == 'DEEP_CONVERSION_BEHAVIOR'){//优化转化行为
         deep_info = _.cloneDeep(item.deep_behaviors) || []
       }else if (form.deep_conversion_type == 'DEEP_CONVERSION_WORTH') {//优化ROI
         deep_info = _.cloneDeep(item.deep_worths) || []
       }
-      console.log(deep_info)
       deep_info = deep_info.filter((v)=>{
         return v.name && v.name != '' && v.goal && v.goal != ''
       })

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

@@ -169,6 +169,7 @@ import { previewCompute } from './ts/preview'
 import { materialDeclare, handleMultiple } from './ts/material'
 import { IOuterConfigRule, basicInfoDeclare, handleAdBasic} from './ts/adBasic'
 import handleJudge from './ts/judgeEvent'
+import { mockEvent } from './ts/mock'
 const { proxy } = getCurrentInstance() as any;
 // 全局方法定义
 const NumberHandle = proxy.$NumberHandle
@@ -176,6 +177,7 @@ const emit = defineEmits<{
   (event: "openPreEvent", val: boolean,arr:any): void; //打开预览区
 }>();
 
+const isMock = ref(false)
 // S 参数声明
 const {
   basicInfoData
@@ -380,7 +382,7 @@ const previewObj = reactive<reactiveTableAndAny>({
   basicInfoData: {},//广告基本信息
 })
 const openPreAreaEvent = () => {
-  if(!judgeEvent(-1)){ return }
+  if(!judgeEvent(-1) && !isMock.value){ return }
   openPreAreaLoading.value = true
   computeCount(()=>{
     openPreEvent()
@@ -531,7 +533,20 @@ const updateHaveContent = (id:number,chooseNum?:number,minusFlag?:boolean,clearF
 }
 /**计算广告数、计划数、账号数 并获取计划列表信息 */
 const computeCount = (cb?) => {
-  if( !judgeEvent(7, true) ) return; // 创意文案之前未填写，则不进行下面逻辑
+  if(isMock.value){
+    let { pageInfo_mock, cMaterial_mock, basicInfoData_mock }  = mockEvent()
+    for(let key in pageInfo_mock) {
+      pageInfo[key] = pageInfo_mock[key]
+    }
+    for(let key in cMaterial_mock) {
+      cMaterial[key] = cMaterial_mock[key]
+    }
+    for(let key in basicInfoData_mock) {
+      basicInfoData[key] = basicInfoData_mock[key]
+    }
+  }else{
+    if( !judgeEvent(7, true) ) return; // 创意文案之前未填写，则不进行下面逻辑
+  }
   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/batchGdt/configArea/ts/adBasic.ts

@@ -132,7 +132,6 @@ export function handleAdBasic({
   }
   /**广告信息外部配置获取 */
   const getButtonBasicOuter = (res) => {
-    console.log(res)
     for (let i in basicInfoData.outerConfig) {
       basicInfoData.outerConfig[i].enabled = false
     }
@@ -173,7 +172,6 @@ export function handleAdBasic({
     'other'?: string
   }
   const basicOuterClose = ({ key, val, type, other }: IBasicOuterClose) => {
-    console.log(key, val, type)
     basicInfoData.outerConfig[key].visible = false;
     if (type == 'submit') {
       basicInfoData.outerConfig[key].value = val ? val : {};
@@ -182,7 +180,6 @@ export function handleAdBasic({
         basicInfoData.outerConfig[key].other = other
       }
     }
-    console.log(basicInfoData.outerConfig)
   }
 
   const isCompleteEvent = (data) => {

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

@@ -8,12 +8,15 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
 
     basicInfoData = _.cloneDeep(basicInfoData_cr)
 
-    console.log('定向包：', pageInfo.directObj)
-    console.log('创意素材：', cMaterial.resResult)
-    console.log('创意文案：', pageInfo.copywriterInfoData.data)
-    console.log('落地页：', pageInfo.copyLandPageInfoData)
-    console.log('规则配置：', pageInfo.RuleConfigObj)
-    console.log('外部配置：', basicInfoData.outerConfig)
+    console.log('pageInfo', pageInfo)
+    console.log('cMaterial', cMaterial)
+    console.log('basicInfoData_cr', basicInfoData_cr)
+    // console.log('定向包：', pageInfo.directObj)
+    // console.log('创意素材：', cMaterial.resResult)
+    // console.log('创意文案：', pageInfo.copywriterInfoData.data)
+    // console.log('落地页：', pageInfo.copyLandPageInfoData)
+    // console.log('规则配置：', pageInfo.RuleConfigObj)
+    // console.log('外部配置：', basicInfoData.outerConfig)
 
     let accNum = pageInfo.accIdsList.length;
 
@@ -32,7 +35,7 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
               if (main_1.id == i) {
                 pageInfo.copyLandPageInfoData.data[i].forEach((item) => {
                   main_2.ad_list.push({
-                    self_land_page: item
+                    self_land_page: _.cloneDeep(item)
                   })
                 });
               }
@@ -42,7 +45,7 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
       })
     }
     // 创意素材
-    let ad_show_list_scyc = JSON.parse(JSON.stringify(ad_show_list))
+    let ad_show_list_scyc = _.cloneDeep(ad_show_list)
     ad_show_list.forEach((item) => {
       for (let i = 0; i < item.chooseList.length; i++) {
         let v_item = item.chooseList[i]
@@ -53,18 +56,21 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
       let item = ad_show_list[index]
       for (let v_index = 0; v_index < item.chooseList.length; v_index++) {
         let v_item = item.chooseList[v_index]
-        cMaterial.resResult.forEach((main) => {
-          if (item.id == main.account_id) {
+        cMaterial.resResult.forEach((main2) => {
+          if (item.id == main2.account_id) {
             let ad_list: any = _.cloneDeep(ad_show_list_scyc[index].chooseList[v_index].ad_list);
             let common_obj = {
               ad_name: basicInfoData.fillBack.ad_name,
               bid_amount: '我是广告出价',
+              deep_bid_amount: '我是深度出价',
+              deep_roi: '我是期望ROI',
               // bid_amount_optimization_goal: '优化目标',
               targeting_id: v_item.targeting_id,
               targeting_name: v_item.targeting_name
             }
             if (ad_list.length > 0) {
               ad_list.forEach((v) => {
+                let main = _.cloneDeep(main2)
                 if (v.self_land_page) {
                   main['page_spec']['mini_program_spec']['mini_program_id'] = v.self_land_page.appid
                   main['page_spec']['mini_program_spec']['mini_program_path'] = v.self_land_page.applink
@@ -74,10 +80,10 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
                     main['link_page_spec']['mini_program_spec']['mini_program_path'] = v.self_land_page.applink
                   }
                 }
-                v_item.ad_list.push(Object.assign(common_obj, { adcreatives_info: main }))
+                v_item.ad_list.push(Object.assign(_.cloneDeep(common_obj), { adcreatives_info: main }))
               })
             } else {
-              v_item.ad_list.push(Object.assign(common_obj, { adcreatives_info: main }))
+              v_item.ad_list.push(Object.assign(common_obj, { adcreatives_info: main2 }))
             }
           }
         });
@@ -130,23 +136,25 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
     });
     ad_show_list.forEach((item, index) => {
       acc_plan_ad_count[item.id] = { 'plan_count': 0, 'ad_count': 0, }
+      let common_obj = {
+        'account_id': item.id,
+        'campaign_name': pageInfo.RuleConfigObj.campaign_name,
+        'daily_budget': Number(pageInfo.RuleConfigObj.daily_budget),
+        'total_budget': Number(pageInfo.RuleConfigObj.total_budget),
+        'campaign_status': pageInfo.RuleConfigObj.campaign_status,
+        'speed_mode': pageInfo.RuleConfigObj.speed_mode,
+      }
       item.chooseList.forEach((item_1) => {
         adNum += item_1.ad_list.length;
         acc_plan_ad_count[item.id].ad_count += item_1.ad_list.length;
-        let common_obj = {
-          'account_id': item.id,
-          'campaign_name': pageInfo.RuleConfigObj.campaign_name,
-          'daily_budget': Number(pageInfo.RuleConfigObj.daily_budget),
-          'total_budget': Number(pageInfo.RuleConfigObj.total_budget),
-          'campaign_status': pageInfo.RuleConfigObj.campaign_status,
-          'speed_mode': pageInfo.RuleConfigObj.speed_mode,
-        }
         if (item_1.ad_list.length > ad_max) {
           function lun(num) {
+            let max_ad_list = _.cloneDeep(item_1.ad_list)
             planNum += 1
             acc_plan_ad_count[item.id].plan_count += 1;
-            last_ad_show_list[index].chooseList.push(Object.assign(common_obj, { 'ad_list': item_1.ad_list.slice(num, (num + ad_max)) }))
-            if ((num + ad_max) < item_1.ad_list.length) {
+            let list = Object.assign(_.cloneDeep(common_obj), { 'ad_list': max_ad_list.slice(num, (num + ad_max)) })
+            last_ad_show_list[index].chooseList.push(list)
+            if ((num + ad_max) < max_ad_list.length) {
               lun(num + ad_max)
             }
           }
@@ -231,7 +239,9 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
           }
           item_ad.adcreatives_info.adcreative_name = handleName(item_ad.adcreatives_info.adcreative_name, wildcard)
           item_ad.ad_name = handleName(item_ad.ad_name, Object.assign(wildcard, { 'dynamic': (Number(basicInfoData.fillBack.dynamic_num) + ad_count) }))
-          item_ad.bid_amount = getBidAmount(ad_count, adNum)
+          item_ad.bid_amount = getBidAmount(ad_count, adNum, 'bid_amount')
+          item_ad.deep_bid_amount = getBidAmount(ad_count, adNum, 'deep_bid_amount')
+          item_ad.deep_roi = getBidAmount(ad_count, adNum, 'deep_roi')
           item_ad.optimization_goal_name = basicInfoData.fillBack.optimization_goal_name
           ad_count++;
           // E 计划名、广告名、素材名
@@ -286,20 +296,61 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
   })
 }
 
-/**获取出价  ad_count为第几个广告，ad_total广告总数*/
-const getBidAmount = (ad_count, ad_total) => {
+/**获取出价 、 深度优化出价 、 期望ROi  ad_count为第几个广告，ad_total广告总数*/
+const getBidAmount = (ad_count, ad_total, type) => {
+  if(ad_total <= 0){
+    return 0
+  }
+  let regular_way = '';
+  let min:number = 0;
+  let max:number = 0;
+  if ( type == 'bid_amount' ) {//出价
+    if( basicInfoData.fillBack.bid_way == 1 ){
+      regular_way = basicInfoData.fillBack.bid_amount
+    }
+    if ( basicInfoData.fillBack.bid_way == 3 || basicInfoData.fillBack.bid_way == 2 ) {
+      max = Number(basicInfoData.fillBack.bid_range.split('-')[1])
+      min = Number(basicInfoData.fillBack.bid_range.split('-')[0])
+    }
+  }
+  if( type == 'deep_bid_amount' && basicInfoData.fillBack.deep_conversion_behavior_spec) {//深度出价
+    let spec = JSON.parse( basicInfoData.fillBack.deep_conversion_behavior_spec )
+    if( basicInfoData.fillBack.bid_way == 1 ){
+      regular_way = spec.price
+    }
+    if ( basicInfoData.fillBack.bid_way == 3 || basicInfoData.fillBack.bid_way == 2 ) {
+      min = Number(spec?.min);
+      max = Number(spec?.max);
+    }
+  }
+  if( type == 'deep_roi' && basicInfoData.fillBack.deep_conversion_worth_spec) {//期望roi
+    let spec = JSON.parse( basicInfoData.fillBack.deep_conversion_worth_spec )
+    if( basicInfoData.fillBack.bid_way == 1 ){
+      regular_way = spec.roi
+    }
+    if ( basicInfoData.fillBack.bid_way == 3 || basicInfoData.fillBack.bid_way == 2 ) {
+      min = Number(spec?.min);
+      max = Number(spec?.max);
+    }
+  }
   if (basicInfoData.fillBack.bid_way == 1) {//固定出价
-    return basicInfoData.fillBack.bid_amount
+    return regular_way
+  }
+  if (basicInfoData.fillBack.bid_way == 2) {//随机出价
+    return parseFloat((Math.random() * (max - min) + min).toFixed(2))
   }
-  if (basicInfoData.fillBack.bid_way == 2 || basicInfoData.fillBack.bid_way == 3) {
-    let max = Number(basicInfoData.fillBack.bid_range.split('-')[1])
-    let min = Number(basicInfoData.fillBack.bid_range.split('-')[0])
-    if (basicInfoData.fillBack.bid_way == 2) {//随机出价
-      return parseFloat((Math.random() * (max - min) + min).toFixed(2))
+  if (basicInfoData.fillBack.bid_way == 3) { //阶梯出价
+    if(max == min && min == 0 ) {
+      return 0
+    }
+    if(ad_total == 1) {
+      return min
     }
-    if (basicInfoData.fillBack.bid_way == 3) { //阶梯出价
-      let step = parseFloat(((max - min) / (ad_total - 1)).toFixed(2));// 计算等差差值
-      return parseFloat((min + ad_count * step).toFixed(2))
+    let step = parseFloat(((max - min) / (ad_total - 1)).toFixed(2));// 计算等差差值
+    let last_num = parseFloat((min + ad_count * step).toFixed(2))
+    if( last_num > max ) {
+      last_num = max
     }
+    return last_num
   }
 }