.

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.33c0993e.js"></script>
+    <script type="module" crossorigin src="./assets/index.41a8efcb.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/basicInfo/components/radio.vue

@@ -125,8 +125,12 @@ interface IChange {
 }
 const onChange = ({ val, type, key }: IChange) => {
   if (!key) return;
-  if (key == 'wechat_position') return;//使用key： wechat_position_checkbox
-  if (key == 'wechat_position_checkbox') {
+  if (key == 'wechat_position') {//使用key： wechat_position_checkbox
+    emitData['wechat_position_self'] = val
+    if(val == 1) {
+      emitData['wechat_position'] = ''
+    }
+  }else if (key == 'wechat_position_checkbox' && emitData['wechat_position_self'] == 2) {
     emitData['wechat_position'] = val;
   }else{
     emitData[key] = val;

src/components/businessMoudle/batchGdt/configArea/basicInfo/ts/fillBack.ts

@@ -121,6 +121,8 @@ export const FillBackData = ({ data, type, updateScene = {}, cb }: IFillBackData
       }) || []
     }
     time_series_writ = time_series_writ.filter((v) => { return v.length > 0 })
+    console.log(data)
+    // return
     if (type == 'me') {
       params = {
         'promoted_object_type': 'PROMOTED_OBJECT_TYPE_LEAD_AD',
@@ -304,6 +306,7 @@ export const FillBackData = ({ data, type, updateScene = {}, cb }: IFillBackData
           params[i] = String(params[i])
         }
       }
+      params.begin_date = getDay(2)
     }
 
     //对应展示文案

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

@@ -158,7 +158,7 @@ interface radioFace{
   value:number | string,
   name:string,
   EgName:string,
-  radioVal:string,
+  radioVal:any,
   haveNotes:boolean,
   list:any
 }

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

@@ -24,7 +24,7 @@
         <div class="c-theme lMarauto f13 pointer" @click="goMaterialLibrary">管理素材</div>
       </div>
     </template>
-    <div class="library_body">
+    <div class="library_body" :key="updateKey">
       <template v-if="typeAc == 'sucai'">
         <!--      搜索框-->
         <div class="flexWrap searchBox">
@@ -156,7 +156,7 @@
       </div>
     </div>
     <template #footer>
-      <div class="dialog-footer">
+      <div class="dialog-footer" :key="updateKey">
         <div class="flex">
           <span>已选素材: {{pageInfo?.chooseList_Item?.length || 0}} / {{ max_num ? max_num : (total || 0)}}</span>
           <Tooltip :contentSlotFalg="true" colorCss="c-d3">

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

@@ -108,7 +108,7 @@
     </div>
   </div>
   <!--  预览区-->
-  <PreviewArea :infoObj="previewObj"></PreviewArea>
+  <PreviewArea :infoObj="_.cloneDeep(previewObj)"></PreviewArea>
 
   <!--规则配置-->
   <RuleConfig ref="RuleConfigRef" @ExposeEvent="val=>pageInfo.RuleConfigObj = val"></RuleConfig>
@@ -444,7 +444,6 @@ const DirectPacketExhibitionRef = ref<{get_echoAcId:()=>void,
 // 打开添加 / 编辑
 const openDialogEvent = async (sub:any) => {
   if( !judgeEvent( sub.id ) ) return; // 判断是否完成前一模块
-  console.log('编辑',sub)
   if(sub.name == '定向包'){
     nextTick(()=>{
       if(DirectPacketExhibitionRef.value) { DirectPacketExhibitionRef.value[0]?.showDirectPacket() }
@@ -454,7 +453,6 @@ const openDialogEvent = async (sub:any) => {
     })
   }
   if(sub.name == '广告基本信息'){
-    console.log('广告基本信息')
     basicInfoData.visible = true;
   }
   if(sub.name == '创意基本信息'){
@@ -470,6 +468,7 @@ const openDialogEvent = async (sub:any) => {
 
   if(sub.name == '创意素材'){
     await get_cover_info()
+    console.log('cMaterial', cMaterial)
     console.log('打开之前CreativeMaterialRef',cMaterial.list);
     CreativeMaterialRef.value?.switchShow(true,sub.haveContent,cMaterial.list,cMaterial.testNew_text)
     console.log(cMaterial.array_property);

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

@@ -106,7 +106,6 @@ export function handleAdBasic({
         }
         updateHaveContent(8, 0, false, true)
       }
-console.log(obj)
       basicInfoData.copywriting = obj.copywriting
       basicInfoData.fillBack = obj.params
       getButtonBasicOuter(obj.params)

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

@@ -87,6 +87,16 @@ function handleJudge({
         !msgFlag && ElMessage.error('开始投放日期必须大于今日！')
         return false
       }
+      if (basicInfoData.fillBack.date_model == '2') {
+        if((basicInfoData.fillBack.end_date == '' || !basicInfoData.fillBack.end_date)){
+          !msgFlag && ElMessage.error('请选择投放结束日期')
+          return false
+        }
+        if(new Date(basicInfoData.fillBack.begin_date).getTime() > new Date(basicInfoData.fillBack.end_date).getTime()) {
+          !msgFlag && ElMessage.error('结束投放日期应不小于开始投放日期！')
+          return false
+        }
+      }
       if (basicInfoData.fillBack.first_day_begin_time && basicInfoData.fillBack.first_day_begin_time != '') {
         let daysOfWeek = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
         let time_series = _.cloneDeep(basicInfoData.fillBack.time_series)?.split(',')

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="areaBox">
+  <div class="areaBox" :key="`previewAreaTable_${updateKey}`">
     <div class="empty-block"
       v-if="!infoObj || !infoObj.campaign_list || !pageInfo.campaign_list || pageInfo.campaign_list.length == 0">
       <h3 class="empty-title">预览区</h3>
@@ -29,10 +29,9 @@
             <!--          <Dropdown title="批量操作" lMar="10px" :list="pageInfo.moreList" @close="dropdownEvent" :disabledFlag="pageInfo.chooseList&&pageInfo.chooseList.length == 0"></Dropdown>-->
           </div>
         </div>
-        <el-table :data="pageInfo.tableList" :header-cell-style="tableHeaderStyle" :key="`previewAreaTable_${updateKey}`"
+        <el-table :data="pageInfo.tableList" :header-cell-style="tableHeaderStyle"
           style="width: 100%;" border empty-text="暂无数据" :row-key="rowKeyStr" @selection-change="selectionChangeEvent"
           :span-method="objectSpanMethod" max-height="calc(100vh - 240px)">
-          <!-- <el-table-column fixed reserve-selection type="selection" width="60" align="center"/> -->
           <template v-for="bigItem in pageInfo.descol">
             <el-table-column :label="bigItem.name">
               <template v-for="item in bigItem.list">
@@ -47,44 +46,44 @@
                   <template #default="scope">
                     <div class="cellDiv" v-if="item.column == 'a1'">
                       <div class="clampOne tMar10 flex">名称：
-                        <el-tooltip placement="top" :content="scope.row.main_info.campaign_name"
-                          :disabled="scope.row.main_info.campaign_name ? false : true">
-                          <div class="ellipsis">{{ scope.row.main_info.campaign_name || '-' }}</div>
+                        <el-tooltip placement="top" :content="scope.row.main_info?.campaign_name"
+                          :disabled="scope.row.main_info?.campaign_name ? false : true">
+                          <div class="ellipsis">{{ scope.row.main_info?.campaign_name || '-' }}</div>
                         </el-tooltip>
                         <el-icon color="#3173FF" class="pointer"
                           @click="openSubDialogEvent(scope.row, 'campaign_name')"><i-ep-Edit /></el-icon>
                       </div>
                       <div class="clampOne">推广目标: {{ pageInfo?.target?.desc || '-' }} </div>
-                      <div class="clampOne flex">推广计划日预算：{{ scope.row.main_info.daily_budget == '' ||
-                        scope.row.main_info.daily_budget <= 0 ? '不限' : scope.row.main_info.daily_budget + '元' }} <el-icon
+                      <div class="clampOne flex">推广计划日预算：{{ scope.row.main_info?.daily_budget == '' ||
+                        scope.row.main_info?.daily_budget <= 0 ? '不限' : scope.row.main_info?.daily_budget + '元' }} <el-icon
                           color="#3173FF" class="pointer" @click="openSubDialogEvent(scope.row, 'PromotePlanBudget_day')">
                           <i-ep-Edit /></el-icon>
                       </div>
-                      <div class="clampOne flex">推广计划总预算：{{ scope.row.main_info.total_budget == '' ||
-                        scope.row.main_info.total_budget <= 0 ? '不限' : scope.row.main_info.total_budget }} <el-icon
+                      <div class="clampOne flex">推广计划总预算：{{ scope.row.main_info?.total_budget == '' ||
+                        scope.row.main_info?.total_budget <= 0 ? '不限' : scope.row.main_info?.total_budget }} <el-icon
                           color="#3173FF" class="pointer"
                           @click="openSubDialogEvent(scope.row, 'PromotePlanBudget_total')"><i-ep-Edit /></el-icon>
                       </div>
-                      <div class="clampOne">投放方式：{{ scope.row.main_info.speed_mode == 'SPEED_MODE_FAST' ? '加速投放' :
-                        scope.row.main_info.speed_mode == 'SPEED_MODE_STANDARD' ? '标准投放' : '-' }} </div>
+                      <div class="clampOne">投放方式：{{ scope.row.main_info?.speed_mode == 'SPEED_MODE_FAST' ? '加速投放' :
+                        scope.row.main_info?.speed_mode == 'SPEED_MODE_STANDARD' ? '标准投放' : '-' }} </div>
                     </div>
                     <div class="cellDiv flex" v-else-if="item.column == 'ad_name'">
-                      <el-tooltip placement="top" :content="scope.row.ad_name"
-                        :disabled="scope.row.ad_name ? false : true">
-                        <div class="ellipsis">{{ scope.row.ad_name || '-' }}</div>
+                      <el-tooltip placement="top" :content="scope.row?.ad_name"
+                        :disabled="scope.row?.ad_name ? false : true">
+                        <div class="ellipsis">{{ scope.row?.ad_name || '-' }}</div>
                       </el-tooltip>
                       <el-icon color="#3173FF" class="pointer"
                         @click="openSubDialogEvent(scope.row, 'ad_name')"><i-ep-Edit /></el-icon>
                     </div>
                     <div class="cellDiv flex" v-else-if="item.column == 'bid_amount'">
-                      <span>{{ scope.row.bid_amount || 0 }}元/{{ scope.row.optimization_goal_name || '千次曝光' }}</span>
+                      <span>{{ scope.row?.bid_amount || 0 }}元/{{ scope.row?.optimization_goal_name || '千次曝光' }}</span>
                       <el-icon color="#3173FF" class="pointer"
                         @click="openSubDialogEvent(scope.row, 'bid_amount')"><i-ep-Edit /></el-icon>
                     </div>
                     <div class="cellDiv flex" v-else-if="item.column == 'adcreative_name'">
-                      <el-tooltip placement="top" :content="scope.row.adcreatives_info.adcreative_name"
-                        :disabled="scope.row.adcreatives_info.adcreative_name ? false : true">
-                        <div class="ellipsis">{{ scope.row.adcreatives_info.adcreative_name || '-' }}</div>
+                      <el-tooltip placement="top" :content="scope.row?.adcreatives_info?.adcreative_name"
+                        :disabled="scope.row?.adcreatives_info?.adcreative_name ? false : true">
+                        <div class="ellipsis">{{ scope.row?.adcreatives_info?.adcreative_name || '-' }}</div>
                       </el-tooltip>
                     </div>
                     <div class="cellDiv flex" v-else-if="item.column == 'a5'">
@@ -92,19 +91,19 @@
                     </div>
                     <div class="cellDiv pointer" style="color:#3173FF;" v-else-if="item.column == 'a7'"
                       @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>
+                      <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"
-                        :disabled="scope.row?.adcreatives_info.adcreative_elements.description ? false : true">
-                        <span>文案:已选{{ (scope.row?.adcreatives_info.adcreative_elements.description && 1) ||
+                        :content="scope.row?.adcreatives_info?.adcreative_elements?.description"
+                        :disabled="scope.row?.adcreatives_info?.adcreative_elements?.description ? false : true">
+                        <span>文案:已选{{ (scope.row?.adcreatives_info?.adcreative_elements?.description && 1) ||
                           0 }}条文案</span>
                       </el-tooltip>
                     </div>
                     <div class="cellDiv flex" v-else-if="item.column == 'page_spec'">
-                      <span>{{ scope.row.adcreatives_info.page_spec.page_name || '-' }}</span>
+                      <span>{{ scope.row?.adcreatives_info?.page_spec?.page_name || '-' }}</span>
                     </div>
                     <div class="cellDiv" v-else-if="item.column == 'a10'">
                       <Popconfirm @confirm="deleTextEvent(scope.row, scope.$index)" />
@@ -113,10 +112,10 @@
                       {{ scope.row.a11 == 1 ? '已提交' : '待提交' }}
                     </div>
                     <div class="cellDiv" v-else-if="item.column == 'promoted_object_name'">
-                      {{ scope.row?.adcreatives_info.adcreative_elements.self_promoted_object_name || '暂未配置' }}
+                      {{ scope.row?.adcreatives_info?.adcreative_elements?.self_promoted_object_name || '暂未配置' }}
                     </div>
                     <div class="cellDiv" :style="{ justifyContent: item.alignSelf ? item.alignSelf : 'left' }" v-else>
-                      <el-tooltip :disabled="!(scope.row[item.column] && scope.row[item.column].length > 30)"
+                      <el-tooltip :disabled="!(scope.row[item.column] && scope.row[item.column]?.length > 30)"
                         effect="dark" :content="scope.row[item.column] + ''">
                         <div class="clampTwo line21" style="flex: 1">
                           {{ scope.row[item.column] || scope.row[item.column] == 0 ?
@@ -137,11 +136,9 @@
   <!--修改推广计划名称-->
   <EditPromotePlanName ref="EditPromotePlanNameRef" @confirm="val => echoVal(val, 'campaign_name')"></EditPromotePlanName>
   <!--推广计划日预算-->
-  <PromotePlanBudget_day ref="PromotePlanBudget_dayRef" @confirm="val => echoVal(val, 'PromotePlanBudget_day')">
-  </PromotePlanBudget_day>
+  <PromotePlanBudget_day ref="PromotePlanBudget_dayRef" @confirm="val => echoVal(val, 'PromotePlanBudget_day')"></PromotePlanBudget_day>
   <!--推广计划总预算-->
-  <PromotePlanBudget_total ref="PromotePlanBudget_totalRef" @confirm="val => echoVal(val, 'PromotePlanBudget_total')">
-  </PromotePlanBudget_total>
+  <PromotePlanBudget_total ref="PromotePlanBudget_totalRef" @confirm="val => echoVal(val, 'PromotePlanBudget_total')"></PromotePlanBudget_total>
   <!--修改广告名称-->
   <EditAdverteName ref="EditAdverteNameRef" @confirm="val => echoVal(val, 'ad_name')"></EditAdverteName>
   <!--修改出价-->

src/components/businessMoudle/gdtList/advert.vue

@@ -99,12 +99,25 @@
                         <span v-else-if="scope.row[item.key_value] == 'SPEED_MODE_FAST'">加速投放</span>
                         <span v-else>-</span>
                       </div>
+
                       <div v-else-if="item.key_value == 'operate'">
                         <div class="flex">
-<!--                          <span class="c-theme pointer" @click="copyEvent(scope.row)">复制</span>-->
-                          <span class="c-theme pointer lMar10" @click="goDetial(scope.row)">详情</span>
+                          <span class="c-theme pointer" @click="goDetial(scope.row)">详情</span>
+                          <span class="lMar10"
+                                :class="scope.row.configured_status == 'AD_STATUS_NORMAL' ? 'pointer-drop c-green-opa' : 'pointer c-green'"
+                                @click="scope.row.configured_status == 'AD_STATUS_SUSPEND'&&batchPlanEvent(scope.row,1)">启用</span>
+                        </div>
+                        <div>
+                        <span :class="scope.row.configured_status == 'AD_STATUS_SUSPEND' ? 'pointer-drop c-red-opa' : 'pointer c-red'"
+                              @click="scope.row.configured_status == 'AD_STATUS_NORMAL'&&batchPlanEvent(scope.row,2)">禁用</span>
+                          <Popconfirm key="dele" @confirm="batchPlanEvent(scope.row,3)" :slotFlag="true">
+                            <template #con>
+                              <span class="pointer lMar10">删除</span>
+                            </template>
+                          </Popconfirm>
                         </div>
                       </div>
+
                       <div class="flex c-theme" v-else-if="item.key_value == 'daily_budget'">
                         {{scope.row[item.key_value] ? NumberHandle(scope.row[item.key_value]) : '不限'}}
                       </div>
@@ -176,6 +189,7 @@ import Indicators from './indicators/index.vue'
 import {commonlistTs} from "@/components/businessMoudle/ts/commonList";
 import {getCurrentTime} from "@/common/common";
 import _ from "lodash";
+import Popconfirm from '@/components/capsulationMoudle/_popconfirm.vue'
 
 
 const { proxy } = getCurrentInstance() as any;
@@ -225,6 +239,16 @@ const tableInfo = reactive<reactiveTableAndAny>({
   sortType:'',
 })
 
+const batchPlanEvent = async (row?:any,val?:any) => {
+  loading.value = true
+  let infos:any = []
+  infos.push({
+    account_id:row.account_id,
+    adgroup_id:row.adgroup_id
+  })
+  batchEventApi(infos,val)
+}
+
 const batchEventApi = async (infos?:any,flag?:any,flagVal?:any,callback?:any) => {
   const paramsModel = reactive<batchGdt_ads_edit>({
     infos:JSON.stringify(infos),
@@ -443,6 +467,17 @@ const singleChooseCheckboxEvent = (idx:number,row:any)=>{
   }
 }
 
+//清空
+const clearEvent = () => {
+  nextTick(()=>{
+    InputRef_text.value!.value = ''
+    acRef.value!.value = []
+    statusRef.value!.value = ''
+    timeRef.value!.dateVal = ''
+    init()
+  })
+}
+
 
 const {
   init_acList,
@@ -451,7 +486,6 @@ const {
   acRef,
   statusRef,
   InputRef_text,
-  clearEvent,
   tableHeaderStyle,
   init_ad_statusList
 } = listTs()

src/components/businessMoudle/gdtList/plan.vue

@@ -117,7 +117,6 @@
                               <span class="pointer lMar10">删除</span>
                             </template>
                           </Popconfirm>
-
                         </div>
                       </div>
                       <div class="flex c-theme pointer" v-else-if="item.key_value == 'daily_budget'" @click="editPlanEvent(scope.row)">
@@ -235,7 +234,6 @@ const batchPlanEvent = async (row?:any,val?:any) => {
     campaign_id:row.campaign_id
   })
   batchPlanApi(arr,val)
-
 }
 const dropdownEvent = (val: string | number | object) => {
   loading.value = true
@@ -292,6 +290,12 @@ const init = async (page?:any,totalPages?:any) => {
     if(totalPages){
       tableInfo.tableList_all = res.rst.data.list
     }else{
+      tableInfo.total = res.rst.pageInfo.total
+      tableInfo.totalPages = res.rst.pageInfo.total
+      if(!res.rst.data){
+        tableInfo.tableList = []
+        return
+      }
       tableInfo.summary = res.rst.data.summary
       tableInfo.summary[0].campaign_name = '合计(缓存时间:' + getCurrentTime() + ')'
       tableInfo.descol = []
@@ -304,8 +308,6 @@ const init = async (page?:any,totalPages?:any) => {
       tableInfo.descol = res.rst.data.explain;
       tableInfo.descol.splice(1,0,{label:'操作',key_value:'operate',disabled:1,sub:[{label:'',key_value:'operate',disabled:1}]})
       tableInfo.tableList = res.rst.data.list
-      tableInfo.total = res.rst.pageInfo.total
-      tableInfo.totalPages = res.rst.pageInfo.total
     }
   }else{
     ElMessage.error(res.errMsg)
@@ -369,7 +371,16 @@ const singleChooseCheckboxEvent = (idx:number,row:any)=>{
     tableInfo.chooseAll = false
   }
 }
-
+//清空
+const clearEvent = () => {
+  nextTick(()=>{
+    InputRef_text.value!.value = ''
+    acRef.value!.value = []
+    statusRef.value!.value = ''
+    timeRef.value!.dateVal = ''
+    init()
+  })
+}
 
 const {
   init_acList,
@@ -378,7 +389,6 @@ const {
   acRef,
   statusRef,
   InputRef_text,
-  clearEvent,
   tableHeaderStyle,
   planEditIptRef,
   TargetEditRef,

src/components/businessMoudle/gdtList/ts/list.ts

@@ -3,6 +3,7 @@ import {getCurrentInstance, nextTick, reactive, ref} from "vue";
 import {adqParam, reactiveTableAndAny} from "@/api/ApiModel";
 import {Api} from "@/api/api";
 import {ElMessage} from "element-plus";
+import http from "@/http/http";
 export function listTs(){
     const { proxy } = getCurrentInstance() as any;
 // 全局方法定义
@@ -66,12 +67,12 @@ export function listTs(){
 
 //清空
     const clearEvent = () => {
-      nextTick(()=>{
-          InputRef_text.value!.value = ''
-          acRef.value!.value = []
-          statusRef.value!.value = ''
-          timeRef.value!.dateVal = ''
-      })
+        nextTick(()=>{
+            InputRef_text.value!.value = ''
+            acRef.value!.value = []
+            statusRef.value!.value = ''
+            timeRef.value!.dateVal = ''
+        })
     }
 
     //打开自定义指标