dist/index.html

@@ -12,7 +12,7 @@
 			document.write('<script src="' + src + '"><\/script>');
 			})();
     </script>
-    <script type="module" crossorigin src="./assets/index.0bed2532.js"></script>
+    <script type="module" crossorigin src="./assets/index.cac835ca.js"></script>
     <link rel="modulepreload" href="./js/@vue/@vue.5bfcce30.js">
     <link rel="modulepreload" href="./js/vue-router/vue-router.ccba075e.js">
     <link rel="modulepreload" href="./js/vue-demi/vue-demi.4f3c4c97.js">

src/components/businessMoudle/adqManage3/agency/importDialog.vue

@@ -15,9 +15,12 @@
         <el-icon class="rMar7 tMar2" color="#ff9b48">
           <WarningFilled />
         </el-icon>
-        <span class="flex_1 " v-if="importType.type == 'part' && handType.type == 1">请确保输入的广告主账户已属于对应的代理商，否则会导致失败；单次授权账户上限{{ agencyCount }}个，如账户数量较多，请分批次输入</span>
-        <span class="flex_1 " v-if="importType.type == 'part' && handType.type == 2">该代理商账户下共{{acc_count}}个媒体账户，请选择想要导入的账户名称</span>
-        <span class="flex_1 " v-if="importType.type == 'all'">该代理商账户下共{{acc_count}}个媒体账户</span>
+        <span class="flex_1 "
+          v-if="importType.type == 'part' && handType.type == 1">请确保输入的广告主账户已属于对应的代理商，否则会导致失败；单次授权账户上限{{ agencyCount
+          }}个，如账户数量较多，请分批次输入</span>
+        <span class="flex_1 "
+          v-if="importType.type == 'part' && handType.type == 2">该代理商账户下共{{ acc_count }}个媒体账户，请选择想要导入的账户名称</span>
+        <span class="flex_1 " v-if="importType.type == 'all'">该代理商账户下共{{ acc_count }}个媒体账户</span>
       </div>
 
       <!-- S 导入媒体账户 附加条件 -->
@@ -30,10 +33,12 @@
       <!-- E 导入媒体账户 附加条件 -->
 
       <!-- 手动输入 -->
-      <ManualInput v-show="importType.type == 'part' && handType.type == 1" :maxRow="agencyCount" @mInput="getMInput"></ManualInput>
+      <ManualInput v-show="importType.type == 'part' && handType.type == 1" :maxRow="agencyCount" @mInput="getMInput">
+      </ManualInput>
 
       <!-- 列表选择或者全部导入 -->
-      <ChildList ref="ChildListRef" v-show="importType.type == 'part' && handType.type == 2 || importType.type == 'all'" :agencyItem="agencyItem" :importType="importType.type" :handType="handType.type" @total="getCountAcc"></ChildList>
+      <ChildList ref="ChildListRef" v-show="importType.type == 'part' && handType.type == 2 || importType.type == 'all'"
+        :agencyItem="agencyItem" :importType="importType.type" :handType="handType.type" @total="getCountAcc"></ChildList>
     </div>
     <template #footer>
       <div class="dialog-footer" style="text-align: right;padding:10px;padding-top: 0;">
@@ -86,10 +91,10 @@ onBeforeMount(() => {
 const handleClose = () => {
   visible.value = false
 }
-const getCountAcc = (val) =>{
+const getCountAcc = (val) => {
   acc_count.value = val
 }
-const getMInput = (val)=>{
+const getMInput = (val) => {
   inputValue.value = val
 }
 
@@ -100,16 +105,16 @@ const submitEvent = async () => {
     return
   }
   let data_str = '';
-  if(importType.type == 'part' && handType.type == 1){
+  if (importType.type == 'part' && handType.type == 1) {
     data_str = inputValue.value
-  }else{
-    if(ChildListRef.value){
-      await ChildListRef.value.getMultipleList().then((res)=>{
+  } else {
+    if (ChildListRef.value) {
+      await ChildListRef.value.getMultipleList().then((res) => {
         data_str = JSON.stringify(res)
       })
     }
   }
-  if(data_str == ''){
+  if (data_str == '') {
     ElMessage.warning('请输入账户ID或手动选择媒体账户！');
     return
   }
@@ -123,7 +128,7 @@ const submitEvent = async () => {
     project_id: projectIdRef.value?.value,
   }).then((res) => {
     loading.value = false
-    if(res){
+    if (res) {
       ElMessage.warning('导入成功')
       visible.value = false
       emit('close')
@@ -163,5 +168,4 @@ defineExpose({
 
 .block {
   display: block;
-}
-</style>
+}</style>

src/components/businessMoudle/adqManage3/hooks/agency.ts

@@ -5,7 +5,7 @@ export const agencyExport = () => {
   const EditDialogRef = ref()
   const ImpoartDialogRef = ref()
   const agencyEvent = (info) => {
-    if(!info?.agency_account_id){
+    if (!info?.agency_account_id) {
       ElMessage.error('代理商获取失败，无法导入账户！')
       return
     }
@@ -14,7 +14,7 @@ export const agencyExport = () => {
     }
   }
   const agencyEditEvent = (info) => {
-    if(!info?.account_id){
+    if (!info?.account_id) {
       ElMessage.error('账户获取失败，无法进行编辑！')
       return
     }

src/components/businessMoudle/adqManage3/index.vue

@@ -2,28 +2,32 @@
   <!--  类型切换 -->
   <div class="typeBorlineBox flex_between">
     <div class="flex" style="margin-left: 15px">
-      <div class="item" v-for="item in typeList.list" :key="item.id" :class="item.id == typeList.typeAc ? 'itemAc' : ''" @click="switchTypeItem(item)">
-      <div>{{item.name}}</div>
-      <div class="borLine"></div>
-    </div>
+      <div class="item" v-for="item in typeList.list" :key="item.id" :class="item.id == typeList.typeAc ? 'itemAc' : ''"
+        @click="switchTypeItem(item)">
+        <div>{{ item.name }}</div>
+        <div class="borLine"></div>
+      </div>
     </div>
     <el-button type="primary" size="default" class="rMar15" @click="authEvent()">账号授权</el-button>
   </div>
 
   <div class="screenBox flex" style="padding: 15px;s" v-loading="authLoading">
     <Input ref="InputRef_text" title="关键词" placeholderTxt="关键词" @changeEvent="init()" @clearEvent="init()" />
-    <Select ref="ideaManRef" :clearFlag="true" title="所属人员" selectWidth="160px" :optObj="{ k: 'id', la: 'username', val: 'id' }"
-      @changeEvent="init()" @clearEvent="init()" :options="pageInfo.createrList" />
+    <Select ref="ideaManRef" :clearFlag="true" title="所属人员" selectWidth="160px"
+      :optObj="{ k: 'id', la: 'username', val: 'id' }" @changeEvent="init()" @clearEvent="init()"
+      :options="pageInfo.createrList" />
     <Select ref="ctypeRef" :clearFlag="true" title="类型" selectWidth="160px" @changeEvent="init()" @clearEvent="init()"
       :options="pageInfo.getTypeList" />
   </div>
 
   <!--  列表-->
-  <TableList ref="tableListRef" :tableData="tableInfo.tableList" immobilizationHeight="calc(100vh - 260px)" :descol="tableInfo.descolList" :total="total"
-    @init="init">
+  <TableList ref="tableListRef" :tableData="tableInfo.tableList" immobilizationHeight="calc(100vh - 260px)"
+    :descol="tableInfo.descolList" :total="total" @init="init">
     <template v-slot:operate="slotProps">
       <div class="text-center">
-        <span class="c-theme pointer f13 rMar7" v-if="typeList.typeAc == 'ACCOUNT_ROLE_TYPE_AGENCY'" @click="agencyEvent(slotProps.row)">导入账户</span>
+        <span class="c-theme pointer f13 rMar7"
+          v-if="['ACCOUNT_ROLE_TYPE_AGENCY', 'ACCOUNT_ROLE_TYPE_BUSINESS_MANAGER'].includes(typeList.typeAc)"
+          @click="agencyEvent(slotProps.row)">导入账户</span>
         <span class="c-theme pointer f13" @click="agencyEditEvent(slotProps.row)">编辑</span>
         <Popconfirm @confirm="deleEvent(slotProps.row)" />
       </div>
@@ -55,12 +59,13 @@ const { proxy } = getCurrentInstance() as any;
 
 const typeList = reactive({
   list: [
-  {id:'ACCOUNT_ROLE_TYPE_ADVERTISER', name: '广告主' },
-  {id:'ACCOUNT_ROLE_TYPE_AGENCY', name: '代理商' },
-],
-typeAc: 'ACCOUNT_ROLE_TYPE_AGENCY'
+    { id: 'ACCOUNT_ROLE_TYPE_ADVERTISER', name: '广告主' },
+    { id: 'ACCOUNT_ROLE_TYPE_AGENCY', name: '代理商' },
+    { id: 'ACCOUNT_ROLE_TYPE_BUSINESS_MANAGER', name: '商务管家' },
+  ],
+  typeAc: 'ACCOUNT_ROLE_TYPE_AGENCY'
 })
-const switchTypeItem = (info)=>{
+const switchTypeItem = (info) => {
   typeList.typeAc = info.id
   init(1)
 }
@@ -74,12 +79,12 @@ const {
 
 // 表格数据公共ts
 const descolParams = reactive([
-  { name: '账号名称', column: 'account_name', minWidth: '120px'},
+  { name: '账号名称', column: 'account_name', minWidth: '120px' },
   { name: '账号ID', column: 'account_id', cancleForMat: true },
   { name: '账号类型', column: 'type_name', },
   { name: '所属人员', column: 'owner_name', },
   { name: '所属项目', column: 'project_name', },
-  { name: '创建时间', column: 'created_at', minWidth: '100px'},
+  { name: '创建时间', column: 'created_at', minWidth: '100px' },
   { name: '操作', column: 'operate', slotFlag: true },
 ])
 const { tableInfo, tableListRef, total } = publicTableTs(descolParams)
@@ -154,15 +159,15 @@ const init_createrList = async () => {
 }
 
 const editClose = () => {
-  if(route.query?.account_id){
+  if (route.query?.account_id) {
     router.replace('/adqManage')
   }
   init(1)
 }
 
 onMounted(async () => {
-  if(route.query?.account_id){
-    agencyEditEvent({'account_id': route.query?.account_id})
+  if (route.query?.account_id) {
+    agencyEditEvent({ 'account_id': route.query?.account_id })
   }
   await init()
   await init_createrList()
@@ -181,5 +186,4 @@ onMounted(async () => {
 
 .screenArea {
   margin-bottom: 8px;
-}
-</style>
+}</style>

src/components/businessMoudle/batchGdt3/configArea/basicInfo/index.vue

@@ -141,16 +141,16 @@
         <template
           v-if="(form.bid_mode == 'BID_MODE_OCPM' || form.bid_mode == 'BID_MODE_OCPC') && form.conversion_tracking_enabled == 1">
           <!-- 上报方式 -->
-          <MyRadio :info="scheduleBidInfo.conversion_tracking_report_type"
-            :fillBack="props.dataFillBack['conversion_tracking_report_type']"
-            @change="(val) => { onChangeKey({ val: val['conversion_tracking_report_type'], key: 'conversion_tracking_report_type' }) }">
+          <MyRadio :info="scheduleBidInfo.access_type"
+            :fillBack="props.dataFillBack['access_type']"
+            @change="(val) => { onChangeKey({ val: val['access_type'], key: 'access_type' }) }">
           </MyRadio>
           <!-- 归因方式 -->
-          <MyRadio :info="scheduleBidInfo.conversion_tracking_way" :fillBack="form.conversion_tracking_way"
+          <MyRadio :info="scheduleBidInfo.claim_type" :fillBack="form.claim_type"
             @change="radioChange"></MyRadio>
           <!-- 转化场景 -->
-          <MyRadio v-if="form.conversion_tracking_report_type == 1" :info="scheduleBidInfo.conversion_tracking_scene"
-            @change="radioChange" :fillBack="props.dataFillBack['conversion_tracking_scene']"></MyRadio>
+          <MyRadio v-if="form.access_type == 'ACCESS_TYPE_API'" :info="scheduleBidInfo.conversion_scene"
+            @change="radioChange" :fillBack="props.dataFillBack['conversion_scene']"></MyRadio>
         </template>
         <!-- 优化目标 -->
         <MySelect v-if="form.bid_mode == 'BID_MODE_OCPM' || form.bid_mode == 'BID_MODE_OCPC'" :goalType="1"
@@ -329,7 +329,7 @@
 </template>
 <script setup lang="ts">
 import { ref, reactive, watch, onBeforeMount, computed, nextTick } from 'vue'
-import { basicInfoJson, scheduleBid, conversion_tracking_way, short_play_pay_type } from './ts/information'
+import { basicInfoJson, scheduleBid, claim_type, short_play_pay_type } from './ts/information'
 import { specificPositionAll, expand_targeting, unbreakable_targeting } from './ts/other'
 import { scene, wechatScene, positionMapping, search_expand_targeting_switch } from './ts/scene'
 import { FillBackData } from './ts/fillBack'
@@ -690,13 +690,13 @@ const onChangeKey = ({ val, key }) => {
       scheduleBidInfo.daily_budget_radio.data.list[0].disabled = false;
       scheduleBidInfo.daily_budget_radio.data.list[0].note = '';
     }
-  } else if (key == 'conversion_tracking_report_type') { //上报方式
+  } else if (key == 'access_type') { //上报方式
     form[key] = val;
-    if (form['conversion_tracking_report_type'] == '2') {
-      scheduleBidInfo.conversion_tracking_way.data.list = [conversion_tracking_way[0]]
-      form.conversion_tracking_way = conversion_tracking_way[0].value
+    if (form['access_type'] == 'ACCESS_TYPE_JS') {
+      scheduleBidInfo.claim_type.data.list = [claim_type[0]]
+      form.claim_type = claim_type[0].value
     } else {
-      scheduleBidInfo.conversion_tracking_way.data.list = conversion_tracking_way
+      scheduleBidInfo.claim_type.data.list = claim_type
     }
   } else if (key == 'smart_bid_type') { //出价类型
     form[key] = val;
@@ -873,6 +873,7 @@ watch([
   () => form.attribution_type, // 1 全网 2精准
   () => form.conversion_tracking_enabled //0 关闭 1开启
 ], (newValue, oldValue) => {
+  console.log('attribution_type & conversion_tracking_enabled newValue => ', newValue)
   if (newValue[0] == 2) {
     form.conversion_tracking_enabled = '0'
     scheduleBidInfo.conversion_tracking_enabled.data.list[1].disabled = true

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

@@ -173,9 +173,9 @@ export const FillBackData = ({ data, type, updateScene = {}, cb, ruleConfigObj,
         params['bid_site'] = data.bid_site
         params['bid_site_details'] = data.bid_site_details
         params['conversion_tracking_enabled'] = data.conversion_tracking_enabled
-        params['conversion_tracking_report_type'] = data.conversion_tracking_enabled == 1 ? data.conversion_tracking_report_type : ''
-        params['conversion_tracking_way'] = data.conversion_tracking_enabled == 1 ? data.conversion_tracking_way : ''
-        params['conversion_tracking_scene'] = data.conversion_tracking_enabled == 1 ? data.conversion_tracking_scene : ''
+        params['access_type'] = data.conversion_tracking_enabled == 1 ? data.access_type : ''
+        params['claim_type'] = data.conversion_tracking_enabled == 1 ? data.claim_type : ''
+        params['conversion_scene'] = data.conversion_tracking_enabled == 1 ? data.conversion_scene : ''
         params['auto_acquisition_enabled'] = data.auto_acquisition_enabled
         params['auto_acquisition_amount'] = data.auto_acquisition_amount
         params['optimization_goal'] = data.optimization_goal
@@ -345,7 +345,8 @@ export const FillBackData = ({ data, type, updateScene = {}, cb, ruleConfigObj,
     }
 
     /**S 对应展示文案 */
-    console.log('对应展示文案 data => ', data)
+    console.log('对应展示文案 data => ', JSON.parse(JSON.stringify(data)))
+    console.log('对应展示文案 params => ', JSON.parse(JSON.stringify(params)))
     copywriting.push(`营销目的：${data.marketing_goal == 'MARKETING_GOAL_PRODUCT_SALES' ? '商品销售' : ''}`)
     copywriting.push(`推广产品：${data.marketing_target_type == 'MARKETING_TARGET_TYPE_SHORT_DRAMA' ? '短剧' : ''}`)
     copywriting.push(`短剧售卖策略：${data.sell_strategy_enable == '1' ? (data.short_play_pay_type == 'SHORT_PLAY_PAY_TYPE_FREE_PLAY' ? '免费' : (data.short_play_pay_type == 'SHORT_PLAY_PAY_TYPE_CHARGE_PLAY' ? '付费' : '')) : '不开启'}`)
@@ -408,6 +409,17 @@ export const FillBackData = ({ data, type, updateScene = {}, cb, ruleConfigObj,
       }
       copywriting.push(`投放场景：${bid_scene_writ}`)
 
+
+      copywriting.push(`转化归因新链路：${data.conversion_tracking_enabled == 1 ? '开启' : '关闭'}`)
+      if (data.conversion_tracking_enabled == 1) {
+        copywriting.push(`上报方式：${scheduleBid.access_type.data.list.filter((v: any) => { return v.value == data.access_type })[0]?.label}`)
+        copywriting.push(`归因方式：${scheduleBid.claim_type.data.list.filter((v: any) => { return v.value == data.claim_type })[0]?.label}`)
+        if (data.access_type === 'ACCESS_TYPE_API') {
+          copywriting.push(`转化场景：${scheduleBid.conversion_scene.data.list.filter((v: any) => { return v.value == data.conversion_scene })[0]?.label}`)
+        }
+      }
+
+
       data.optimization_goal_name ? copywriting.push(`优化目标：${data.optimization_goal_name}`) : ''
       if (data.forward_link_assist_enabled == 1) {
         copywriting.push(`助攻行为：${data.forward_link_assist_name}`)

src/components/businessMoudle/batchGdt3/configArea/ts/mock.ts

@@ -3894,9 +3894,9 @@ export const mockEvent = () => {
         "bid_scene": "BID_SCENE_UNKNOWN",
         "bid_site": "0",
         "conversion_tracking_enabled": "0",
-        "conversion_tracking_report_type": "",
-        "conversion_tracking_way": "",
-        "conversion_tracking_scene": "",
+        "access_type": "",
+        "claim_type": "",
+        "conversion_scene": "",
         "auto_acquisition_enabled": "0",
         "optimization_goal": "OPTIMIZATIONGOAL_RESERVATION_CHECK",
         "forward_link_assist_enabled": "0",