zhengxy 7 ヶ月 前
コミット
03f1770748
共有56 個のファイルを変更した75 個の追加63 個の削除を含む
  1. 1 1
      dist/assets/index.c654a6a3.js
  2. 1 1
      dist/assets/index.167c6860.css
  3. 1 1
      dist/index.html
  4. 1 1
      dist/js/Home/index.69d2e19c.js
  5. 1 1
      dist/js/_dialog/_dialog.bea6d535.js
  6. 1 1
      dist/js/_input/_input.4af1256e.js
  7. 0 1
      dist/js/_inputAppend/_inputAppend.d70c567b.js
  8. 1 0
      dist/js/_inputAppend/_inputAppend.f593f890.js
  9. 1 1
      dist/js/_select/_select.100b83dc.js
  10. 1 0
      dist/js/acStatement/index.85426bad.js
  11. 0 1
      dist/js/acStatement/index.d71196ec.js
  12. 1 1
      dist/js/adTask/index.d3720abe.js
  13. 1 1
      dist/js/adTask3/index.77f357fe.js
  14. 1 1
      dist/js/adqManage/index.314b15db.js
  15. 1 1
      dist/js/adqManage3/index.9f75bcbd.js
  16. 1 0
      dist/js/api/api.43014780.js
  17. 0 1
      dist/js/api/api.9962307b.js
  18. 1 0
      dist/js/api/api.ce60e2e9.js
  19. 0 1
      dist/js/api/api.f897f906.js
  20. 1 1
      dist/js/basisMoudle/error.2ee6fdb6.js
  21. 1 1
      dist/js/basisMoudle/login.c7fd9198.js
  22. 1 1
      dist/js/checkboxDefault/checkboxDefault.12e3f408.js
  23. 1 1
      dist/js/collectClip/index.0a31619b.js
  24. 7 0
      dist/js/configArea/index.114c3c60.js
  25. 1 1
      dist/js/configArea/index.d28a04a0.js
  26. 0 7
      dist/js/configArea/index.872cda39.js
  27. 1 1
      dist/js/define/define.4f96e36f.js
  28. 1 1
      dist/js/gdtList/index.46aee591.js
  29. 1 1
      dist/js/gdtList3/index.d7c54419.js
  30. 1 1
      dist/js/index/index.8f7f3eb4.js
  31. 1 1
      dist/js/index/index.ea08cc19.js
  32. 1 1
      dist/js/index/index.aad34615.js
  33. 1 1
      dist/js/index/index.a5057c40.js
  34. 1 1
      dist/js/layout/index.629d4b85.js
  35. 1 1
      dist/js/layout/index_head.f4159f75.js
  36. 1 1
      dist/js/limitManage/index.783d4779.js
  37. 1 1
      dist/js/materialBlock/materialBlock.be0508ed.js
  38. 1 1
      dist/js/materialData/index.2b3661a9.js
  39. 1 1
      dist/js/materialLibrary/index.02a35a50.js
  40. 1 1
      dist/js/memberManage/index.804b848d.js
  41. 1 1
      dist/js/menu/index.a426f4c5.js
  42. 1 1
      dist/js/miniprogram/index.738bb1c2.js
  43. 1 1
      dist/js/projectManage/index.73dd6c27.js
  44. 1 1
      dist/js/radioGroup/radioGroup.138e7d3a.js
  45. 1 1
      dist/js/tableInfo/tableInfo.bc3644db.js
  46. 1 1
      dist/js/tagBlock/tagBlock.9a3105c8.js
  47. 1 1
      dist/js/taskList/index.5746628c.js
  48. 1 1
      dist/js/teamManage/index.ece103ef.js
  49. 1 1
      dist/js/timeScreen/timeScreen.6cc188c4.js
  50. 1 1
      dist/js/warning/warning.577c57b7.js
  51. 1 1
      dist/js/wechatPage/index.f0b60b8c.js
  52. 1 1
      dist/js/weekTime/weekTime.bc879c60.js
  53. 1 1
      dist/js/weekTime/weekTime.e2db2c25.js
  54. 1 1
      src/components/businessMoudle/batchGdt3/configArea/copywriter/writerDialog.vue
  55. 2 2
      src/components/businessMoudle/batchGdt3/configArea/index.vue
  56. 18 6
      src/components/businessMoudle/batchGdt3/previewArea/index.vue

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


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


+ 1 - 1
dist/index.html

@@ -12,7 +12,7 @@
12 12
 			document.write('<script src="' + src + '"><\/script>');
13 13
 			})();
14 14
     </script>
15
-    <script type="module" crossorigin src="./assets/index.c654a6a3.js"></script>
15
+    <script type="module" crossorigin src="./assets/index.8d4062fa.js"></script>
16 16
     <link rel="modulepreload" href="./js/@vue/@vue.5bfcce30.js">
17 17
     <link rel="modulepreload" href="./js/vue-router/vue-router.ccba075e.js">
18 18
     <link rel="modulepreload" href="./js/vue-demi/vue-demi.4f3c4c97.js">

File diff suppressed because it is too large
+ 1 - 1
dist/js/Home/index.69d2e19c.js


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


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


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


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


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


File diff suppressed because it is too large
+ 1 - 0
dist/js/acStatement/index.85426bad.js


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/adTask3/index.77f357fe.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/adqManage/index.314b15db.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/adqManage3/index.9f75bcbd.js


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


File diff suppressed because it is too large
+ 0 - 1
dist/js/api/api.9962307b.js


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


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


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/checkboxDefault/checkboxDefault.12e3f408.js


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


File diff suppressed because it is too large
+ 7 - 0
dist/js/configArea/index.114c3c60.js


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


File diff suppressed because it is too large
+ 0 - 7
dist/js/configArea/index.872cda39.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/define/define.4f96e36f.js


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/limitManage/index.783d4779.js


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


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/memberManage/index.804b848d.js


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/projectManage/index.73dd6c27.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/radioGroup/radioGroup.138e7d3a.js


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/tagBlock/tagBlock.9a3105c8.js


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


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/warning/warning.577c57b7.js


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


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


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


+ 1 - 1
src/components/businessMoudle/batchGdt3/configArea/copywriter/writerDialog.vue

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <el-dialog class="gdt-dialog" :close-on-click-modal="false" :destroy-on-close="true" key="copywriterDialog"
3
-    v-model="visible" title="选择标签" width="1000px" top="40px" :before-close="handleClose">
3
+    v-model="visible" title="选择文案" width="1000px" top="40px" :before-close="handleClose">
4 4
     <div v-loading="loading">
5 5
       <div class="flex marT15">
6 6
         <label class="form-block-item-title">多文案测试</label>

+ 2 - 2
src/components/businessMoudle/batchGdt3/configArea/index.vue

@@ -12,8 +12,8 @@
12 12
           <Close />
13 13
         </el-icon>
14 14
       </div>
15
-      <span class="smallTitle lMarauto">预览广告数 : <span
16
-          class="c-theme">{{ NumberHandle(pageInfo.num_total.adNum) || 0 }}</span></span>
15
+      <!-- <span class="smallTitle lMarauto">预览广告数 : <span
16
+          class="c-theme">{{ NumberHandle(pageInfo.num_total.adNum) || 0 }}</span></span> -->
17 17
     </div>
18 18
     <div class="areaCon">
19 19
       <div class="screenArea">

+ 18 - 6
src/components/businessMoudle/batchGdt3/previewArea/index.vue

@@ -25,7 +25,8 @@
25 25
           <!-- <div>已选 : <span>{{pageInfo.chooseList&&pageInfo.chooseList.length}}</span></div> -->
26 26
           <div class="lMarauto flex">
27 27
             <!-- <span>推广计划数量 : {{ pageInfo.accPlanAd.planNum }}</span> -->
28
-            <span class="lMar8">广告数量 : {{ pageInfo.accPlanAd.adNum }}</span>
28
+            <!-- <span class="lMar8">广告数量 : {{ pageInfo.accPlanAd.adNum }}</span> -->
29
+            <span class="lMar8">创意数量 : {{ pageInfo.accPlanAd.adNum }}</span>
29 30
             <!--          <Dropdown title="批量操作" lMar="10px" :list="pageInfo.moreList" @close="dropdownEvent" :disabledFlag="pageInfo.chooseList&&pageInfo.chooseList.length == 0"></Dropdown>-->
30 31
           </div>
31 32
         </div>
@@ -604,6 +605,20 @@ const auditSubmitEvent = (dialogInfo) => {
604 605
     adInfo.adcreatives_info.creative_components.video = uniqueFn2(video, 'value', 'video_id')
605 606
   })
606 607
 
608
+
609
+  // S 创意组参数
610
+  ad_list_v3_res.forEach(adInfo => {
611
+    adInfo.adcreatives_info_list = []
612
+    ad_list_v3.forEach(ad => {
613
+      if (ad.adFlag === adInfo.adFlag) {
614
+        adInfo.adcreatives_info_list.push({
615
+          ...ad.adcreatives_info
616
+        })
617
+      }
618
+    })
619
+  })
620
+  // E 创意组参数
621
+
607 622
   console.log('ad_list_v3 => ', JSON.parse(JSON.stringify(ad_list_v3)))
608 623
   console.log('ad_list_v3_res => ', JSON.parse(JSON.stringify(ad_list_v3_res)))
609 624
 
@@ -745,6 +760,7 @@ const getPlanAdNum = () => {
745 760
   let list = _.cloneDeep(pageInfo.campaign_list.filter((v) => {
746 761
     return v.id == pageInfo.accId
747 762
   }))
763
+  console.log('getPlanAdNum() list => ', JSON.parse(JSON.stringify(list)))
748 764
   if (list.length > 0) {
749 765
     let tableList: any[] = []
750 766
     list[0].chooseList.forEach((item, index) => {
@@ -814,6 +830,7 @@ const objectSpanMethod = ({
814 830
         colspan: 0,
815 831
       }
816 832
     }
833
+
817 834
   }
818 835
 }
819 836
 const selectionChangeEvent = (val: any) => {
@@ -880,11 +897,6 @@ defineExpose({
880 897
 
881 898
 
882 899
 const handleSetMaterialRule = ({accountShareRule, creativeRule, materialItemIds = []}) => {
883
-  // console.log('handleSetMaterialRule => accountShareRule ', accountShareRule)
884
-  console.log('handleSetMaterialRule => creativeRule ', creativeRule)
885
-  // console.log('handleSetMaterialRule => materialItemIds ', materialItemIds)
886
-  // console.log('handleSetMaterialRule => _materialItemIds ', _materialItemIds)
887
-  // console.log('handleSetMaterialRule => campaign_list ', JSON.parse(JSON.stringify(pageInfo.campaign_list)))
888 900
 
889 901
   if (accountShareRule == 2) { // 所选素材按账号平均分配 删除重复素材
890 902
     let _materialItemIds = []