liuxiaona %!s(int64=11) %!d(string=před) měsíci
rodič
revize
727d69fb9d
44 změnil soubory, kde provedl 63 přidání a 58 odebrání
  1. 1 1
      dist/assets/index.46397394.css
  2. 1 1
      dist/assets/index.69eb01fd.js
  3. 1 1
      dist/index.html
  4. 1 1
      dist/js/@vue/@vue.e7eafc10.js
  5. 1 1
      dist/js/_dialog/_dialog.0e4caf50.js
  6. 1 1
      dist/js/_input/_input.a18de30b.js
  7. 1 1
      dist/js/_select/_select.c4309c10.js
  8. 0 1
      dist/js/adTask/index.1c0b9b91.js
  9. 1 0
      dist/js/adTask/index.fc459026.js
  10. 1 1
      dist/js/api/api.a32b44fb.js
  11. 1 1
      dist/js/async-validator/async-validator.21881447.js
  12. 1 1
      dist/js/axios/axios.27022086.js
  13. 1 1
      dist/js/basisMoudle/accountManage.278809e7.js
  14. 1 1
      dist/js/basisMoudle/error.fc0de3d0.js
  15. 1 1
      dist/js/basisMoudle/home.e95d4963.js
  16. 1 1
      dist/js/basisMoudle/login.39c637ec.js
  17. 1 1
      dist/js/businessMoudle/adqManage.1bb43611.js
  18. 1 1
      dist/js/collectClip/index.8a6545be.js
  19. 0 1
      dist/js/configArea/index.431a842e.js
  20. 1 0
      dist/js/configArea/index.c5ad50b6.js
  21. 1 1
      dist/js/echarts/echarts.5b4b2848.js
  22. 1 1
      dist/js/element-plus/element-plus.169ac68f.js
  23. 0 1
      dist/js/gdtList/index.31c7f554.js
  24. 1 0
      dist/js/gdtList/index.c6ae3826.js
  25. 1 1
      dist/js/index/index.5d1ae0d7.js
  26. 1 1
      dist/js/index/index.a11a2822.js
  27. 1 1
      dist/js/layout/index.a7574047.js
  28. 1 1
      dist/js/layout/index_head.745dc762.js
  29. 1 1
      dist/js/materialBlock/materialBlock.7e9f0eb5.js
  30. 1 1
      dist/js/materialLibrary/index.df892101.js
  31. 1 1
      dist/js/menuPermission/menuList.3addc5b8.js
  32. 1 0
      dist/js/miniprogram/index.aabdeba8.js
  33. 0 1
      dist/js/miniprogram/index.f64ad37a.js
  34. 0 1
      dist/js/noData/noData.2ecdc540.js
  35. 1 0
      dist/js/noData/noData.672c22d9.js
  36. 1 1
      dist/js/tableInfo/tableInfo.3d76dccc.js
  37. 1 1
      dist/js/taskList/index.e3e48231.js
  38. 1 1
      dist/js/timeScreen/timeScreen.889c8c4a.js
  39. 1 1
      dist/js/vue-router/vue-router.647267ed.js
  40. 1 1
      dist/js/weekTime/weekTime.aafbddd6.js
  41. 2 2
      dist/js/zrender/zrender.fe59a237.js
  42. 5 9
      src/components/businessMoudle/batchGdt/configArea/index.vue
  43. 15 6
      src/components/businessMoudle/batchGdt/configArea/ruleConfig/index.vue
  44. 6 6
      vite.config.ts

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


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


+ 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.69eb01fd.js"></script>
9
+    <script type="module" crossorigin src="./assets/index.ff86c505.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/@vue/@vue.e7eafc10.js


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


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


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


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


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/async-validator/async-validator.21881447.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/axios/axios.27022086.js


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/echarts/echarts.5b4b2848.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/element-plus/element-plus.169ac68f.js


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/js/vue-router/vue-router.647267ed.js


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


File diff suppressed because it is too large
+ 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>
@@ -606,6 +602,7 @@ const clearOriginalityInfo = () => {
606 602
 
607 603
 onMounted(()=>{
608 604
   nextTick(async ()=>{
605
+    await get_ruleConfig_info() //规则配置获取
609 606
     //获取推广目标类型
610 607
     await getPromotedObjectType().then((res)=>{
611 608
       pageInfo.targetList = res
@@ -616,7 +613,6 @@ onMounted(()=>{
616 613
     })
617 614
     get_account_list()
618 615
     getAdPresetsInfo(); // 广告预存信息获取
619
-    get_ruleConfig_info() //规则配置获取
620 616
   })
621 617
 })
622 618
 

+ 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) {