京东转链增加地区控制；

调整展现维权订单的统计数据；

src/api/taobao.ts

@@ -9,6 +9,7 @@ export interface UpdateConfigModel {
     jdIgnorePercentage: number;
     pass_salt: string;
     ignorePercentageCity: string;
+    jdIgnorePercentageCity: string;
     fake_click_min: number;
     fake_click_max: number;
     fake_click_ttl: number;

src/views/settings/config.vue

@@ -28,6 +28,10 @@
                                 <a-input v-model="formData.ignorePercentageCity" />
                             </a-form-item>
 
+                            <a-form-item field="jdIgnorePercentageCity" label="JD流量控制-城市" :rules="[{ required: true }]">
+                                <a-input v-model="formData.jdIgnorePercentageCity" />
+                            </a-form-item>
+
                             <a-form-item field="fake_click_min" label="补点击次数" :rules="[{ required: true }]">
                                 <a-input-number v-model="formData.fake_click_min" :min="0" /> -
                                 <a-input-number v-model="formData.fake_click_max" :min="0" />
@@ -122,6 +126,7 @@ const formData = ref<UpdateConfigModel>({
     jdIgnorePercentage: 0,
     pass_salt: '',
     ignorePercentageCity: '',
+    jdIgnorePercentageCity: '',
     fake_click_min: 0,
     fake_click_max: 0,
     fake_click_ttl: 0,

src/views/taobao/list.vue

@@ -188,22 +188,21 @@
                     </a-tag>
                 </template>
                 <template #time="{ record }">
-                    <div>{{ record.create_time }}</div>
-                    <div>{{ record.last_time }}</div>
-
-                    <a-tooltip v-if="dayjs().diff(dayjs(record.login_time), 'hours') > 48">
-                        <template #content>
-                            <div>登录：{{ record.login_time }}</div>
-                            <div>登录状态即将掉线，请尽快处理</div>
-                        </template>
-
-                        <div style="color:red;">
-                            预计 {{ 72 - dayjs().diff(dayjs(record.login_time), 'hours') }} 小时后掉线
-                        </div>
-
-
-                    </a-tooltip>
-
+                    <div style="color:gray;">
+                        <div>注册：{{ dayjs(record.create_time).format('MM-DD HH:mm') }}</div>
+                        <div>更新：{{ dayjs(record.last_time).format('MM-DD HH:mm') }}</div>
+                        <div v-if="dayjs().diff(dayjs(record.login_time), 'hours') < 48">
+                            登录：{{ dayjs(record.login_time).format('MM-DD HH:mm') }}</div>
+                        <a-tooltip v-else>
+                            <template #content>
+                                <div>登录：{{ dayjs(record.login_time).format('MM-DD HH:mm') }}</div>
+                                <div>登录状态即将掉线，请尽快处理</div>
+                            </template>
+                            <div style="color:red;">
+                                预计 {{ 72 - dayjs().diff(dayjs(record.login_time), 'hours') }} 小时后掉线
+                            </div>
+                        </a-tooltip>
+                    </div>
                 </template>
                 <template #operations="{ record }">
                     <a-button type="text" size="small" @click="changeItem(record)">

src/views/taobao/report_daily.vue

@@ -229,7 +229,15 @@
                         column.slotName == 'eff_tk_disp_tfee' ||
                         column.slotName == 'sett_tk_disp_tfee_56' ||
                         column.slotName == 'order_ord_tfee_12_14' ||
-                        column.slotName == 'order_ord_amt_12_14'">
+                        column.slotName == 'order_ord_amt_12_14' ||
+                        column.slotName == 'refund_order_ord_amt' ||
+                        column.slotName == 'refund_order_ord_tfee' ||
+                        column.slotName == 'refund_order_ord_amt_4' ||
+                        column.slotName == 'refund_order_ord_tfee_4'||
+                        column.slotName == 'refund_order_ord_deduct_tfee'||
+                        column.slotName == 'refund_order_ord_freeze_tfee'||
+                        column.slotName == 'refund_order_ord_unfreeze_tfee'">
+
                         <div>{{ amountFormat(record[column.dataIndex]) }}</div>
                     </template>
 
@@ -476,7 +484,7 @@ const columns = computed<TableColumnData[]>(() => [
             },
             {
                 title: '结算收入',
-                width: 120,
+                width: 150,
                 align: 'right',
                 dataIndex: 'order_ord_tfee',
                 slotName: 'order_ord_tfee',
@@ -499,41 +507,75 @@ const columns = computed<TableColumnData[]>(() => [
         ]
     },
     {
-        title: '第三方API调用',
+        title: '订单维权',
         children: [
             {
-                title: '调用',
-                dataIndex: 'total_count',
-                slotName: 'total_count',
-                width: 100,
-                align: 'right'
+                title: '扣款收入',
+                width: 120,
+                align: 'right',
+                dataIndex: 'refund_order_ord_deduct_tfee',
+                slotName: 'refund_order_ord_deduct_tfee',
+                render: (e: any) => amountFormat(e.record.refund_order_ord_deduct_tfee)
             },
             {
-                title: '成功',
-                dataIndex: 'success_count',
-                width: 100,
-                align: 'right'
+                title: '冻结金额',
+                slotName: 'refund_order_ord_freeze_tfee',
+                dataIndex: 'refund_order_ord_freeze_tfee',
+                width: 150,
+                align: 'right',
+                render: (e: any) => amountFormat(e.record.refund_order_ord_freeze_tfee)
             },
             {
-                title: '成功(%)',
-                dataIndex: 'success_percentage',
-                width: 90,
-                align: 'right'
+                title: '解冻金额',
+                width: 120,
+                align: 'right',
+                dataIndex: 'refund_order_ord_unfreeze_tfee',
+                slotName: 'refund_order_ord_unfreeze_tfee',
+                render: (e: any) => amountFormat(e.record.refund_order_ord_unfreeze_tfee)
             },
+        ]
+    },
+
+
+    {
+        title: '所属订单维权金额',
+        children: [
             {
-                title: '放弃',
-                dataIndex: 'abandon_count',
-                width: 100,
-                align: 'right'
+                title: '维权金额(扣款)',
+                slotName: 'refund_order_ord_amt',
+                dataIndex: 'refund_order_ord_amt',
+                width: 150,
+                align: 'right',
+                render: (e: any) => amountFormat(e.record.refund_order_ord_amt)
             },
             {
-                title: '放弃(%)',
-                dataIndex: 'abandon_percentage',
-                width: 90,
-                align: 'right'
+                title: '扣款收入',
+                width: 120,
+                align: 'right',
+                dataIndex: 'refund_order_ord_tfee',
+                slotName: 'refund_order_ord_tfee',
+                render: (e: any) => amountFormat(e.record.refund_order_ord_tfee)
+            },
+            {
+                title: '维权金额(冻结)',
+                slotName: 'refund_order_ord_amt_4',
+                dataIndex: 'refund_order_ord_amt_4',
+                width: 150,
+                align: 'right',
+                render: (e: any) => amountFormat(e.record.refund_order_ord_amt_4)
+            },
+            {
+                title: '冻结收入',
+                width: 120,
+                align: 'right',
+                dataIndex: 'refund_order_ord_tfee_4',
+                slotName: 'refund_order_ord_tfee_4',
+                render: (e: any) => amountFormat(e.record.refund_order_ord_tfee_4)
             },
         ]
     },
+
+
     {
         title: '转链API调用',
         children: [
@@ -642,6 +684,42 @@ const columns = computed<TableColumnData[]>(() => [
             },
         ]
     },
+    {
+        title: '第三方API调用',
+        children: [
+            {
+                title: '调用',
+                dataIndex: 'total_count',
+                slotName: 'total_count',
+                width: 100,
+                align: 'right'
+            },
+            {
+                title: '成功',
+                dataIndex: 'success_count',
+                width: 100,
+                align: 'right'
+            },
+            {
+                title: '成功(%)',
+                dataIndex: 'success_percentage',
+                width: 90,
+                align: 'right'
+            },
+            {
+                title: '放弃',
+                dataIndex: 'abandon_count',
+                width: 100,
+                align: 'right'
+            },
+            {
+                title: '放弃(%)',
+                dataIndex: 'abandon_percentage',
+                width: 90,
+                align: 'right'
+            },
+        ]
+    },
     {
         title: '最后更新时间',
         dataIndex: 'last_time',