Browse Source

预览区计算问题

xiuli.gao 1 year ago
parent
commit
f49d6ab603
36 changed files with 54 additions and 55 deletions
  1. 1 1
      dist/assets/index.7f598959.js
  2. 1 1
      dist/assets/index.e99a4551.css
  3. 1 1
      dist/index.html
  4. 1 1
      dist/js/_dialog/_dialog.bb2273e2.js
  5. 1 1
      dist/js/_input/_input.f7c56554.js
  6. 1 1
      dist/js/_select/_select.88fa3735.js
  7. 1 1
      dist/js/adTask/index.74c1c9e0.js
  8. 1 1
      dist/js/api/api.59019a71.js
  9. 1 1
      dist/js/basisMoudle/accountManage.ebceed14.js
  10. 1 1
      dist/js/basisMoudle/error.8a102010.js
  11. 1 1
      dist/js/basisMoudle/home.cb2919c5.js
  12. 1 1
      dist/js/basisMoudle/login.f01d847f.js
  13. 1 1
      dist/js/businessMoudle/adqManage.c06039e1.js
  14. 1 1
      dist/js/collectClip/index.5ec3c55d.js
  15. 1 0
      dist/js/configArea/index.5265a897.js
  16. 0 1
      dist/js/configArea/index.83ae2145.js
  17. 1 1
      dist/js/gdtList/index.51d778ea.js
  18. 1 1
      dist/js/index/index.2ba946a3.js
  19. 1 1
      dist/js/index/index.8b462a53.js
  20. 1 0
      dist/js/layout/index.863b96be.js
  21. 0 1
      dist/js/layout/index.ade29b70.js
  22. 1 1
      dist/js/layout/index_head.d88d450c.js
  23. 1 1
      dist/js/materialBlock/materialBlock.8b70d11f.js
  24. 1 1
      dist/js/materialLibrary/index.881fa16b.js
  25. 1 1
      dist/js/menuPermission/menuList.058e97d9.js
  26. 1 1
      dist/js/miniprogram/index.bd0fe2d0.js
  27. 0 1
      dist/js/noData/noData.0ed54cc4.js
  28. 1 0
      dist/js/noData/noData.598cdb8f.js
  29. 1 1
      dist/js/tableInfo/tableInfo.e1e36eea.js
  30. 1 1
      dist/js/taskList/index.056ce3f6.js
  31. 1 1
      dist/js/timeScreen/timeScreen.33ea869d.js
  32. 1 1
      dist/js/weekTime/weekTime.09033fb7.js
  33. 16 13
      src/components/businessMoudle/batchGdt/configArea/index.vue
  34. 0 3
      src/components/businessMoudle/batchGdt/configArea/ts/adBasic.ts
  35. 9 9
      src/components/businessMoudle/batchGdt/configArea/ts/preview.ts
  36. 0 1
      src/components/businessMoudle/batchGdt/previewArea/index.vue

File diff suppressed because it is too large
+ 1 - 1
dist/assets/index.7f598959.js


File diff suppressed because it is too large
+ 1 - 1
dist/assets/index.e99a4551.css


+ 1 - 1
dist/index.html

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

File diff suppressed because it is too large
+ 1 - 1
dist/js/_dialog/_dialog.bb2273e2.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/_input/_input.f7c56554.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/_select/_select.88fa3735.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/adTask/index.74c1c9e0.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/api/api.59019a71.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/basisMoudle/accountManage.ebceed14.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/basisMoudle/error.8a102010.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/basisMoudle/home.cb2919c5.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/basisMoudle/login.f01d847f.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/businessMoudle/adqManage.c06039e1.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/collectClip/index.5ec3c55d.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/configArea/index.5265a897.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/configArea/index.83ae2145.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/gdtList/index.51d778ea.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/index/index.2ba946a3.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/index/index.8b462a53.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/layout/index.863b96be.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/layout/index.ade29b70.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/layout/index_head.d88d450c.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/materialBlock/materialBlock.8b70d11f.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/materialLibrary/index.881fa16b.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/menuPermission/menuList.058e97d9.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/miniprogram/index.bd0fe2d0.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/noData/noData.0ed54cc4.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/noData/noData.598cdb8f.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/tableInfo/tableInfo.e1e36eea.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/taskList/index.056ce3f6.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/timeScreen/timeScreen.33ea869d.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/weekTime/weekTime.09033fb7.js


+ 16 - 13
src/components/businessMoudle/batchGdt/configArea/index.vue

@@ -181,6 +181,7 @@ const emit = defineEmits<{
181 181
   (event: "openPreEvent", val: boolean,arr:any): void; //打开预览区
182 182
 }>();
183 183
 
184
+const isMock = ref(false)
184 185
 // S 参数声明
185 186
 const {
186 187
   basicInfoData
@@ -385,7 +386,7 @@ const previewObj = reactive<reactiveTableAndAny>({
385 386
   basicInfoData: {},//广告基本信息
386 387
 })
387 388
 const openPreAreaEvent = () => {
388
-  if(!judgeEvent(-1)){ return }
389
+  if(!judgeEvent(-1) && !isMock.value){ return }
389 390
   openPreAreaLoading.value = true
390 391
   computeCount(()=>{
391 392
     openPreEvent()
@@ -536,18 +537,20 @@ const updateHaveContent = (id:number,chooseNum?:number,minusFlag?:boolean,clearF
536 537
 }
537 538
 /**计算广告数、计划数、账号数 并获取计划列表信息 */
538 539
 const computeCount = (cb?) => {
539
-  // let { pageInfo_mock, cMaterial_mock, basicInfoData_mock }  = mockEvent()
540
-  // for(let key in pageInfo_mock) {
541
-  //   pageInfo[key] = pageInfo_mock[key]
542
-  // }
543
-  // for(let key in cMaterial_mock) {
544
-  //   cMaterial[key] = cMaterial_mock[key]
545
-  // }
546
-  // for(let key in basicInfoData_mock) {
547
-  //   basicInfoData[key] = basicInfoData_mock[key]
548
-  // }
549
-  
550
-  if( !judgeEvent(7, true) ) return; // 创意文案之前未填写,则不进行下面逻辑
540
+  if(isMock.value){
541
+    let { pageInfo_mock, cMaterial_mock, basicInfoData_mock }  = mockEvent()
542
+    for(let key in pageInfo_mock) {
543
+      pageInfo[key] = pageInfo_mock[key]
544
+    }
545
+    for(let key in cMaterial_mock) {
546
+      cMaterial[key] = cMaterial_mock[key]
547
+    }
548
+    for(let key in basicInfoData_mock) {
549
+      basicInfoData[key] = basicInfoData_mock[key]
550
+    }
551
+  }else{
552
+    if( !judgeEvent(7, true) ) return; // 创意文案之前未填写,则不进行下面逻辑
553
+  }
551 554
   previewCompute(pageInfo, cMaterial, basicInfoData).then((res:any)=>{
552 555
     pageInfo.num_total.accNum = res.num_total.accNum;
553 556
     pageInfo.num_total.planNum = res.num_total.planNum;

+ 0 - 3
src/components/businessMoudle/batchGdt/configArea/ts/adBasic.ts

@@ -132,7 +132,6 @@ export function handleAdBasic({
132 132
   }
133 133
   /**广告信息外部配置获取 */
134 134
   const getButtonBasicOuter = (res) => {
135
-    console.log(res)
136 135
     for (let i in basicInfoData.outerConfig) {
137 136
       basicInfoData.outerConfig[i].enabled = false
138 137
     }
@@ -173,7 +172,6 @@ export function handleAdBasic({
173 172
     'other'?: string
174 173
   }
175 174
   const basicOuterClose = ({ key, val, type, other }: IBasicOuterClose) => {
176
-    console.log(key, val, type)
177 175
     basicInfoData.outerConfig[key].visible = false;
178 176
     if (type == 'submit') {
179 177
       basicInfoData.outerConfig[key].value = val ? val : {};
@@ -182,7 +180,6 @@ export function handleAdBasic({
182 180
         basicInfoData.outerConfig[key].other = other
183 181
       }
184 182
     }
185
-    console.log(basicInfoData.outerConfig)
186 183
   }
187 184
 
188 185
   const isCompleteEvent = (data) => {

+ 9 - 9
src/components/businessMoudle/batchGdt/configArea/ts/preview.ts

@@ -136,23 +136,23 @@ export const previewCompute = (pageInfo, cMaterial, basicInfoData_cr,) => {
136 136
     });
137 137
     ad_show_list.forEach((item, index) => {
138 138
       acc_plan_ad_count[item.id] = { 'plan_count': 0, 'ad_count': 0, }
139
+      let common_obj = {
140
+        'account_id': item.id,
141
+        'campaign_name': pageInfo.RuleConfigObj.campaign_name,
142
+        'daily_budget': Number(pageInfo.RuleConfigObj.daily_budget),
143
+        'total_budget': Number(pageInfo.RuleConfigObj.total_budget),
144
+        'campaign_status': pageInfo.RuleConfigObj.campaign_status,
145
+        'speed_mode': pageInfo.RuleConfigObj.speed_mode,
146
+      }
139 147
       item.chooseList.forEach((item_1) => {
140 148
         adNum += item_1.ad_list.length;
141 149
         acc_plan_ad_count[item.id].ad_count += item_1.ad_list.length;
142
-        let common_obj = {
143
-          'account_id': item.id,
144
-          'campaign_name': pageInfo.RuleConfigObj.campaign_name,
145
-          'daily_budget': Number(pageInfo.RuleConfigObj.daily_budget),
146
-          'total_budget': Number(pageInfo.RuleConfigObj.total_budget),
147
-          'campaign_status': pageInfo.RuleConfigObj.campaign_status,
148
-          'speed_mode': pageInfo.RuleConfigObj.speed_mode,
149
-        }
150 150
         if (item_1.ad_list.length > ad_max) {
151 151
           function lun(num) {
152 152
             let max_ad_list = _.cloneDeep(item_1.ad_list)
153 153
             planNum += 1
154 154
             acc_plan_ad_count[item.id].plan_count += 1;
155
-            let list = Object.assign(common_obj, { 'ad_list': max_ad_list.slice(num, (num + ad_max)) })
155
+            let list = Object.assign(_.cloneDeep(common_obj), { 'ad_list': max_ad_list.slice(num, (num + ad_max)) })
156 156
             last_ad_show_list[index].chooseList.push(list)
157 157
             if ((num + ad_max) < max_ad_list.length) {
158 158
               lun(num + ad_max)

+ 0 - 1
src/components/businessMoudle/batchGdt/previewArea/index.vue

@@ -535,7 +535,6 @@ watch(() => props.infoObj.updateKey, () => {
535 535
   nextTick(async () => {
536 536
     //账号
537 537
     pageInfo.accList = _.cloneDeep(props.infoObj.accVal)
538
-    console.log(pageInfo.accList,'000000000')
539 538
     if (!pageInfo.accList || pageInfo.accList.length == 0) return;
540 539
     //广告计划
541 540
     pageInfo.campaign_list = _.cloneDeep(props.infoObj.campaign_list)