2 次代码提交 f49d6ab603 ... 7923d61a60

作者 SHA1 备注 提交日期
  liuxiaona 7923d61a60 . 10 月之前
  liuxiaona 727d69fb9d . 10 月之前
共有 96 个文件被更改,包括 88 次插入83 次删除
  1. 0 1
      dist/assets/_dialog.5c0eecd7.css
  2. 1 0
      dist/assets/_dialog.8cd140fd.css
  3. 0 1
      dist/assets/_input.205b99ee.css
  4. 1 0
      dist/assets/_input.d72ce589.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. 0 1
      dist/assets/index.1124a9fe.css
  16. 0 1
      dist/assets/index.1becb535.css
  17. 1 0
      dist/assets/index.28168f3c.css
  18. 1 0
      dist/assets/index.2b4782a6.css
  19. 1 0
      dist/assets/index.310a066a.css
  20. 1 0
      dist/assets/index.3191aa97.css
  21. 0 1
      dist/assets/index.37b5a88f.css
  22. 1 1
      dist/assets/index.a3fd41f8.css
  23. 1 0
      dist/assets/index.3cb81ec5.css
  24. 1 1
      dist/assets/index.37dbf814.js
  25. 1 0
      dist/assets/index.563e5dd5.css
  26. 1 0
      dist/assets/index.61bf38c3.css
  27. 1 0
      dist/assets/index.648b9e10.css
  28. 0 1
      dist/assets/index.887b6b4f.css
  29. 0 1
      dist/assets/index.9234b91e.css
  30. 1 0
      dist/assets/index.a956448f.css
  31. 0 1
      dist/assets/index.c76d67ec.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.07e6f724.css
  50. 1 0
      dist/assets/weekTime.6de405e8.css
  51. 1 1
      dist/index.html
  52. 1 1
      dist/js/@vue/@vue.e7eafc10.js
  53. 1 1
      dist/js/_dialog/_dialog.611db09b.js
  54. 1 1
      dist/js/_input/_input.7cd19126.js
  55. 1 1
      dist/js/_select/_select.3cf37d77.js
  56. 1 0
      dist/js/adTask/index.38e00465.js
  57. 0 1
      dist/js/adTask/index.a1ff9391.js
  58. 0 1
      dist/js/api/api.5484ef0b.js
  59. 1 0
      dist/js/api/api.78351f92.js
  60. 1 1
      dist/js/async-validator/async-validator.21881447.js
  61. 1 1
      dist/js/axios/axios.27022086.js
  62. 1 1
      dist/js/basisMoudle/accountManage.84221aed.js
  63. 1 1
      dist/js/basisMoudle/error.6934c673.js
  64. 1 1
      dist/js/basisMoudle/home.4b0af6cc.js
  65. 1 1
      dist/js/basisMoudle/login.36feead7.js
  66. 1 1
      dist/js/businessMoudle/adqManage.154ecf5a.js
  67. 1 1
      dist/js/collectClip/index.2cc775ac.js
  68. 0 1
      dist/js/configArea/index.5265a897.js
  69. 1 0
      dist/js/configArea/index.beb9112f.js
  70. 1 1
      dist/js/echarts/echarts.5b4b2848.js
  71. 1 1
      dist/js/element-plus/element-plus.169ac68f.js
  72. 0 1
      dist/js/gdtList/index.426fa943.js
  73. 1 0
      dist/js/gdtList/index.628c4519.js
  74. 1 1
      dist/js/index/index.d2049870.js
  75. 1 1
      dist/js/index/index.cef11e27.js
  76. 1 1
      dist/js/layout/index.863b96be.js
  77. 1 1
      dist/js/layout/index_head.8a541328.js
  78. 1 1
      dist/js/materialBlock/materialBlock.c8f0823d.js
  79. 1 1
      dist/js/materialLibrary/index.3582b19a.js
  80. 1 1
      dist/js/menuPermission/menuList.ddf92709.js
  81. 1 0
      dist/js/miniprogram/index.381f46b3.js
  82. 0 1
      dist/js/miniprogram/index.bd2869f9.js
  83. 0 1
      dist/js/noData/noData.598cdb8f.js
  84. 1 0
      dist/js/noData/noData.b1e98517.js
  85. 0 0
      dist/js/sortablejs/sortablejs.4f86162a.js
  86. 1 1
      dist/js/tableInfo/tableInfo.e981ab4a.js
  87. 1 1
      dist/js/taskList/index.16488b01.js
  88. 1 1
      dist/js/timeScreen/timeScreen.e6cbe0ed.js
  89. 1 1
      dist/js/vue-router/vue-router.647267ed.js
  90. 0 0
      dist/js/vue/vue.86f330e1.js
  91. 1 1
      dist/js/vuedraggable/vuedraggable.974d406d.js
  92. 1 1
      dist/js/weekTime/weekTime.32094093.js
  93. 2 2
      dist/js/zrender/zrender.fe59a237.js
  94. 5 9
      src/components/businessMoudle/batchGdt/configArea/index.vue
  95. 15 6
      src/components/businessMoudle/batchGdt/configArea/ruleConfig/index.vue
  96. 6 6
      vite.config.ts

文件差异内容过多而无法显示
+ 0 - 1
dist/assets/_dialog.5c0eecd7.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/_dialog.8cd140fd.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/_input.205b99ee.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/_input.d72ce589.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/_select.2a9f1999.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/_select.97e73788.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/accountManage.0532d389.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/accountManage.896650f8.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/adqManage.694a1958.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/adqManage.c4615848.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/error.284bd084.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/error.97c715ec.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/home.1a33e614.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/home.9f35d1d5.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.1124a9fe.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.1becb535.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.28168f3c.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.2b4782a6.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.310a066a.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.3191aa97.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.37b5a88f.css


文件差异内容过多而无法显示
+ 1 - 1
dist/assets/index.a3fd41f8.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.3cb81ec5.css


文件差异内容过多而无法显示
+ 1 - 1
dist/assets/index.37dbf814.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.563e5dd5.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.61bf38c3.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.648b9e10.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.887b6b4f.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.9234b91e.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index.a956448f.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.c76d67ec.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.ca1fc3d5.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.d52cf2c0.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index.eb07d23d.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/index_head.bd849dfa.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index_head.fddecd4a.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/login.1a99fd9e.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/login.38e47126.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/materialBlock.4d7b717e.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/materialBlock.8868a5d8.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/menuList.30c26da6.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/menuList.45586ed7.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/noData.10280069.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/noData.c79b2ed6.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/tableInfo.b66a93c1.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/tableInfo.fc4a7715.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/timeScreen.0ab73184.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/timeScreen.9bc08e8b.css


文件差异内容过多而无法显示
+ 0 - 1
dist/assets/weekTime.07e6f724.css


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/weekTime.6de405e8.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.37dbf814.js"></script>
9
+    <script type="module" crossorigin src="./assets/index.45aac075.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">

文件差异内容过多而无法显示
+ 1 - 1
dist/js/@vue/@vue.e7eafc10.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/_dialog/_dialog.611db09b.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/_input/_input.7cd19126.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/_select/_select.3cf37d77.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/adTask/index.38e00465.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/adTask/index.a1ff9391.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/api/api.5484ef0b.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/api/api.78351f92.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/async-validator/async-validator.21881447.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/axios/axios.27022086.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/basisMoudle/accountManage.84221aed.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/basisMoudle/error.6934c673.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/basisMoudle/home.4b0af6cc.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/basisMoudle/login.36feead7.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/businessMoudle/adqManage.154ecf5a.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/collectClip/index.2cc775ac.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/configArea/index.5265a897.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/configArea/index.beb9112f.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/echarts/echarts.5b4b2848.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/element-plus/element-plus.169ac68f.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/gdtList/index.426fa943.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/gdtList/index.628c4519.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/index/index.d2049870.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/index/index.cef11e27.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/layout/index.863b96be.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/layout/index_head.8a541328.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/materialBlock/materialBlock.c8f0823d.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/materialLibrary/index.3582b19a.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/menuPermission/menuList.ddf92709.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/miniprogram/index.381f46b3.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/miniprogram/index.bd2869f9.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/noData/noData.598cdb8f.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/noData/noData.b1e98517.js


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


文件差异内容过多而无法显示
+ 1 - 1
dist/js/tableInfo/tableInfo.e981ab4a.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/taskList/index.16488b01.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/timeScreen/timeScreen.e6cbe0ed.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/vue-router/vue-router.647267ed.js


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


文件差异内容过多而无法显示
+ 1 - 1
dist/js/vuedraggable/vuedraggable.974d406d.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/weekTime/weekTime.32094093.js


文件差异内容过多而无法显示
+ 2 - 2
dist/js/zrender/zrender.fe59a237.js


+ 5 - 9
src/components/businessMoudle/batchGdt/configArea/index.vue

@@ -71,17 +71,13 @@
71 71
                   </template>
72 72
                 </div>
73 73
                 <template v-if="sub.name == '创意素材'">
74
-                  <template  v-for="cItem in cMaterial.list">
74
+                  <template  v-for="cItem in cMaterial.list" :key="cItem.id">
75 75
                     <div class="flex bMar8">
76
-                      <template v-for="cSub in cItem.list">
77
-                        <!--                      <div class="flex" style="width: 100%;justify-content: center" v-if="cMaterial.haveCoverOrVideo == 2 || cMaterial.haveCoverOrVideo == 1">-->
78
-                        {{cSub.videoUrl}}
79
-                        <div class="flex" style="width: 100%;justify-content: center" v-if="cSub.videoUrl">
76
+                      <template v-for="cSub in cItem.list" :key="cSub.subId">
77
+                        <div class="flex" style="width: 100%;justify-content: center" v-if="cMaterial.haveCoverOrVideo == 2 || cMaterial.haveCoverOrVideo == 1">
80 78
                           <video :src="cSub.videoUrl" height="50"></video>
81 79
                         </div>
82
-                        <!--                      <div style="width: 100%;justify-content: center" class="lMar10 flex" v-if="cMaterial.haveCoverOrVideo == 3 || cMaterial.haveCoverOrVideo == 1">-->
83
-                        {{cSub.picUrl}}
84
-                        <div style="width: 100%;justify-content: center" class="lMar10 flex" v-if="cSub.picUrl">
80
+                        <div style="width: 100%;justify-content: center" class="lMar10 flex" v-if="cMaterial.haveCoverOrVideo == 3 || cMaterial.haveCoverOrVideo == 1">
85 81
                           <img :src="cSub.picUrl" height="50"/>
86 82
                         </div>
87 83
                       </template>
@@ -621,6 +617,7 @@ const clearOriginalityInfo = () => {
621 617
 
622 618
 onMounted(()=>{
623 619
   nextTick(async ()=>{
620
+    await get_ruleConfig_info() //规则配置获取
624 621
     //获取推广目标类型
625 622
     await getPromotedObjectType().then((res)=>{
626 623
       pageInfo.targetList = res
@@ -631,7 +628,6 @@ onMounted(()=>{
631 628
     })
632 629
     get_account_list()
633 630
     getAdPresetsInfo(); // 广告预存信息获取
634
-    get_ruleConfig_info() //规则配置获取
635 631
   })
636 632
 })
637 633
 

+ 15 - 6
src/components/businessMoudle/batchGdt/configArea/ruleConfig/index.vue

@@ -3,7 +3,7 @@
3 3
       :dialogVisible="dialogShow"
4 4
       @confirm="confirmEvent"
5 5
       @close="closeEvent"
6
-      :destroy-on-close="true"
6
+      :destroyOnCloseFlag="true"
7 7
       width="700px"
8 8
       height="calc(100vh - 190px)"
9 9
       top="8px"
@@ -45,7 +45,7 @@
45 45
 
46 46
             <template v-if="item.EgName=='daily_budget'" v-slot:appoint>
47 47
               <div class="tMar20">
48
-                <el-input type="number" v-model="item.value" :min="50" placeholder="请输入推广计划日预算,最小50" style="width: 300px">
48
+                <el-input type="number" v-model="item.value" placeholder="请输入推广计划日预算,最小50" style="width: 300px">
49 49
                   <template #append>元</template>
50 50
                 </el-input>
51 51
                 <div style="color: #FF5B5B" v-if="item.value&&item.value<50" class="tMar5">最小50</div>
@@ -55,7 +55,7 @@
55 55
 
56 56
             <template v-if="item.EgName=='total_budget'" v-slot:appoint>
57 57
               <div class="tMar20">
58
-                <el-input type="number" v-model="item.value" :min="50" placeholder="请输入推广计划总预算,最小50" style="width: 300px">
58
+                <el-input type="number" v-model="item.value" placeholder="请输入推广计划总预算,最小50" style="width: 300px">
59 59
                   <template #append>元</template>
60 60
                 </el-input>
61 61
                 <div style="color: #FF5B5B" v-if="item.value&&item.value<50" class="tMar5">最小50</div>
@@ -223,7 +223,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
223 223
 //回显值 RadioGroup 单选
224 224
 const reEventRadio = (val:string | number | boolean,item:any) => {
225 225
   item.radioVal = val
226
-  if(item.list&&item.list.length>0){
226
+  if(item?.list?.length>0){
227 227
     let idx:number = item.list.findIndex(n=>n.value == val)
228 228
     item.value = item.list[idx].subValue
229 229
   }
@@ -320,7 +320,6 @@ const echoValue = async () => {
320 320
     ExposeValue.value = resNew
321 321
     pageInfo.jsonInfo.forEach(item=>{
322 322
       let val:string|number = resNew[item.EgName]
323
-      item.value = val
324 323
       if(item.haveAppoint){//需要指定
325 324
         item.radioVal = (!val || val=='0.00') ? 'unlimited' : 'appoint'
326 325
       }else{
@@ -329,6 +328,14 @@ const echoValue = async () => {
329 328
           item.radioVal = item.list[idx].value
330 329
         }
331 330
       }
331
+
332
+      if(item?.list?.length>0){
333
+        let idx:number = item.list.findIndex(n=>n.value == item.radioVal)
334
+        item.list[idx].subValue = val
335
+      }else{
336
+        item.value = val
337
+      }
338
+      console.log(item.EgName,item.value);
332 339
     })
333 340
   }else{
334 341
     ElMessage.error(res.errMsg)
@@ -345,7 +352,9 @@ const dialogShow = ref<boolean>(false)
345 352
 const switchShow = (val:boolean)=>{
346 353
   dialogShow.value = val
347 354
   if(val){
348
-    echoValue()
355
+    nextTick(()=>{
356
+      echoValue()
357
+    })
349 358
   }
350 359
 }
351 360
 

+ 6 - 6
vite.config.ts

@@ -88,12 +88,12 @@ export default defineConfig(({ mode}) => {
88 88
       sourcemap: false,
89 89
       minify: 'terser',
90 90
       chunkSizeWarningLimit: 1500,
91
-      // terserOptions: {
92
-      //   compress: {
93
-      //     drop_console: true,
94
-      //     drop_debugger: true
95
-      //   }
96
-      // },
91
+      terserOptions: {
92
+        compress: {
93
+          drop_console: true,
94
+          drop_debugger: true
95
+        }
96
+      },
97 97
       rollupOptions: {
98 98
         output: {
99 99
           manualChunks(id) {