RING:FIX

src/api/index.ts

@@ -353,6 +353,7 @@ export const getAdgroupList = (
     advertiser_id: string;
     account_id: string;
     campaign_id: string;
+    is_enable: any;
     begin_date: string;
     end_date: string;
     page: number;

src/views/_pageOptions/table-put.ts

@@ -696,160 +696,159 @@ export const AdgroupCloumn: Array<colunm> = [
     dataIndex: "click",
     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: "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> = [
@@ -916,149 +915,149 @@ export const AdCoundCloumn: Array<colunm> = [
     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: "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,7 +1,7 @@
 <template>
   <div class="page-wrap page-wrap-put-books">
     <tool-bar
-      :text="['account_id']"
+      :text="['advertiser_id']"
       :label="['账户名称/ID']"
       v-model:loading="inSearching"
       @confirm="onSearch"

src/views/put/ad-group.vue

@@ -1,12 +1,19 @@
 <template>
   <div class="page-wrap page-wrap-put-books">
     <tool-bar
-      :text="[ 'campaign_id','account_id',]"
-      :label="[ '广告组名称/ID','所属账户名称/ID',]"
+      :text="['campaign_id', 'account_id']"
+      :label="['广告组名称/ID', '账户信息']"
       :defaultVal="defaultToolvalue"
       v-model:loading="inSearching"
       @confirm="onSearch"
     >
+      <div class="tool-bar-item">
+        <p class="label">广告组状态</p>
+        <a-select class="full-width" v-model:value="is_enable" allowClear>
+          <a-select-option :value="1">启用</a-select-option>
+          <a-select-option :value="0">不启用</a-select-option></a-select
+        >
+      </div>
       <template #picker>
         <p class="label">日期</p>
         <a-range-picker
@@ -61,7 +68,9 @@
         </template>
         <template #advertiser="{ record }">
           <p>
-            <span style="font-size:13px;color:gray">{{ record.advertiser_name }} </span>
+            <span style="font-size: 13px; color: gray"
+              >{{ record.advertiser_name }}
+            </span>
             <span style="display: block; color: gray; font-size: 12px"
               >ID:{{ record.advertiser_id }}</span
             >
@@ -138,6 +147,7 @@ const Adgroup = defineComponent({
     const { router, route, store } = useApp();
 
     const state = reactive({
+      is_enable: '',
       inSearching: false,
       visibleChange: false,
       open: false,
@@ -177,13 +187,19 @@ const Adgroup = defineComponent({
     const onSearch = (fields: Record<string, string>) => {
       const { account_id, campaign_id } = fields;
       state.fields = fields;
-      getData({ current: 1, account_id, campaign_id });
+      getData({
+        current: 1,
+        account_id,
+        campaign_id,
+        is_enable: state.is_enable,
+      });
     };
 
     const getData = async (query?: {
       current: number;
       account_id?: any;
       campaign_id?: string;
+      is_enable?: any;
     }) => {
       try {
         state.tableLoading = true;
@@ -201,6 +217,7 @@ const Adgroup = defineComponent({
             end_date,
             account_id: query?.account_id,
             campaign_id: query?.campaign_id,
+            is_enable: query?.is_enable,
             page: query?.current ?? 1,
           },
           {