提交

sdk/adList.js

@@ -47,7 +47,7 @@ document.addEventListener('DOMContentLoaded', function () {
       for (let o = 0; o < v.creativesList.length; o++) {
         const item = v.creativesList[o]
         const start = new Date(item.startDate + ' 00:00:00').getTime()
-        const end = new Date(item.endDate + '').getTime()
+        const end = new Date(item.endDate + ' 23:59:59').getTime()
         // 判断变量是否数组
         if (dateTime < start || dateTime > end || !Array.isArray(item.stuffsList)) continue
         // 获取广告类型 1 轮播 2 交替 3 单项
@@ -56,12 +56,11 @@ document.addEventListener('DOMContentLoaded', function () {
           showType === 1
             ? generateCarouselAd(item, D, v.slotId, v.width || 0, v.height || 0)
             : generateAlternateAd(item, D, v.slotId, v.width || 0, v.height || 0)
-        if (e == -1) return
+        if (e == -1) break
         ele.appendChild(e)
         ele.style.width = '100%'
         ele.style.height = '100%'
       }
-
       ad_pos.style.width = (v.width || 0) + 'px'
       ad_pos.style.height = (v.height || 0) + 'px'
       ad_pos.style.border = 'none'
@@ -73,24 +72,24 @@ document.addEventListener('DOMContentLoaded', function () {
 
   // 生成轮播广告
   const generateCarouselAd = function (generateCarousel = {}, D, slotId, width, height) {
-    const week = D.getDay() === 0 ? 7 : D.getDay()
+    const week = D.getDay() === 0 ? 6 : D.getDay() - 1
     const timeInterval = (generateCarousel.timeInterval || '')
-      .slice(week * 24, week * 24 + 25)
+      .slice(week * 24, week * 24 + 24)
       .split('')
     const H = D.getHours()
-    if (timeInterval[H] == 0) return -1
+    if (generateCarousel.intervalType === 2 && timeInterval[H] == 0) return -1
     const T = (generateCarousel.showIntervalTime || 5) * 1000
     return createCarousel(generateCarousel.stuffsList, T, slotId, width, height)
   }
 
   // 生成交替广告
   const generateAlternateAd = function (generateAlternate = {}, D, slotId, width, height) {
-    const week = D.getDay() === 0 ? 7 : D.getDay()
+    const week = D.getDay() === 0 ? 6 : D.getDay() - 1
     const timeInterval = (generateAlternate.timeInterval || '')
       .slice(week * 24, week * 24 + 24)
       .split('')
     const H = D.getHours()
-    if (timeInterval[H] == 0) return -1
+    if (generateAlternate.intervalType === 2 && timeInterval[H] == 0) return -1
     const stuff =
       generateAlternate.stuffsList[
         Math.floor((H * 60 + D.getMinutes()) / (generateAlternate.showIntervalTime || 5)) %

src/views/OriginalityPage.vue

@@ -47,7 +47,7 @@
           type="primary"
           @click="() => linkSourceMaterial(scope.row.creativeId)"
         >
-          关联素材
+          创建素材
         </el-button>
         <el-popconfirm
           title="确定删除该创意吗?"

src/views/SourceMaterialPage.vue

@@ -5,6 +5,7 @@
       <el-input v-model="pages.keyword" placeholder="输入素材关键词" clearable />
     </el-form-item>
     <el-form-item label="选择创意">
+      {{ pages.creativeId }}
       <el-select
         filterable
         v-model="pages.creativeId"
@@ -32,13 +33,7 @@
   </el-form>
   <el-table @selection-change="selectionChange" ref="table" :data="tableData" style="width: 100%">
     <el-table-column type="selection" width="55" v-if="query != -1" />
-    <el-table-column prop="stuffName" label="名称">
-      <template #default="scope">
-        <el-tooltip class="item" effect="dark" :content="scope.row.stuffName" placement="top">
-          <span>{{ scope.row.stuffName }}</span>
-        </el-tooltip>
-      </template>
-    </el-table-column>
+    <el-table-column prop="stuffName" label="名称" show-overflow-tooltip> </el-table-column>
     <el-table-column prop="stuffName" label="查看">
       <template #default="scope">
         <el-image
@@ -221,7 +216,7 @@ const dialogVideo = ref(false)
 const table = ref<InstanceType<typeof ElTable> | null>(null)
 const dialogVideoUrl = ref('')
 const originalityList = ref<OriginalityList>([])
-const selectObj: SourceMaterialItem[] = []
+let selectObj: SourceMaterialItem[] = []
 getOriginalityList({
   pageNum: 1,
   pageSize: 999999,
@@ -234,11 +229,10 @@ const form = ref<ISourceMaterialProps>({
   width: 0,
   height: 0,
 })
-
 const pages = reactive<Pages>({
   pageNum: 1,
   pageSize: 10,
-  creativeId: queryRouter?.show ? query.value : undefined,
+  creativeId: queryRouter?.show === 'true' ? query.value : undefined,
 })
 
 const tableData = ref<SourceMaterialList>([])
@@ -267,8 +261,9 @@ const onSubmit = () => {
       for (let i = 0; i < tableData.value.length; i++) {
         const v = tableData.value[i]
         const index = selectObj.findIndex((o) => o.stuffId === v.stuffId)
-        if (v.creativeId !== query.value && index === -1) continue
-        table.value?.toggleRowSelection(v, undefined, true)
+        if (v.creativeId === query.value || index > -1) {
+          table.value?.toggleRowSelection(v, undefined, true)
+        }
       }
     })
   })
@@ -283,6 +278,7 @@ const moreAdd = () => {
       message: '添加成功',
       type: 'success',
     })
+    selectObj = []
     onSubmit()
   })
 }