多图

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

@@ -207,7 +207,6 @@ const backhaul = (obj) => {
 }
 /**确认 isMultiplex是否复用 */
 const submitEvent = (isMultiplex?: boolean, multiplexApiForm:any[] = []) => {
-  console.log('2222', form)
   let promise_arr: any = []
   let multiplex_load_acc: any[] = [];//复用需要上传的账号
   for (let i in form) {//检索是否有未填写信息
@@ -296,6 +295,9 @@ const submitEvent = (isMultiplex?: boolean, multiplexApiForm:any[] = []) => {
     }else{
       fullscreenLoading.value = false
     }
+  }).catch((err)=>{
+    console.log(err)
+    fullscreenLoading.value = false
   })
 }
 const loadingPage_event = () => {//落地页
@@ -511,7 +513,6 @@ const elementFillBack = () => {
 const switchShow = async (val: boolean, obj: any) => {
   visible.value = val
   if (val) {
-    console.log('obj',obj)
     if (obj.fillback && JSON.stringify(obj.fillback) != '{}') { //回显状态下
       fillBackInfo.value = _.cloneDeep(obj.fillback)
       templateCurr.value = _.cloneDeep(obj?.apiResult?.templateCurr)

src/components/businessMoudle/batchGdt/configArea/ts/material.ts

@@ -3,7 +3,7 @@ import { reactiveTableAndAny } from '@/api/ApiModel'
 import _ from 'lodash'
 
 //变量声明
-export function materialDeclare () {
+export function materialDeclare() {
   const CreativeMaterialRef = ref<{
     switchShow: (val: boolean, isEdit: boolean, arr: any) => void,
     clearAllEvent: () => void, creatice_reuseEvent: () => void, deleAcEvent: (arr: any, haveAssign: boolean) => void
@@ -38,78 +38,60 @@ export function handleMultiple({
   cMaterial
 }) {
   //处理素材返回来的值
-  const handle_resResult = (resResult: any, val: any) => {
-    // let str_imageorVideo: any = originalityBasicInfoData?.receiveForm?.originalityForm?.api_value?.originalityForm
+  const handle_resResult = (resResult: any) => {
     let resArr: any = []
     console.log('resResultresResult', resResult)
-    resResult.forEach(item => {
-      if (item) {
-        let obj: any = {}
-        obj.account_id = item.account_id
-        obj.list = []
+    resResult.forEach(main => {
+      if (!main) return;//跳出本次循环
+      let itemObj: any = _.cloneDeep(cMaterial.imgOrVideoInfo)
+      let imageArr: any = []
+      let self_info_arr:any = []
+      let obj: any = {}
+      obj.account_id = main.account_id
+      obj.list = []
+      main.list?.forEach((list_item) => {
+        let item = _.cloneDeep(list_item)
+        self_info_arr.push(item.self_info)
         for (let i in item) {
-          let arr = val.filter((v) => {
-            return v.itemId == i
-          })
-          if(item[i]?.material_res){
-            let itemObj: any = _.cloneDeep(cMaterial.imgOrVideoInfo)
-            itemObj = Object.assign(itemObj, {self_info: arr.length > 0 ? arr[0] : {}})
-            if(cMaterial.haveCoverOrVideo == 1) {//视频和图片
+          if (item[i]?.material_res) {
+            if (cMaterial.haveCoverOrVideo == 1) {//视频和图片
               if (item[i]?.material_res?.video_id) {
                 setValueInNestedObject(itemObj, 'video_id', item[i].material_res.video_id);
+                setValueInNestedObject(itemObj, 'self_video_count', 1);
               }
               if (item[i]?.material_res?.cover?.image_id) {
                 setValueInNestedObject(itemObj, 'image_id', item[i].material_res.cover.image_id);
+                setValueInNestedObject(itemObj, 'self_image_count', 1);
               }
               if (cMaterial.haveShowVideoObj.show && cMaterial.haveShowVideoObj.name) {
                 itemObj[cMaterial.haveShowVideoObj.name] = cMaterial.haveShowVideoObj.val
               }
             }
-            if(cMaterial.haveCoverOrVideo == 2) {//视频
+            if (cMaterial.haveCoverOrVideo == 2) {//视频
               if (item[i]?.material_res?.video_id) {
                 setValueInNestedObject(itemObj, 'video_id', item[i].material_res.video_id);
+                setValueInNestedObject(itemObj, 'self_video_count', 1);
               }
             }
-            if(cMaterial.haveCoverOrVideo == 3) {//图片
-              if(itemObj.image && item[i]?.material_res?.image_id) {
+            if (cMaterial.haveCoverOrVideo == 3) {//图片
+              if (itemObj.image && item[i]?.material_res?.image_id) {
                 setValueInNestedObject(itemObj, 'image_id', item[i].material_res.cover.image_id);
+                setValueInNestedObject(itemObj, 'self_image_count', 1);
               }
-              if(itemObj.image_list && item[i]?.material_res?.image_id) {
-                let imageArr: any = []
+              if (itemObj.image_list && item[i]?.material_res?.image_id) {
                 imageArr.push(item[i]?.material_res?.image_id)
-                setValueInNestedObject(itemObj, 'image_list', imageArr);
               }
             }
-            obj.list.push(itemObj)
           }
-
-
-          // if (str_imageorVideo == 'video' && item[i]?.material_res) {
-          //   let itemObj: any = {
-          //     self_info: arr.length > 0 ? arr[0] : {}
-          //   }
-          //   if (item[i]?.material_res?.video_id) {
-          //     itemObj.video = item[i].material_res.video_id
-          //   } else if (item[i]?.material_res?.cover?.image_id) {
-          //     itemObj.image = item[i].material_res.cover.image_id
-          //   }
-          //   if (cMaterial.haveShowVideoObj.show && cMaterial.haveShowVideoObj.name) {
-          //     itemObj[cMaterial.haveShowVideoObj.name] = cMaterial.haveShowVideoObj.val
-          //   }
-          //   obj.list.push(itemObj)
-          // } else if (str_imageorVideo == 'img' && item[i]?.material_res) {
-          //   if (item[i]?.material_res?.image_id) {
-          //     let imageArr: any = []
-          //     imageArr.push(item[i]?.material_res?.image_id)
-          //     obj.list.push({
-          //       image_list: imageArr,
-          //       self_info: arr.length > 0 ? arr[0] : {}
-          //     })
-          //   }
-          // }
         }
-        resArr.push(obj)
+      })
+      if(imageArr.length > 0) {//说明是多图片
+        setValueInNestedObject(itemObj, 'image_list', imageArr);
+        setValueInNestedObject(itemObj, 'self_image_count', imageArr.length);
       }
+      itemObj = Object.assign(itemObj, { self_info: self_info_arr})
+      obj.list.push(itemObj)
+      resArr.push(obj)
     })
     return resArr
   }
@@ -117,18 +99,38 @@ export function handleMultiple({
   const assignEvent_CreativeMaterial = async (val: any, videoOnPuse?: any) => {
     cMaterial.list_copy = _.cloneDeep(val)
     cMaterial.haveShowVideoObj.val = videoOnPuse
-    console.log('val',val)
+    console.log('val', val)
     //所有素材列表,此时的素材个数已是正确的
     let cMaterial_resResult_list: any = []
     val.forEach(vItem => {
-      vItem.list.forEach(sub=>{
-        cMaterial_resResult_list = cMaterial_resResult_list.concat(sub.resResult)
+      let arr = []
+      vItem.list.forEach(sub => {
+        let sub_resResult = _.cloneDeep(sub.resResult);
+        sub_resResult.forEach((v) => {
+          v['self_info'] = _.cloneDeep(sub)
+        });
+        arr = arr.concat(sub_resResult)
       })
+
+      let acc_arr: any[] = []
+      arr.forEach((item: any) => {
+        let acc_item_arr = acc_arr.filter((v) => v.account_id == item.account_id)
+        if (acc_item_arr.length > 0) {
+          acc_item_arr[0].list.push(item)
+        } else {
+          acc_arr.push({
+            account_id: item.account_id,
+            list: [item]
+          })
+        }
+      })
+
+      cMaterial_resResult_list = cMaterial_resResult_list.concat(acc_arr)
     })
-    console.log(cMaterial_resResult_list,'cMaterial_resResult_list');
+    console.log(cMaterial_resResult_list, 'cMaterial_resResult_list');
 
     let arr_: any = []
-    let cloneRes: any = await handle_resResult(_.cloneDeep(cMaterial_resResult_list), _.cloneDeep(val))
+    let cloneRes: any = await handle_resResult(_.cloneDeep(cMaterial_resResult_list))
     //图片形式的originalityBasicInfoData.params格式需要给
     console.log(cloneRes, 'cloneRes');
     await originalityBasicInfoData.params.forEach(item => {
@@ -215,12 +217,14 @@ export function handleMultiple({
       cMaterial.array_property = obj?.image_list?.array_property;
       cMaterial.imgOrVideoInfo['image_list'] = 'image_list'
     }
+    cMaterial.imgOrVideoInfo['self_image_count'] = 'self_image_count'
+    cMaterial.imgOrVideoInfo['self_video_count'] = 'self_video_count'
     // 留口子 现在逻辑是image video image_list不共存 暂未发现共存的情况
-    situationArr.forEach((item)=>{
-      if(item.type == 'video'){
+    situationArr.forEach((item) => {
+      if (item.type == 'video') {
         cMaterial.video_tips = item._tips
       }
-      if(item.type == 'image' || item.type == 'image_list'){
+      if (item.type == 'image' || item.type == 'image_list') {
         cMaterial.image_tips = item._tips
       }
     })

src/components/businessMoudle/batchGdt/previewArea/dialog/SeeVideoImg.vue

@@ -39,18 +39,20 @@ const propInfo = ref<{url:string,type:number}[]>([])
 const switchShow = (val:boolean, imgList: any)=>{
   dialogShow.value = val
   propInfo.value = []
-  if(imgList.videoUrl){
-    propInfo.value.push({
-      type: 1,
-      url: imgList.videoUrl
-    })
-  }
-  if(imgList.picUrl){
-    propInfo.value.push({
-      type: 2,
-      url: imgList.picUrl
-    })
-  }
+  imgList.forEach((item)=>{
+    if(item.videoUrl){
+      propInfo.value.push({
+        type: 1,
+        url: item.videoUrl
+      })
+    }
+    if(item.picUrl){
+      propInfo.value.push({
+        type: 2,
+        url: item.picUrl
+      })
+    }
+  })
 }
 // 父组件共享值
 defineExpose({

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

@@ -91,9 +91,10 @@
                       <span>暂未配置</span>
                     </div>
                     <div class="cellDiv pointer" style="color:#3173FF;" v-else-if="item.column == 'a7'"
-                      @click="openSubDialogEvent(scope.row, 'seeVideoImg')">已选<span
-                        v-if="scope.row?.adcreatives_info.adcreative_elements.image">1张图片,</span><span
-                        v-if="scope.row?.adcreatives_info.adcreative_elements.video">1个视频</span></div>
+                      @click="openSubDialogEvent(scope.row, 'seeVideoImg')">已选
+                      <span>{{scope.row?.adcreatives_info.adcreative_elements.self_image_count != 'self_image_count' ? scope.row?.adcreatives_info.adcreative_elements.self_image_count : 0}}张图片,</span>
+                      <span>{{scope.row?.adcreatives_info.adcreative_elements.self_video_count != 'self_video_count' ? scope.row?.adcreatives_info.adcreative_elements.self_video_count : 0}}个视频</span>
+                    </div>
                     <div class="cellDiv" v-else-if="item.column == 'description'">
                       <el-tooltip placement="top"
                         :content="scope.row?.adcreatives_info.adcreative_elements.description"
@@ -312,6 +313,8 @@ const auditSubmitEvent = () => {
       let item = main.ad_list[i]
       delete item.adcreatives_info.page_spec.page_name;
       delete item.adcreatives_info.adcreative_elements.self_info;
+      delete item.adcreatives_info.adcreative_elements.self_image_count;
+      delete item.adcreatives_info.adcreative_elements.self_video_count;
       delete item.adcreatives_info.adcreative_elements.self_promoted_object_name;
     }
   })