Merge branch 'master' of http://101.200.220.49:8001/xiaona.liu/advertSystem

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.576c3b3e.js"></script>
+    <script type="module" crossorigin src="./assets/index.4c129630.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/directPacket/common/Cascader/index.vue

@@ -57,12 +57,14 @@ const props = withDefaults(defineProps<{
   title?: string,
   list?:any,
   subId?:string|number,
-  echochooseNum?:number
+  echochooseNum?:number,
+  key?:number
 }>(), {
   title: '',
   list:[],
   subId:'',
-  echochooseNum:0
+  echochooseNum:0,
+  key:1
 })
 const chooseObj = reactive<reactiveTableAndAny>({
   items:[]
@@ -80,50 +82,9 @@ const {
 }  = cascaderTs(props)
 
 const {deleEvent} = subChooseTs()
-
-// const chooseNum = computed(()=>{
-//   let num:number = 0
-//   chooseObj.items = []
-//   opionsList.value.forEach(item=>{
-//     if(item.isCheck){
-//       num+=1
-//       chooseObj.items.push(item)
-//     }else{
-//       if(item.child&&item.child.length>0){
-//         item.child.forEach(sub=>{
-//           if(sub.isCheck){
-//             num+=1
-//             chooseObj.items.push(sub)
-//           }else{
-//             if(sub.child&&sub.child.length>0){
-//               sub.child.forEach(sun=>{
-//                 if(sun.isCheck){
-//                   num+=1
-//                   chooseObj.items.push(sun)
-//                 }else{
-//                   if(sun.child&&sun.child.length>0){
-//                     sun.child.forEach(cSun=>{
-//                       if(cSun.isCheck){
-//                         num+=1
-//                         chooseObj.items.push(cSun)
-//                       }
-//                     })
-//                   }
-//                 }
-//               })
-//             }
-//           }
-//         })
-//       }
-//     }
-//   })
-//   return num
-// })
-
 const chooseNum = ref<number>(props.echochooseNum)
 
 const updateChooseNum = () => {
-  console.log('updateChooseNum');
   let num:number = 0
   chooseObj.items = []
   opionsList.value.forEach(item=>{
@@ -165,6 +126,9 @@ const updateChooseNum = () => {
 watch(()=>pageInfo.key,()=>{
   updateChooseNum()
 })
+watch(()=>props.key,()=>{
+  pageInfo.subOpions = []
+})
 onMounted(()=>{
   updateChooseNum()
 })

src/components/businessMoudle/batchGdt/configArea/directPacket/newDirecPacket.vue

@@ -34,7 +34,9 @@
                       @returnEvent="val=>reEventRadio(val,item)">
             <template v-if="item.EgName=='geo_location'" v-slot:appoint>
               <div class="tMar20">
-                <Cascade title="国家" :list="pageInfoTs.location_ca_list" :echochooseNum="item.value.regions&&item.value.regions.length" key="geo_location" @getIds="val=>handleCasItem(val,'geo_location',item)"></Cascade>
+                <Cascade :key="pageInfo.showKey" title="国家" :list="pageInfoTs.location_ca_list"
+                         :echochooseNum="item.value.regions&&item.value.regions.length" key="geo_location"
+                         @getIds="val=>handleCasItem(val,'geo_location',item)"></Cascade>
                 <el-checkbox-group v-model="item.value.location_types" @change="getEstimation">
                   <el-checkbox v-for="i in pageInfo.locationList" :label="i.label" >{{i.value}}</el-checkbox>
                 </el-checkbox-group>
@@ -139,6 +141,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
   ],
   estimationObj:{},
   directPacketParams:{},//确认和获取信息后台需要的参数
+  showKey:1
 })
 const fullLoading = ref<boolean>(false)
 
@@ -301,6 +304,7 @@ const switchShow = (val:boolean)=>{
   dialogShow.value = val
   if(val){
     loading.value = true
+    pageInfo.showKey++
     nextTick(async ()=>{
       //自定义转化行为
       await get_behavior_list()

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

@@ -48,10 +48,10 @@ const pageInfo = reactive<reactiveTableAndAny>({
         {title:'广告名称',key:'adgroup_name',value:''},
         {title:'广告ID',key:'adgroup_id',value:''},
         {title:'推广计划',key:'campaign_name',value:''},
-        {title:'推广目标',key:'TGMB',value:''},
+        {title:'推广目标',key:'promoted_object_type_text',value:''},
         {title:'营销目标',key:'marketing_scene_desc',value:''},
         {title:'广告形式',key:'ad_form',value:''},
-        {title:'版位',key:'site_set',value:''},
+        {title:'版位',key:'site_set_text',value:''},
         {title:'搜索场景扩量',key:'search_scene_expand',value:''},
         {title:'定向拓展',key:'search_expand_targeting_switch',value:''},
         {title:'版位扩量',key:'site_expand',value:''},
@@ -66,10 +66,10 @@ const pageInfo = reactive<reactiveTableAndAny>({
         {title:'投放时间',key:'time_series',value:''},
         {title:'首日开始时间',key:'first_day_begin_time',value:''},
         {title:'日预算',key:'daily_budget',value:''},
-        {title:'出价方式',key:'bid_mode',value:''},
+        {title:'出价方式',key:'bid_mode_text',value:''},
         {title:'投放场景',key:'bid_scene',value:''},
         {title:'出价类型',key:'smart_bid_type',value:''},
-        {title:'优化目标',key:'optimization_goal',value:''},
+        {title:'优化目标',key:'optimization_goal_text',value:''},
         {title:'出价',key:'bid_amount',value:''},
         {title:'深度优化目标',key:'deep_conversion_spec_goal',value:''},
         {title:'出价策略',key:'bid_strategy',value:''},