提交

src/tool/adList.js

@@ -348,28 +348,25 @@ document.addEventListener('DOMContentLoaded', function () {
   }
   // 轮播End
 
-  const CFG = 'http://cxzx.smcic.net/ad/catalog/2.json'
-  if (CFG !== '__AD_CONFIG__') {
-    try {
-      fetch(CFG + '?' + Date.now())
-        .then((res) => res.json())
-        .then((res) => {
-          const data = res
-          console.log(data)
-          // 广告sdk
-          if (localStorage.getItem('ad_id')) {
-            ad_init(data)
-            return
-          }
+  const CFG = '__AD_CONFIG_URL__'
+  try {
+    fetch(CFG + '?' + Date.now())
+      .then((res) => res.json())
+      .then((res) => {
+        const data = res
+        // 广告sdk
+        if (localStorage.getItem('ad_id')) {
+          ad_init(data)
+          return
+        }
 
-          // 生成并输出浏览器指纹
-          generateBrowserFingerprint().then((ad_id) => {
-            localStorage.setItem('ad_id', ad_id + '')
-            ad_init(data)
-          })
+        // 生成并输出浏览器指纹
+        generateBrowserFingerprint().then((ad_id) => {
+          localStorage.setItem('ad_id', ad_id + '')
+          ad_init(data)
         })
-    } catch (error) {
-      console.error(error)
-    }
+      })
+  } catch (error) {
+    console.error(error)
   }
 })

src/types/Tool.d.ts

@@ -51,6 +51,7 @@ export interface AsProp {
   endDate: string
   intervalType: number | undefined
   timeInterval: string
+  creativeId: number | undefined
 }
 
 export interface menu {

src/views/ExaminePage.vue

@@ -39,7 +39,7 @@
     </el-table-column>
     <el-table-column prop="width" label="宽(px)" width="80" />
     <el-table-column prop="height" label="高(px)" width="80" />
-    <el-table-column prop="landingPage" label="跳转地址" />
+    <el-table-column prop="landingPage" label="落地页" />
     <el-table-column prop="updatedTime" label="最近更新">
       <template #default="scope">
         {{ formatDateSite(scope.row.updatedTime, 'Y-M-D') }}
@@ -91,7 +91,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="跳转地址" prop="landingPage">
+      <el-form-item label="落地页" prop="landingPage">
         <el-input v-model="form.landingPage" />
       </el-form-item>
       <el-form-item label="上传素材" prop="addr">

src/views/OriginalityPage.vue

@@ -165,13 +165,13 @@
           </el-table>
         </div>
       </el-form-item>
-      <el-form-item label="投放位置" prop="slot">
+      <el-form-item label="广告位" prop="slot">
         <el-select
           filterable
           multiple
           collapse-tags
           v-model="form.slot"
-          placeholder="选择位置"
+          placeholder="选择广告位"
           clearable
         >
           <el-option
@@ -279,6 +279,7 @@ const getAs = () => {
     startDate: data.dates ? data.dates[0] : '',
     endDate: data.dates ? data.dates[1] : '',
     intervalType: data.intervalType ? data.intervalType : undefined,
+    creativeId: data.creativeId,
     timeInterval,
   }).then(({ data }) => {
     options.value = data

src/views/SitePage.vue

@@ -187,7 +187,7 @@ const copyCode = (row: CatalogTreeOri) => {
   const slots = row.slots || []
   ElNotification({
     title: '请复制下文',
-    message: `<script src="http://cxzx.smcic.net/ad/catalog/${row.catalogId}.js" />  `,
+    message: `<script src="http://cxzx.smcic.net/ad/catalog/${row.catalogId}.js"/>`,
     duration: 0,
   })
   ElNotification({

src/views/SourceMaterialPage.vue

@@ -58,7 +58,7 @@
     </el-table-column>
     <el-table-column prop="width" label="宽(px)" width="80" />
     <el-table-column prop="height" label="高(px)" width="80" />
-    <el-table-column prop="landingPage" label="跳转地址" />
+    <el-table-column prop="landingPage" label="落地页" />
     <el-table-column prop="updatedTime" label="最近更新">
       <template #default="scope">
         {{ formatDateSite(scope.row.updatedTime, 'Y-M-D') }}
@@ -127,7 +127,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="跳转地址" prop="landingPage">
+      <el-form-item label="落地页" prop="landingPage">
         <el-input v-model="form.landingPage" />
       </el-form-item>
       <el-form-item label="上传素材" prop="addr">