Merge branch 'master' of qk:zhuishuyun/precise_delivery_distribution_front

src/components/tool-bar/index.vue

@@ -15,7 +15,7 @@
         </template>
         查询
       </a-button>
-      <a-button type="primary" @click="reset" style="margin-left:10px">
+      <a-button type="primary" @click="reset" style="margin-left: 10px">
         <template #icon>
           <reload-outlined />
         </template>
@@ -28,13 +28,13 @@
 
 <script lang="ts">
 import { defineComponent, PropType, ref, watch, watchEffect } from "vue";
-import { SearchOutlined,ReloadOutlined } from "@ant-design/icons-vue";
+import { SearchOutlined, ReloadOutlined } from "@ant-design/icons-vue";
 
 // TODO 可以考虑之后通过json生成
 const ToolBar = defineComponent({
   components: {
     SearchOutlined,
-    ReloadOutlined
+    ReloadOutlined,
   },
   props: {
     text: {
@@ -63,8 +63,8 @@ const ToolBar = defineComponent({
     props.text.forEach((field) => {
       fields.value[field] = "";
     });
-    for(let v in props.defaultVal){
-      fields.value[v] = props.defaultVal[v]
+    for (let v in props.defaultVal) {
+      fields.value[v] = props.defaultVal[v];
     }
     watchEffect(() => (loading.value = props.loading));
     const onConfirm = () => {
@@ -75,12 +75,12 @@ const ToolBar = defineComponent({
         loading.value = false;
       }, 2000);
     };
-    const reset = () =>{
+    const reset = () => {
       props.text.forEach((field) => {
-      fields.value[field] = "";
-    });
-    }
-    return { fields, showPickerSlots, loading, onConfirm,reset };
+        fields.value[field] = "";
+      });
+    };
+    return { fields, showPickerSlots, loading, onConfirm, reset };
   },
 });
 
@@ -95,7 +95,7 @@ export default ToolBar;
   margin-bottom: 10px;
 
   .tool-bar-item {
-    width: 22%;
+    width: 26%;
     font-size: 14px;
     color: #333;
     box-sizing: border-box;
@@ -110,7 +110,7 @@ export default ToolBar;
       width: 30%;
     }
   }
-  .ant-btn{
+  .ant-btn {
     margin-right: 10px;
   }
 }

src/views/_pageOptions/table-put.ts

@@ -59,17 +59,17 @@ export const TableColumnOfPutAdAccount = [
     ellipsis: true,
     slots: { customRender: "advertiserName" },
   },
+  // {
+  //   title: "广告主邮箱",
+  //   dataIndex: "account_name",
+  //   key: "account_name",
+  //   ellipsis: true,
+  // },
   {
-    title: "广告主邮箱",
+    title: "所属账户",
     dataIndex: "email",
     key: "email",
     ellipsis: true,
-  },
-  {
-    title: "所属账户",
-    dataIndex: "account_name",
-    key: "account_name",
-    ellipsis: true,
     slots: { customRender: "account" },
   },
   {
@@ -673,7 +673,7 @@ export const AdgroupCloumn: Array<colunm> = [
     },
   },
   {
-    title: "组预算",
+    title: "组预算（元）",
     dataIndex: "budget",
     width: 100,
     slots: {
@@ -681,7 +681,7 @@ export const AdgroupCloumn: Array<colunm> = [
     },
   },
   {
-    title: "消耗",
+    title: "消耗（元）",
     dataIndex: "cost",
     width: 100,
   },
@@ -692,175 +692,177 @@ export const AdgroupCloumn: Array<colunm> = [
     width: 80,
   },
   {
-    title: "点击率",
-    dataIndex: "ctr",
-    width: 80,
-  },
-  {
     title: "点击量",
     dataIndex: "click",
     width: 80,
   },
-  {
-    title: "平均点击单价",
-    dataIndex: "avg_click_cost",
-    width: 80,
-  },
-  {
-    title: "平均千次展现费用",
-    dataIndex: "avg_show_cost",
-    width: 80,
-  },
-  {
-    title: "转化数",
-    dataIndex: "convert",
-    width: 80,
-  },
-  {
-    title: "转化成本",
-    dataIndex: "convert_cost",
-    width: 80,
-  },
-  {
-    title: "转化率",
-    dataIndex: "convert_rate",
-    width: 80,
-  },
-  {
-    title: "注册用户数",
-    dataIndex: "register_num",
-    width: 80,
-  },
-  {
-    title: "充值人数",
-    dataIndex: "paid_user_num",
-    width: 80,
-  },
-  {
-    title: "充值金额",
-    dataIndex: "paid_order_num",
-    width: 80,
-  },
-  {
-    title: "付费用户成本",
-    dataIndex: "paid_user_cost",
-    width: 80,
-  },
-  {
-    title: "订单数（小额)",
-    dataIndex: "bellow_thirty_paid_order_num",
-    width: 80,
-  },
-  {
-    title: "订单数（包年)",
-    dataIndex: "year_paid_order_num",
-    width: 80,
-  },
-  {
-    title: "付费率",
-    dataIndex: "paid_user_rate",
-    width: 80,
-  },
-  {
-    title: "回本率",
-    dataIndex: "back_rate",
-    width: 80,
-  },
-  {
-    title: "复充人数（小额)",
-    dataIndex: "bellow_thirty_mult_paid_user_num",
-    width: 80,
-  },
-  {
-    title: "充值人数（小额)",
-    dataIndex: "bellow_thirty_paid_user_num",
-    width: 80,
-  },
+  //
+  // {
+  //   title: "点击率",
+  //   dataIndex: "ctr",
+  //   width: 80,
+  // },
+  // {
+  //   title: "平均点击单价",
+  //   dataIndex: "avg_click_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "平均千次展现费用",
+  //   dataIndex: "avg_show_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "转化数",
+  //   dataIndex: "convert",
+  //   width: 80,
+  // },
+  // {
+  //   title: "转化成本",
+  //   dataIndex: "convert_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "转化率",
+  //   dataIndex: "convert_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "注册用户数",
+  //   dataIndex: "register_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值人数",
+  //   dataIndex: "paid_user_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值金额",
+  //   dataIndex: "paid_order_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "付费用户成本",
+  //   dataIndex: "paid_user_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "订单数（小额)",
+  //   dataIndex: "bellow_thirty_paid_order_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "订单数（包年)",
+  //   dataIndex: "year_paid_order_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "付费率",
+  //   dataIndex: "paid_user_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "回本率",
+  //   dataIndex: "back_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "复充人数（小额)",
+  //   dataIndex: "bellow_thirty_mult_paid_user_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值人数（小额)",
+  //   dataIndex: "bellow_thirty_paid_user_num",
+  //   width: 80,
+  // },
 
-  {
-    title: "充值金额（小额)",
-    dataIndex: "bellow_thirty_paid_order_amount",
-    width: 80,
-  },
-  {
-    title: "复充人数（包年)",
-    dataIndex: "year_mult_paid_user_num",
-    width: 80,
-  },
+  // {
+  //   title: "充值金额（小额)",
+  //   dataIndex: "bellow_thirty_paid_order_amount",
+  //   width: 80,
+  // },
+  // {
+  //   title: "复充人数（包年)",
+  //   dataIndex: "year_mult_paid_user_num",
+  //   width: 80,
+  // },
 
-  {
-    title: "充值金额（包年)",
-    dataIndex: "year_paid_order_amount",
-    width: 80,
-  },
-  {
-    title: "充值人数（包年)",
-    dataIndex: "year_paid_user_num",
-    width: 80,
-  },
-  {
-    title: "注册用户成本",
-    dataIndex: "register_user_cost",
-    width: 80,
-  },
-  {
-    title: "充值金额（非小额非包年）",
-    dataIndex: "over_thirty_not_year_paid_order_amount",
-    width: 80,
-  },
-  {
-    title: "回本率（非小额非包年",
-    dataIndex: "over_thirty_not_year_back_rate",
-    width: 80,
-  },
-  {
-    title: "回本率（非包年",
-    dataIndex: "not_year_back_rate",
-    width: 80,
-  },
+  // {
+  //   title: "充值金额（包年)",
+  //   dataIndex: "year_paid_order_amount",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值人数（包年)",
+  //   dataIndex: "year_paid_user_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "注册用户成本",
+  //   dataIndex: "register_user_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值金额（非小额非包年）",
+  //   dataIndex: "over_thirty_not_year_paid_order_amount",
+  //   width: 80,
+  // },
+  // {
+  //   title: "回本率（非小额非包年",
+  //   dataIndex: "over_thirty_not_year_back_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "回本率（非包年",
+  //   dataIndex: "not_year_back_rate",
+  //   width: 80,
+  // },
 
-  {
-    title: "点赞",
-    dataIndex: "like",
-    width: 80,
-  },
-  {
-    title: "播完率",
-    dataIndex: "play_over_rate",
-    width: 80,
-  },
-  {
-    title: "激活数",
-    dataIndex: "active",
-    width: 80,
-  },
-  {
-    title: "播放数",
-    dataIndex: "total_play",
-    width: 80,
-  },
-  {
-    title: "播完数",
-    dataIndex: "play_100_feed_break",
-    width: 80,
-  },
-  {
-    title: "注册数（头条）",
-    dataIndex: "register",
-    width: 80,
-  },
+  // {
+  //   title: "点赞",
+  //   dataIndex: "like",
+  //   width: 80,
+  // },
+  // {
+  //   title: "播完率",
+  //   dataIndex: "play_over_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "激活数",
+  //   dataIndex: "active",
+  //   width: 80,
+  // },
+  // {
+  //   title: "播放数",
+  //   dataIndex: "total_play",
+  //   width: 80,
+  // },
+  // {
+  //   title: "播完数",
+  //   dataIndex: "play_100_feed_break",
+  //   width: 80,
+  // },
+  // {
+  //   title: "注册数（头条）",
+  //   dataIndex: "register",
+  //   width: 80,
+  // },
 ];
 
 export const AdCoundCloumn: Array<colunm> = [
   {
     title: "账户信息",
     dataIndex: "campaign_name",
-    width: 200,
+    width: 240,
+    fixed: 'left',
     children: [
       {
-        title: "总计",
+        title: "合计",
         dataIndex: "campaign_name",
-        width: 200,
+        width: 160,
         slots: {
           customRender: "info",
         },
@@ -868,28 +870,28 @@ export const AdCoundCloumn: Array<colunm> = [
     ],
   },
   {
-    title: "账户余额",
-    dataIndex: "balance",
-    width: 100,
-  },
-  {
     title: "账户预算(最低1000元)",
     dataIndex: "firle",
-    width: 200,
+    width: 110,
     slots: {
       customRender: "budget",
     },
   },
   {
-    title: "回传最小金额",
-    dataIndex: "back_min_price",
-    width: 130,
-    slots: {
-      customRender: "operte",
-    },
+    title: "账户余额（元）",
+    dataIndex: "balance",
+    width: 100,
   },
+  // {
+  //   title: "回传最小金额",
+  //   dataIndex: "back_min_price",
+  //   width: 130,
+  //   slots: {
+  //     customRender: "operte",
+  //   },
+  // },
   {
-    title: "消耗",
+    title: "消耗（元）",
     dataIndex: "cost",
     width: 100,
   },
@@ -900,163 +902,163 @@ export const AdCoundCloumn: Array<colunm> = [
     width: 80,
   },
   {
-    title: "点击率",
-    dataIndex: "ctr",
-    width: 80,
-  },
-  {
     title: "点击量",
     dataIndex: "click",
     width: 80,
   },
   {
-    title: "平均点击单价",
-    dataIndex: "avg_click_cost",
-    width: 80,
-  },
-  {
-    title: "平均千次展现费用",
-    dataIndex: "avg_show_cost",
-    width: 80,
-  },
-  {
-    title: "转化数",
-    dataIndex: "convert",
-    width: 80,
-  },
-  {
-    title: "转化成本",
-    dataIndex: "convert_cost",
-    width: 80,
-  },
-  {
-    title: "转化率",
-    dataIndex: "convert_rate",
-    width: 80,
-  },
-  {
-    title: "注册用户数",
-    dataIndex: "register_num",
-    width: 80,
-  },
-  {
-    title: "充值人数",
-    dataIndex: "paid_user_num",
-    width: 80,
-  },
-  {
-    title: "充值金额",
-    dataIndex: "paid_order_num",
-    width: 80,
-  },
-  {
-    title: "付费用户成本",
-    dataIndex: "paid_user_cost",
-    width: 80,
-  },
-  {
-    title: "订单数（小额)",
-    dataIndex: "bellow_thirty_paid_order_num",
-    width: 80,
-  },
-  {
-    title: "订单数（包年)",
-    dataIndex: "year_paid_order_num",
-    width: 80,
-  },
-  {
-    title: "付费率",
-    dataIndex: "paid_user_rate",
-    width: 80,
-  },
-  {
-    title: "回本率",
-    dataIndex: "back_rate",
-    width: 80,
-  },
-  {
-    title: "复充人数（小额)",
-    dataIndex: "bellow_thirty_mult_paid_user_num",
+    title: "点击率（%）",
+    dataIndex: "ctr",
     width: 80,
   },
   {
-    title: "充值人数（小额)",
-    dataIndex: "bellow_thirty_paid_user_num",
+    title: "平均点击单价（元）",
+    dataIndex: "avg_click_cost",
     width: 80,
   },
+  // {
+  //   title: "平均千次展现费用",
+  //   dataIndex: "avg_show_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "转化数",
+  //   dataIndex: "convert",
+  //   width: 80,
+  // },
+  // {
+  //   title: "转化成本",
+  //   dataIndex: "convert_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "转化率",
+  //   dataIndex: "convert_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "注册用户数",
+  //   dataIndex: "register_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值人数",
+  //   dataIndex: "paid_user_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值金额",
+  //   dataIndex: "paid_order_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "付费用户成本",
+  //   dataIndex: "paid_user_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "订单数（小额)",
+  //   dataIndex: "bellow_thirty_paid_order_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "订单数（包年)",
+  //   dataIndex: "year_paid_order_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "付费率",
+  //   dataIndex: "paid_user_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "回本率",
+  //   dataIndex: "back_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "复充人数（小额)",
+  //   dataIndex: "bellow_thirty_mult_paid_user_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值人数（小额)",
+  //   dataIndex: "bellow_thirty_paid_user_num",
+  //   width: 80,
+  // },
 
-  {
-    title: "充值金额（小额)",
-    dataIndex: "bellow_thirty_paid_order_amount",
-    width: 80,
-  },
-  {
-    title: "复充人数（包年)",
-    dataIndex: "year_mult_paid_user_num",
-    width: 80,
-  },
+  // {
+  //   title: "充值金额（小额)",
+  //   dataIndex: "bellow_thirty_paid_order_amount",
+  //   width: 80,
+  // },
+  // {
+  //   title: "复充人数（包年)",
+  //   dataIndex: "year_mult_paid_user_num",
+  //   width: 80,
+  // },
 
-  {
-    title: "充值金额（包年)",
-    dataIndex: "year_paid_order_amount",
-    width: 80,
-  },
-  {
-    title: "充值人数（包年)",
-    dataIndex: "year_paid_user_num",
-    width: 80,
-  },
-  {
-    title: "注册用户成本",
-    dataIndex: "register_user_cost",
-    width: 80,
-  },
-  {
-    title: "充值金额（非小额非包年）",
-    dataIndex: "over_thirty_not_year_paid_order_amount",
-    width: 80,
-  },
-  {
-    title: "回本率（非小额非包年",
-    dataIndex: "over_thirty_not_year_back_rate",
-    width: 80,
-  },
-  {
-    title: "回本率（非包年",
-    dataIndex: "not_year_back_rate",
-    width: 80,
-  },
+  // {
+  //   title: "充值金额（包年)",
+  //   dataIndex: "year_paid_order_amount",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值人数（包年)",
+  //   dataIndex: "year_paid_user_num",
+  //   width: 80,
+  // },
+  // {
+  //   title: "注册用户成本",
+  //   dataIndex: "register_user_cost",
+  //   width: 80,
+  // },
+  // {
+  //   title: "充值金额（非小额非包年）",
+  //   dataIndex: "over_thirty_not_year_paid_order_amount",
+  //   width: 80,
+  // },
+  // {
+  //   title: "回本率（非小额非包年",
+  //   dataIndex: "over_thirty_not_year_back_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "回本率（非包年",
+  //   dataIndex: "not_year_back_rate",
+  //   width: 80,
+  // },
 
-  {
-    title: "点赞",
-    dataIndex: "like",
-    width: 80,
-  },
-  {
-    title: "播完率",
-    dataIndex: "play_over_rate",
-    width: 80,
-  },
-  {
-    title: "激活数",
-    dataIndex: "active",
-    width: 80,
-  },
-  {
-    title: "播放数",
-    dataIndex: "total_play",
-    width: 80,
-  },
-  {
-    title: "播完数",
-    dataIndex: "play_100_feed_break",
-    width: 80,
-  },
-  {
-    title: "注册数（头条）",
-    dataIndex: "register",
-    width: 80,
-  },
+  // {
+  //   title: "点赞",
+  //   dataIndex: "like",
+  //   width: 80,
+  // },
+  // {
+  //   title: "播完率",
+  //   dataIndex: "play_over_rate",
+  //   width: 80,
+  // },
+  // {
+  //   title: "激活数",
+  //   dataIndex: "active",
+  //   width: 80,
+  // },
+  // {
+  //   title: "播放数",
+  //   dataIndex: "total_play",
+  //   width: 80,
+  // },
+  // {
+  //   title: "播完数",
+  //   dataIndex: "play_100_feed_break",
+  //   width: 80,
+  // },
+  // {
+  //   title: "注册数（头条）",
+  //   dataIndex: "register",
+  //   width: 80,
+  // },
 ];
 
 export const landingCloumn: Array<colunm> = [

src/views/put/ad-countdata.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="page-wrap page-wrap-put-books">
     <tool-bar
-      :text="['advertiser_id', 'account_id']"
-      :label="['广告主/ID', '账户/ID']"
+      :text="['account_id']"
+      :label="['账户名称/ID']"
       v-model:loading="inSearching"
       @confirm="onSearch"
     >
@@ -47,16 +47,22 @@
         @change="handleTableChange"
         rowKey="id"
       >
-        <template #info="{ text, record }">
-          <p @click="goAdlgroup(record.advertiser_id)" class="small-font single-line">
+        <template #info="{ record }">
+          <p
+            @click="goAdlgroup(record.advertiser_id)"
+            class="small-font single-line"
+          >
             <a href="javascript:;">{{ record.advertiser_name }}</a>
           </p>
-          <p @click="goAdlgroup(record.advertiser_id)"  class="small-font single-line">
+          <p
+            @click="goAdlgroup(record.advertiser_id)"
+            class="small-font single-line"
+          >
             <a href="javascript:;">广告主ID：{{ record.advertiser_id }}</a>
           </p>
         </template>
 
-        <template #budget="{ text, record }">
+        <template #budget="{ record }">
           <editable-cell
             :text="
               record.budget_mode == 'BUDGET_MODE_INFINITE'
@@ -90,7 +96,7 @@ import {
   toRefs,
   ref,
   onMounted,
-  computed
+  computed,
 } from "vue";
 import { picker } from "@/helper/config/range";
 import ToolBar from "@/components/tool-bar/index.vue";
@@ -103,7 +109,7 @@ import {
   setGroupStatus,
   setGroupDay,
   ALLAcountGroupData,
-  setBackMinimum
+  setBackMinimum,
 } from "@/api";
 import usePagination from "@/hooks/usePagination";
 import EditableCell from "@/components/edit-cell/index.vue";
@@ -113,7 +119,7 @@ import useAuthUser from "@/hooks/composable/useAuthUser";
 const Adgroup = defineComponent({
   components: {
     ToolBar,
-    EditableCell
+    EditableCell,
   },
   setup() {
     let { loading, meta, tablePageOptions } = usePagination();
@@ -132,7 +138,7 @@ const Adgroup = defineComponent({
         store.getters.selectTime.length > 0
           ? [
               moment(store.getters.selectTime[0]),
-              moment(store.getters.selectTime[1])
+              moment(store.getters.selectTime[1]),
             ]
           : [moment().subtract(30, "d"), moment()]
       ),
@@ -145,7 +151,7 @@ const Adgroup = defineComponent({
       convert_cost_order: 0,
       balance_order: 0,
       showTable: false,
-      scrollY: 600
+      scrollY: 600,
     });
 
     const onSearch = (fields: Record<string, string>) => {
@@ -174,14 +180,14 @@ const Adgroup = defineComponent({
             end_date,
             advertiser_id: query?.advertiser_id,
             account_id: query?.account_id,
-            page: query?.current ?? 1
+            page: query?.current ?? 1,
           },
           {
             cost_order: state.cost_order,
             convert_order: state.convert_order,
             convert_cost_order: state.convert_cost_order,
             balance_order: state.balance_order,
-            uids: state.uids.toString()
+            uids: state.uids.toString(),
           }
         );
         const { data } = await getAdgroupData(datas);
@@ -200,8 +206,8 @@ const Adgroup = defineComponent({
                 width: r.width,
                 ellipsis: true,
                 sorter: sortList.includes(r.dataIndex) ? true : false,
-                sortDirections: ["descend", "ascend", false]
-              }
+                sortDirections: ["descend", "ascend", false],
+              },
             ];
           }
           return r;
@@ -271,7 +277,7 @@ const Adgroup = defineComponent({
       onSearch,
       handleTableChange,
       goAdlgroup,
-      changeTime
+      changeTime,
     };
   },
   mounted() {
@@ -288,7 +294,7 @@ const Adgroup = defineComponent({
           advertiser_id: record.advertiser_id,
           budget_mode:
             value == "不限" ? "BUDGET_MODE_INFINITE" : "BUDGET_MODE_DAY",
-          budget: value == "不限" ? "0" : Number(value)
+          budget: value == "不限" ? "0" : Number(value),
         };
         setGroupDay(data).then((res) => {
           this.$message.success("修改成功！");
@@ -296,14 +302,14 @@ const Adgroup = defineComponent({
       } else {
         let data = {
           advertiser_id: record.advertiser_id,
-          back_min_price: value
+          back_min_price: value,
         };
         setBackMinimum(data).then((res) => {
           this.$message.success("修改成功！");
         });
       }
-    }
-  }
+    },
+  },
 });
 
 export default Adgroup;

src/views/put/ad-group.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="page-wrap page-wrap-put-books">
     <tool-bar
-      :text="['advertiser_id', 'campaign_id']"
-      :label="['广告主名称/ID', '广告组名称/ID']"
+      :text="[ 'campaign_id','account_id',]"
+      :label="[ '广告组名称/ID','所属账户名称/ID',]"
       :defaultVal="defaultToolvalue"
       v-model:loading="inSearching"
       @confirm="onSearch"
@@ -175,14 +175,14 @@ const Adgroup = defineComponent({
     }
 
     const onSearch = (fields: Record<string, string>) => {
-      const { advertiser_id, campaign_id } = fields;
+      const { account_id, campaign_id } = fields;
       state.fields = fields;
-      getData({ current: 1, advertiser_id, campaign_id });
+      getData({ current: 1, account_id, campaign_id });
     };
 
     const getData = async (query?: {
       current: number;
-      advertiser_id?: any;
+      account_id?: any;
       campaign_id?: string;
     }) => {
       try {
@@ -199,7 +199,7 @@ const Adgroup = defineComponent({
           {
             begin_date,
             end_date,
-            advertiser_id: query?.advertiser_id,
+            account_id: query?.account_id,
             campaign_id: query?.campaign_id,
             page: query?.current ?? 1,
           },
@@ -320,7 +320,7 @@ const Adgroup = defineComponent({
     };
     onMounted(() => {
       getData({
-        advertiser_id: route.query?.advertiser_id ?? "",
+        account_id: route.query?.account_id ?? "",
         current: 1,
       });
     });

src/views/put/put-ad-account.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="page-wrap page-wrap-put-books">
     <tool-bar
-      :text="['account_name', 'email']"
-      :label="['广告主名称', '广告主邮箱']"
+      :text="['advertiser_id', 'email']"
+      :label="['广告主名称/ID', '广告主邮箱']"
       v-model:loading="inSearching"
       @confirm="onSearch"
     >
-      <template #exbutton style="width: 800px"
+      <template #exbutton
         ><a-button type="primary" @click="handleClick" class="ml-10">
           授权
         </a-button>
@@ -36,7 +36,7 @@
         </p>
       </template>
       <template #account="{ record }">
-        <p>{{ record.account_name }}</p>
+        <p>{{ record.email }}</p>
         <p style="color: gray; font-size: 12px">ID:{{ record.account_id }}</p>
       </template>
     </a-table>