增加dp参数

src/api/dataReport.ts

@@ -8,6 +8,8 @@ export interface PushDataReportRecord {
     type: number;
     sub_type: number;
     platform: number;
+    adId: string;
+    adzoneId: string;
     platform_name: string;
     distribution: number;
     req_count: number;

src/api/jd.ts

@@ -3,6 +3,7 @@ import type { ListRes, FormRes } from './base';
 
 export interface UpdateCookieModel {
     cookie: string;
+    union_cookies: string;
     user_agent: string;
     h5st: string;
 }
@@ -49,7 +50,7 @@ export interface JdPoolRecord {
     app_secret: string;
     user_agent: string;
     cookies: string;
-
+    union_cookies: string;
     time_range: number;
 }
 

src/views/jd/list.vue

@@ -163,6 +163,11 @@
                         </a-tag>
                     </span>
                 </template>
+                <template #tags="{ record }">
+                    <a-tag v-if="record.parse_type" size="small" bordered color="blue">
+                        {{ record.parse_type }}
+                    </a-tag>
+                </template>
                 <template #time="{ record }">
                     <div style="color:gray;">
                         <div>注册：{{ dayjs(record.create_time).format('MM-DD HH:mm') }}</div>
@@ -309,6 +314,11 @@ const columns = computed<TableColumnData[]>(() => [
         slotName: 'name',
         width: 250,
     },
+    {
+        title: '',
+        slotName: 'tags',
+        width: 40,
+    },
     {
         title: '工作时间',
         dataIndex: 'time_range',

src/views/jd/updateCookies.vue

@@ -8,9 +8,15 @@
                         :wrapper-col-props="{ span: 19 }">
                         <a-form-item field="cookie" :label="$t('taobao.cookies.label')" :rules="[{ required: true }]"
                             row-class="keep-margin">
-                            <a-textarea v-model="formData.cookie"  :auto-size="{ minRows: 10 }" class="cookie"
+                            <a-textarea v-model="formData.cookie" :auto-size="{ minRows: 10 }" class="cookie"
                                 :placeholder="$t('taobao.cookies.placeholder')" />
                         </a-form-item>
+                        <a-form-item field="cookie" label="联盟cookie" :rules="[{ required: true }]"
+                            row-class="keep-margin">
+                            <a-textarea v-model="formData.union_cookies" :auto-size="{ minRows: 10 }" class="cookie"
+                                placeholder="联盟cookie，用来查询收益和订单" />
+                        </a-form-item>
+
                         <a-form-item field="user_agent" label="User Agent" row-class="keep-margin">
                             <a-textarea v-model="formData.user_agent" auto-size placeholder="留空的话，忽略更新" />
                         </a-form-item>
@@ -47,6 +53,7 @@ const router = useRouter();
 const formRef = ref<FormInstance>();
 const formData = ref<UpdateCookieModel>({
     cookie: '',
+    union_cookies: '',
     user_agent: '',
     h5st: '',
 });

src/views/pdd/list.vue

@@ -129,6 +129,11 @@
                     <a-tag color="gray">{{ record.end_point }} - {{ record.nodeName }} </a-tag>
                 </template>
 
+                <template #tags="{ record }">
+                    <a-tag v-if="record.parse_type" size="small" bordered color="blue">
+                        {{ record.parse_type }}
+                    </a-tag>
+                </template>
                 <template #status="{ record }">
                     <a-tag v-if="record.status" bordered color="green" @click="changeStatus(record.id, false)">
                         <template #icon>
@@ -319,6 +324,11 @@ const columns = computed<TableColumnData[]>(() => [
         slotName: 'name',
         width: 250,
     },
+    {
+        title: '',
+        slotName: 'tags',
+        width: 40,
+    },
     {
         title: '工作时间',
         dataIndex: 'time_range',

src/views/site/pushReport.vue

@@ -167,6 +167,14 @@
                 <template #platform="{ record }">
                     {{ getPlatformNameById(record.platform) }}
                 </template>
+                <template #adId="{ record }">
+                    <div v-if="record.adId">
+                        广告Id:<a-tag color="blue" bordered> {{ record.adId }} </a-tag>
+                    </div>
+                    <div v-if="record.adzoneId">
+                        策略Id:<a-tag color="blue" bordered> {{ record.adzoneId }} </a-tag>
+                    </div>
+                </template>
                 <template #status="{ record }">
                     <div>
                         <a-tag :color="getStatusColor(record.status)" bordered>
@@ -381,6 +389,16 @@
                             </a-select>
                         </a-form-item>
                     </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="广告Id">
+                            <a-input v-model="editForm.adId" placeholder="请输入广告Id" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="分流id/策略id">
+                            <a-input v-model="editForm.adzoneId" placeholder="请输入分流id/策略id" />
+                        </a-form-item>
+                    </a-col>
                 </a-row>
             </a-form>
         </a-modal>
@@ -672,6 +690,11 @@ const columns = computed<TableColumnData[]>(() => [
         slotName: 'type',
         width: 150,
     },
+    {
+        title: 'adId/adzoneId',
+        slotName: 'adId',
+        width: 150,
+    },
     {
         title: '平台',
         slotName: 'platform',
@@ -762,8 +785,11 @@ const fetchData = async (
         if (tryPreviousDay && data.list.length === 0 && !params.type && params.report_date === dayjs().format('YYYY-MM-DD')) {
             const prevDay = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
             formModel.value.report_date = prevDay;
+            // 重置分页到第一页
+            pagination.current = 1;
             fetchData({
                 ...params,
+                current: 1,
                 report_date: prevDay
             }, false);
             Message.info(`当天无数据，已自动加载 ${prevDay} 的数据`);
@@ -796,14 +822,14 @@ const onPageChange = (current: number) => {
 
     fetchData({
         ...basePagination,
+        ...formModel.value,
         current,
         type: formModel.value.type ? Number(formModel.value.type) : undefined,
         platform: formModel.value.platform ? Number(formModel.value.platform) : undefined,
         status: statusNumber,
         is_settlement: isSettlementValue,
-        report_date: formModel.value.report_date,
         getTotal: true,
-    });
+    } as PushDataReportParams);
 };
 
 const visible = ref(false);
@@ -829,6 +855,8 @@ const editForm = ref<Partial<PushDataReportRecord>>({
     gmv: 0,
     income: 0,
     request_id: '',
+    adId: '',
+    adzoneId: '',
 });
 
 const onEdit = (current: PushDataReportRecord) => {
@@ -871,6 +899,8 @@ const onEdit = (current: PushDataReportRecord) => {
         request_id: current.request_id || '',
         status: ensureNumber(current.status),
         last_push_time: current.last_push_time,
+        adId: current.adId,
+        adzoneId: current.adzoneId,
     };
 
     // 确保子场景与投放场景匹配
@@ -922,6 +952,8 @@ const onAdd = () => {
         gmv: 0,
         income: 0,
         request_id: '',
+        adId: '',
+        adzoneId: '',
     };
     visible.value = true;
 };

src/views/taobao/list.vue

@@ -125,7 +125,8 @@
                 </template>
 
                 <template #nodeName="{ record }">
-                    <a-tag color="gray" @click="changePublicIp(record.nodeName)">{{ record.end_point }} - {{ record.nodeName }} </a-tag>
+                    <a-tag color="gray" @click="changePublicIp(record.nodeName)">{{ record.end_point }} - {{
+                        record.nodeName }} </a-tag>
                 </template>
 
                 <template #suspended_endpoint="{ record }">
@@ -145,6 +146,10 @@
                     <a-typography-text mark v-if="record.note">
                         {{ record.note }}
                     </a-typography-text>
+                    <a-tag v-if="record.parse_type" size="small" bordered color="blue">
+                        {{ record.parse_type }}
+                    </a-tag>
+
                 </template>
                 <template #status="{ record }">
                     <a-tag v-if="record.status" bordered color="green" @click="changeStatus(record, false)">
@@ -577,7 +582,7 @@ const changePublicIp = async (nodeName: string) => {
         cancelText: '取消',
         async onOk() {
             setLoading(true);
-            
+
             try {
                 const { data } = await changePublicIpByName(nodeName);
                 console.log(data);
@@ -728,7 +733,3 @@ export default {
     background-color: var(--color-warning-light-2) !important;
 }
 </style>
-
-
-
-