Browse Source

Merge branch 'master' of http://101.200.220.49:8001/xiaona.liu/advertSystem

xiuli.gao 1 year ago
parent
commit
f3bf63c931
86 changed files with 56 additions and 55 deletions
  1. 0 1
      dist/assets/_dialog.5c0eecd7.css
  2. 1 0
      dist/assets/_dialog.8cd140fd.css
  3. 1 0
      dist/assets/_input.2f756a28.css
  4. 0 1
      dist/assets/_input.8be04cf3.css
  5. 1 0
      dist/assets/_select.2a9f1999.css
  6. 0 1
      dist/assets/_select.97e73788.css
  7. 1 0
      dist/assets/accountManage.0532d389.css
  8. 0 1
      dist/assets/accountManage.896650f8.css
  9. 1 0
      dist/assets/adqManage.694a1958.css
  10. 0 1
      dist/assets/adqManage.c4615848.css
  11. 0 1
      dist/assets/error.284bd084.css
  12. 1 0
      dist/assets/error.97c715ec.css
  13. 1 0
      dist/assets/home.1a33e614.css
  14. 0 1
      dist/assets/home.9f35d1d5.css
  15. 1 0
      dist/assets/index.03bcea03.css
  16. 0 1
      dist/assets/index.27e11a5f.css
  17. 1 0
      dist/assets/index.28168f3c.css
  18. 1 0
      dist/assets/index.2b4782a6.css
  19. 1 0
      dist/assets/index.3191aa97.css
  20. 0 1
      dist/assets/index.37b5a88f.css
  21. 1 1
      dist/assets/index.a3fd41f8.css
  22. 1 0
      dist/assets/index.4d3598a8.css
  23. 1 0
      dist/assets/index.563e5dd5.css
  24. 1 0
      dist/assets/index.648b9e10.css
  25. 1 0
      dist/assets/index.6fff4b74.css
  26. 0 1
      dist/assets/index.7b15420e.css
  27. 0 1
      dist/assets/index.887b6b4f.css
  28. 0 1
      dist/assets/index.9234b91e.css
  29. 1 1
      dist/assets/index.5aa1bb1b.js
  30. 1 0
      dist/assets/index.a956448f.css
  31. 0 1
      dist/assets/index.c5d3d7d0.css
  32. 0 1
      dist/assets/index.ca1fc3d5.css
  33. 0 1
      dist/assets/index.d52cf2c0.css
  34. 0 1
      dist/assets/index.eb07d23d.css
  35. 0 1
      dist/assets/index_head.bd849dfa.css
  36. 1 0
      dist/assets/index_head.fddecd4a.css
  37. 1 0
      dist/assets/login.1a99fd9e.css
  38. 0 1
      dist/assets/login.38e47126.css
  39. 0 1
      dist/assets/materialBlock.4d7b717e.css
  40. 1 0
      dist/assets/materialBlock.8868a5d8.css
  41. 1 0
      dist/assets/menuList.30c26da6.css
  42. 0 1
      dist/assets/menuList.45586ed7.css
  43. 0 1
      dist/assets/noData.10280069.css
  44. 1 0
      dist/assets/noData.c79b2ed6.css
  45. 1 0
      dist/assets/tableInfo.b66a93c1.css
  46. 0 1
      dist/assets/tableInfo.fc4a7715.css
  47. 0 1
      dist/assets/timeScreen.0ab73184.css
  48. 1 0
      dist/assets/timeScreen.9bc08e8b.css
  49. 0 1
      dist/assets/weekTime.4d489b20.css
  50. 1 0
      dist/assets/weekTime.d5ba4542.css
  51. 1 1
      dist/index.html
  52. 1 1
      dist/js/_dialog/_dialog.f657d1e8.js
  53. 1 1
      dist/js/_input/_input.a264cf6c.js
  54. 1 1
      dist/js/_select/_select.1a4fbb35.js
  55. 1 1
      dist/js/adTask/index.fa13c124.js
  56. 1 0
      dist/js/api/api.2cda37ce.js
  57. 0 1
      dist/js/api/api.878e4b44.js
  58. 1 1
      dist/js/basisMoudle/accountManage.351307a5.js
  59. 1 1
      dist/js/basisMoudle/error.178da127.js
  60. 1 1
      dist/js/basisMoudle/home.72f2e305.js
  61. 1 0
      dist/js/basisMoudle/login.59032fb6.js
  62. 0 1
      dist/js/basisMoudle/login.93bbb8f1.js
  63. 1 1
      dist/js/businessMoudle/adqManage.3daab136.js
  64. 1 1
      dist/js/collectClip/index.8c848136.js
  65. 1 1
      dist/js/configArea/index.3e4b279a.js
  66. 0 1
      dist/js/gdtList/index.57af990f.js
  67. 1 0
      dist/js/gdtList/index.d5404575.js
  68. 1 1
      dist/js/index/index.dad57fe8.js
  69. 1 1
      dist/js/index/index.6024d56f.js
  70. 1 1
      dist/js/layout/index.c29b36f2.js
  71. 1 1
      dist/js/layout/index_head.2d2f240b.js
  72. 1 1
      dist/js/materialBlock/materialBlock.a4058e33.js
  73. 1 1
      dist/js/materialLibrary/index.0c9ffb84.js
  74. 1 1
      dist/js/menuPermission/menuList.1de411c4.js
  75. 1 1
      dist/js/miniprogram/index.ba1aac09.js
  76. 1 0
      dist/js/noData/noData.ddc2af49.js
  77. 0 1
      dist/js/noData/noData.ef6e88eb.js
  78. 0 0
      dist/js/sortablejs/sortablejs.4f86162a.js
  79. 1 1
      dist/js/tableInfo/tableInfo.1300786c.js
  80. 1 1
      dist/js/taskList/index.a2ffb394.js
  81. 1 1
      dist/js/timeScreen/timeScreen.c23d1439.js
  82. 0 0
      dist/js/vue/vue.86f330e1.js
  83. 1 1
      dist/js/vuedraggable/vuedraggable.974d406d.js
  84. 1 1
      dist/js/weekTime/weekTime.b2ef95a1.js
  85. 1 0
      src/components/businessMoudle/batchGdt/configArea/creativeMaterial/index.vue
  86. 1 1
      src/components/businessMoudle/gdtList/advert.vue

File diff suppressed because it is too large
+ 0 - 1
dist/assets/_dialog.5c0eecd7.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/_dialog.8cd140fd.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/_input.2f756a28.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/_input.8be04cf3.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/_select.2a9f1999.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/_select.97e73788.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/accountManage.0532d389.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/accountManage.896650f8.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/adqManage.694a1958.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/adqManage.c4615848.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/error.284bd084.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/error.97c715ec.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/home.1a33e614.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/home.9f35d1d5.css


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 1
dist/assets/index_head.bd849dfa.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index_head.fddecd4a.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/login.1a99fd9e.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/login.38e47126.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/materialBlock.4d7b717e.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/materialBlock.8868a5d8.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/menuList.30c26da6.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/menuList.45586ed7.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/noData.10280069.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/noData.c79b2ed6.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/tableInfo.b66a93c1.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/tableInfo.fc4a7715.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/timeScreen.0ab73184.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/timeScreen.9bc08e8b.css


File diff suppressed because it is too large
+ 0 - 1
dist/assets/weekTime.4d489b20.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/weekTime.d5ba4542.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.5aa1bb1b.js"></script>
9
+    <script type="module" crossorigin src="./assets/index.9f20b33d.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.f657d1e8.js


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


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


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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 1
dist/js/gdtList/index.57af990f.js


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


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


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


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


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


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


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


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


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


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


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


dist/js/sortablejs/sortablejs.cbc4d4ad.js → dist/js/sortablejs/sortablejs.4f86162a.js


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


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


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


dist/js/vue/vue.051f0374.js → dist/js/vue/vue.86f330e1.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/vuedraggable/vuedraggable.974d406d.js


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


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

@@ -676,6 +676,7 @@ const get_new_ac_ids = () => {
676 676
   let arr:any = _.cloneDeep(inject_accountIds)
677 677
   let new_ac_ids:any = []
678 678
   let all_ac_ids:any = []
679
+  console.log(pageInfo.creativeTeamList);
679 680
   pageInfo.creativeTeamList.forEach(pcItem=>{
680 681
     pcItem.resResult.forEach(sub=>{
681 682
       let ids_nn:number = all_ac_ids.findIndex(nn=>nn==sub.account_id)

+ 1 - 1
src/components/businessMoudle/gdtList/advert.vue

@@ -101,7 +101,7 @@
101 101
                       </div>
102 102
                       <div v-else-if="item.key_value == 'operate'">
103 103
                         <div class="flex">
104
-                          <span class="c-theme pointer" @click="copyEvent(scope.row)">复制</span>
104
+<!--                          <span class="c-theme pointer" @click="copyEvent(scope.row)">复制</span>-->
105 105
                           <span class="c-theme pointer lMar10" @click="goDetial(scope.row)">详情</span>
106 106
                         </div>
107 107
                       </div>