.

dist/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <title>广告系统</title>
       <script src="//open.thunderurl.com/thunder-link.js"></script>
-    <script type="module" crossorigin src="./assets/index.5385692d.js"></script>
+    <script type="module" crossorigin src="./assets/index.fd526f1e.js"></script>
     <link rel="modulepreload" href="./js/@vue/@vue.e7eafc10.js">
     <link rel="modulepreload" href="./js/vue-router/vue-router.647267ed.js">
     <link rel="modulepreload" href="./js/axios/axios.27022086.js">

src/components/businessMoudle/batchGdt/configArea/creativeMaterial/index.vue

@@ -30,9 +30,14 @@
           <div class="title">创意内容</div>
           <div class="smallTitle lMar20">创意组数量: {{pageInfo.creativeTeamList&&pageInfo.creativeTeamList.length}}组</div>
           <div class="lMarauto">
-            <el-button type="primary" v-if="haveCoverOrVideo == 1 || haveCoverOrVideo == 2" @click="openLibraryDialog(1)">批量添加视频</el-button>
-            <el-button type="primary" v-if="haveCoverOrVideo == 1 || haveCoverOrVideo == 3" @click="openLibraryDialog(2)">批量添加封面</el-button>
-            <el-button type="primary" @click="openTestNew">一键测新</el-button>
+            <el-button type="primary"
+                       :disabled="pageInfo.creativeTeamList?.length >= max_creative_num"
+                       v-if="haveCoverOrVideo == 1 || haveCoverOrVideo == 2" @click="openLibraryDialog(1)">批量添加视频</el-button>
+            <el-button type="primary"
+                       :disabled="pageInfo.creativeTeamList?.length >= max_creative_num"
+                       v-if="haveCoverOrVideo == 1 || haveCoverOrVideo == 3" @click="openLibraryDialog(2)">批量添加封面</el-button>
+            <el-button type="primary"
+                       :disabled="pageInfo.creativeTeamList?.length >= max_creative_num" @click="openTestNew">一键测新</el-button>
           </div>
         </div>
 
@@ -137,6 +142,7 @@ const props = withDefaults(defineProps<{
   haveShowVideoObj?:any,
   minNum_imageList?:number,
   maxNum_imageList?:number,
+  max_creative_num?:any
 }>(), {
   haveCoverOrVideo:1,
   video_tips:{},
@@ -144,6 +150,7 @@ const props = withDefaults(defineProps<{
   haveShowVideoObj:{},
   minNum_imageList:1,
   maxNum_imageList:1,
+  max_creative_num:0
 })
 
 interface radioFace{
@@ -232,6 +239,13 @@ const deleItemUrlEvent = (item: any,type:string,subId:number) => {
 //添加创意组
 const addItemEvent = () => {
   let arr:any = pageInfo.creativeTeamList
+  if(props.max_creative_num){
+    if(arr?.length >= props.max_creative_num){
+      ElMessage.error('创意组内素材数上限为：' + props.max_creative_num )
+      return
+    }
+  }
+
   let _id:number = arr[arr.length-1].id
   arr.push({
     id:_id+1,
@@ -253,6 +267,12 @@ const deleItemEvent = (item:any) => {
 //复制创意组
 const copyItemEvent = async (item:any) => {
   let arr:any = pageInfo.creativeTeamList
+  if(props.max_creative_num){
+    if(arr?.length >= props.max_creative_num){
+      ElMessage.error('创意组内素材数上限为：' + props.max_creative_num )
+      return
+    }
+  }
   let idx:number = arr.findIndex(n=>n.id== item.id)
   let _id:number = arr[arr.length-1].id
   let obj:any = _.cloneDeep(arr[idx])
@@ -296,10 +316,23 @@ const clearEvent = () => {
 }
 
 //一件测新
-const TestNewDialogRef = ref<{switchShow:(val:boolean)=>void}>()
+const TestNewDialogRef = ref<{switchShow:(val:boolean,creativeNum:any)=>void}>()
 const openTestNew = () => {
   nextTick(()=>{
-    TestNewDialogRef.value!.switchShow(true)
+    let arr:any = pageInfo.creativeTeamList
+    let satisfyLen:number = 0 // 创意组列表中 满足条件的个数
+    arr.forEach(async (item,idx)=>{
+      if(update_haveCoverOrVideoFlag2(item.list)){ //还有空白格
+      }else{
+        satisfyLen += 1
+      }
+    })
+    let newMaxLen:any = props.max_creative_num - satisfyLen // 最大创意组个数 - 满足的 = 还可以上传的创意组个数
+    if(newMaxLen <= 0){
+      ElMessage.error('所选素材已达上线，请删除素材后再来操作')
+      return
+    }
+    TestNewDialogRef.value!.switchShow(true,newMaxLen)
   })
 }
 

src/components/businessMoudle/batchGdt/configArea/creativeMaterial/testNew.vue

@@ -80,6 +80,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
   materialList:[],
   up_record_id:-1,
   requestNum:0,
+  creativeNum:0,
 })
 
 const CataRef = ref<{value:string,idVal:number,initAllAlbum:()=>void}>()
@@ -127,10 +128,11 @@ const cateRadioList = reactive<radioFace>({
 
 
 // 切换显隐
-const switchShow = (val:boolean)=>{
+const switchShow = (val:boolean,creativeNum:any)=>{
   dialogShow.value = val
   if(val){
     nextTick(()=>{
+      pageInfo.creativeNum = creativeNum
       formatRadioList.list[0].name = props.propInfo.text || '竖版视频9:16'
       clearTimeout(requestObj.timer_get_upload_res)
       CataRef.value!.initAllAlbum()
@@ -195,6 +197,12 @@ const confirmEvent = async () => {
   //将这些素材id走API.creative_upload接口得到up_record_id
   //将up_record_id轮询API.creative_upload_getRes接口得到是否上传完成
   //上传完成 - 将完成的列表push进index.vue的pageInfo.creativeTeamList
+
+  if(Number(numRadioList.value) > pageInfo.creativeNum){
+    ElMessage.error('创意组数量最大为：' + pageInfo.creativeNum)
+    return
+  }
+
   clearTimeout(requestObj.timer_get_upload_res)
   await getmaterialList()
   let ids:any = []

src/components/businessMoudle/batchGdt/configArea/index.vue

@@ -4,7 +4,6 @@
   </div>
   <div class="areaBox">
     <div class="areaTitle">配置区
-<!--      {{cMaterial.list}}-->
       <span class="smallTitle lMarauto">预览广告数 : <span class="c-theme">{{NumberHandle(pageInfo.num_total.adNum)||0}}</span></span>
     </div>
     <div class="areaCon">
@@ -72,18 +71,22 @@
                   </template>
                 </div>
                 <template v-if="sub.name == '创意素材'">
-                  <div class="flex bMar8" v-for="cItem in cMaterial.list" :key="cItem.id">
-                    <template v-for="cSub in cItem.list" :key="cSub.itemId">
-<!--                      <div class="flex" style="width: 100%;justify-content: center" v-if="cMaterial.haveCoverOrVideo == 2 || cMaterial.haveCoverOrVideo == 1">-->
-                      <div class="flex" style="width: 100%;justify-content: center" v-if="cSub.videoUrl">
-                        <video :src="cSub.videoUrl" height="50"></video>
-                      </div>
-<!--                      <div style="width: 100%;justify-content: center" class="lMar10 flex" v-if="cMaterial.haveCoverOrVideo == 3 || cMaterial.haveCoverOrVideo == 1">-->
-                      <div style="width: 100%;justify-content: center" class="lMar10 flex" v-if="cSub.picUrl">
-                        <img :src="cSub.picUrl" height="50"/>
-                      </div>
-                    </template>
-                  </div>
+                  <template  v-for="cItem in cMaterial.list" :key="cItem.id">
+                    <div class="flex bMar8">
+                      <template v-for="cSub in cItem.list" :key="cSub.itemId">
+                        <!--                      <div class="flex" style="width: 100%;justify-content: center" v-if="cMaterial.haveCoverOrVideo == 2 || cMaterial.haveCoverOrVideo == 1">-->
+                        {{cSub.videoUrl}}
+                        <div class="flex" style="width: 100%;justify-content: center" v-if="cSub.videoUrl">
+                          <video :src="cSub.videoUrl" height="50"></video>
+                        </div>
+                        <!--                      <div style="width: 100%;justify-content: center" class="lMar10 flex" v-if="cMaterial.haveCoverOrVideo == 3 || cMaterial.haveCoverOrVideo == 1">-->
+                        {{cSub.picUrl}}
+                        <div style="width: 100%;justify-content: center" class="lMar10 flex" v-if="cSub.picUrl">
+                          <img :src="cSub.picUrl" height="50"/>
+                        </div>
+                      </template>
+                    </div>
+                  </template>
                 </template>
               </div>
               <div class="btn" @click="openDialogEvent(sub)">{{sub.haveContent ? '编辑' : '添加'}}</div>
@@ -119,6 +122,7 @@
                     :video_tips="cMaterial.video_tips"
                     :image_tips="cMaterial.image_tips"
                     @closeLoading="close_reuse_loading"
+                    :max_creative_num="pageInfo.RuleConfigObj?.adcreative_max || 0"
                     :maxNum_imageList="cMaterial.array_property?.max_number || 1"
                     @assignEvent="assignEvent_CreativeMaterial"></CreativeMaterial>
 

src/components/businessMoudle/gdtList/detial/creativeInfo.vue

@@ -7,12 +7,12 @@
         <div v-for="sub in item.list" class="tMar13">
           <div class="flex">
             <span class="smallTitle">{{sub.title}}</span>
-            <div v-if="item.title == '创意素材'">
+            <div v-if="item.title == '创意素材'" class="flex">
               <template v-if="sub.value.video_url || sub.value.image_url || sub.value?.image_url_list?.length>0">
-                <video :src="sub.value.video_url" controls v-if="sub.value.video_url" style="width: 176px" class="rMar10"></video>
-                <img :src="sub.value.image_url" alt="" v-if="sub.value.image_url" style="width: 176px" class="rMar10"/>
+                <video :src="sub.value.video_url" controls v-if="sub.value.video_url" style="width: 176px;height: 200px" class="rMar10"></video>
+                <img :src="sub.value.image_url" alt="" v-if="sub.value.image_url" style="width: 100px" class="rMar10"/>
                 <template v-if="sub.value?.image_url_list?.length>0">
-                  <img  v-for="im in sub.value.image_url_list" :src="im" alt="" style="width: 176px" class="rMar10"/>
+                  <img  v-for="im in sub.value.image_url_list" :src="im" alt="" style="width: 100px" class="rMar10"/>
                 </template>
               </template>
               <template v-else>-</template>