Przeglądaj źródła

调整联盟推广订单UI

dodo hold 2 lat temu
rodzic
commit
34b95c646e
2 zmienionych plików z 40 dodań i 19 usunięć
  1. 1 0
      src/api/taobao.ts
  2. 39 19
      src/views/taobao/orders.vue

+ 1 - 0
src/api/taobao.ts

@@ -291,6 +291,7 @@ export interface TkOrdersParams extends Partial<TkOrderRecord> {
     query_date?: string[]; // 覆盖 report_date 的类型为字符串数组
     current: number;
     pageSize: number;
+    maxTotal: number;
     sort?: string;
     order?: string;
 }

+ 39 - 19
src/views/taobao/orders.vue

@@ -6,7 +6,7 @@
                 <a-col :flex="1">
                     <a-form :model="formModel" :label-col-props="{ span: 8 }" :wrapper-col-props="{ span: 16 }"
                         label-align="left">
-                        <a-row :gutter="18">
+                        <a-row :gutter="24">
                             <a-col :span="6">
                                 <a-form-item field="name" label="账号名">
                                     <selectAccount v-model="formModel.keyword" @change="changeCompany" />
@@ -29,6 +29,17 @@
                                         @change="changeDate" />
                                 </a-form-item>
                             </a-col>
+                            <a-col :span="6">
+                                <a-form-item field="maxTotal" label="最大记录">
+                                    <a-select v-model="formModel.maxTotal">
+                                        <a-option :value="1000">1000</a-option>
+                                        <a-option :value="10000">10000</a-option>
+                                        <a-option :value="100000">10W</a-option>
+                                        <a-option :value="1000000">100W</a-option>
+                                        <a-option :value="10000000">1000W</a-option>
+                                    </a-select>
+                                </a-form-item>
+                            </a-col>
                         </a-row>
                     </a-form>
                 </a-col>
@@ -122,20 +133,29 @@
                             </template>
                             <template #description>
                                 <div class="text-3">
-                                    <div>店铺名:{{ record.sellerShopTitle }}</div>
-                                    <div>父订单编号:{{ record.tradeParentId }}</div>
-                                    <div> 子订单编号:{{ record.tradeId }}</div>
-
-                                    <a-row>
-                                        <a-col :span="12">付款金额: ¥{{ record.alipayTotalPrice }}</a-col>
-                                        <a-col :span="12">{{ record.tbPaidTime }}付款</a-col>
-                                    </a-row>
+                                    <div>店铺名:{{ record.sellerShopTitle }}
+                                        <a-tooltip>
+                                            <a-tag>{{ record.tradeId }}</a-tag>
+                                            <template #content>
+                                                <div>父订单编号:{{ record.tradeParentId }}</div>
+                                                <div> 子订单编号:{{ record.tradeId }}</div>
+                                            </template>
+                                        </a-tooltip>
+                                    </div>
+                                    <div> {{ record.tbPaidTime }}付款 </div>
+                                    <div v-if="record.tkEarningTime != '0001-01-01 00:00:00'">
+                                        {{ record.tkEarningTime }}结算
+                                    </div>
                                 </div>
                             </template>
                         </a-list-item-meta>
                     </a-list-item>
 
                 </template>
+                <template #alipayTotalPrice="{ record }">
+                    <span>¥{{ record.alipayTotalPrice }}</span>
+                </template>
+
                 <template #tkTotalRateForCommissionAndSdy="{ record }">
                     {{ record.tkTotalRateForCommissionAndSdy }}%
                 </template>
@@ -155,10 +175,6 @@
                     </div>
                 </template>
 
-                <template #subsidyType="{ record }">
-                    <div>身份:{{ record.tkOrderRoleText }}</div>
-                    <div>产品类型:{{ record.flowSource }}</div>
-                </template>
                 <template #alimamaShareFee="{ record }">
                     <div>¥{{ record.alimamaShareFee }}</div>
                 </template>
@@ -203,9 +219,11 @@ const generateFormModel = () => {
     return {
         keyword: '',
         tkStatus: 0,
+        formModel: 1000,
         query_date: [],
         current: 1,
         pageSize: 20,
+        maxTotal: 1000,
         sort: 'tkPaidTime',
         order: 'descending',
     };
@@ -268,6 +286,13 @@ const columns = computed<TableColumnData[]>(() => [
         width: 120,
     },
 
+    {
+        title: '订单金额',
+        slotName: 'alipayTotalPrice',
+        width: 100,
+        align: 'right'
+    },
+
     {
         title: '总提成率',
         dataIndex: 'tkTotalRateForCommissionAndSdy',
@@ -289,12 +314,6 @@ const columns = computed<TableColumnData[]>(() => [
         width: 220,
         align: 'right'
     },
-    {
-        title: '推广者',
-        dataIndex: 'subsidyType',
-        slotName: 'subsidyType',
-        width: 150,
-    },
     {
         title: '平台技术服务费',
         dataIndex: 'alimamaShareFee',
@@ -317,6 +336,7 @@ const fetchData = async (
     params: TkOrdersParams = {
         current: 1,
         pageSize: 20,
+        maxTotal: 1000,
         sort: 'tkPaidTime',
         order: 'descending',
     }