diff --git a/src/views/jd-order/jd-orders/components/jd-order-history-drawer.vue b/src/views/jd-order/jd-orders/components/jd-order-history-drawer.vue index 6e60b51..993ad25 100644 --- a/src/views/jd-order/jd-orders/components/jd-order-history-drawer.vue +++ b/src/views/jd-order/jd-orders/components/jd-order-history-drawer.vue @@ -47,6 +47,10 @@ v-else-if="isSendType(item.changeType)" :style="{ color: '#722ed1', fontSize: '16px' }" /> + @@ -114,6 +118,7 @@ import { IconClockCircle, IconCloseCircle, IconSync, + IconRefresh, IconMore } from '@arco-design/web-vue/es/icon'; import { jdOrderClient } from '@/api'; @@ -199,7 +204,8 @@ const getStatusColor = (changeType?: string): string => { pay: 'green', // 支付 expire: 'red', // 过期 invalid: 'gray', // 失效 - send: 'purple' // 替换 + send: 'purple', // 发货 + replace: 'purple' // 换绑 }; return colorMap[changeType || ''] || 'gray'; }; @@ -207,13 +213,14 @@ const getStatusColor = (changeType?: string): string => { // 获取状态文本 const getStatusText = (changeType?: string): string => { const textMap: Record = { - create: '创建订单', - bind: '绑定订单', - unbind: '解绑订单', - pay: '支付完成', - expire: '订单过期', - invalid: '订单失效', - send: '发货' + create: '创建', + bind: '绑定', + unbind: '解绑', + pay: '支付', + expire: '过期', + invalid: '失效', + send: '发货', + replace: '换绑' }; return textMap[changeType || ''] || '未知状态'; }; @@ -227,7 +234,8 @@ const getTimelineDotColor = (changeType?: string): string => { pay: '#00b42a', // 支付 expire: '#f53f3f', // 过期 invalid: '#86909c', // 失效 - send: '#722ed1' // 发货 + send: '#722ed1', // 发货 + replace: '#722ed1' // 换绑 }; return colorMap[changeType || ''] || '#86909c'; }; diff --git a/src/views/jd-order/jd-orders/index.vue b/src/views/jd-order/jd-orders/index.vue index 11fac18..3d14ea0 100644 --- a/src/views/jd-order/jd-orders/index.vue +++ b/src/views/jd-order/jd-orders/index.vue @@ -31,7 +31,7 @@ 已发货 已过期 已取消 - Cookie账号Ck失败 + Ck失败 @@ -94,9 +94,7 @@ 已发货 已过期 已取消 - - Cookie账号Ck失败 - + Ck失败 未知 @@ -101,6 +109,7 @@ import { IconCheckCircle, IconClockCircle, IconCloseCircle, + IconExclamationCircle, IconSync, IconMore } from '@arco-design/web-vue/es/icon'; @@ -181,7 +190,9 @@ const getStatusColor = (changeType?: string): string => { create: 'green', // 创建 rebind: 'blue', // 重新绑定 pay: 'green', // 支付 - expire: 'red' // 过期 + expire: 'red', // 过期 + ck_failed: 'orange', // cookie失效 + jd_order_failed: 'red' // 下单京东订单失败 }; return colorMap[changeType || ''] || 'gray'; }; @@ -189,10 +200,12 @@ const getStatusColor = (changeType?: string): string => { // 获取状态文本 const getStatusText = (changeType?: string): string => { const textMap: Record = { - create: '创建订单', + create: '创建', rebind: '重新绑定', - pay: '支付完成', - expire: '订单过期' + pay: '支付', + expire: '过期', + ck_failed: 'cookie失效', + jd_order_failed: '下单京东订单失败' }; return textMap[changeType || ''] || '未知状态'; }; @@ -203,7 +216,9 @@ const getTimelineDotColor = (changeType?: string): string => { create: '#00b42a', // 创建 rebind: '#165dff', // 重新绑定 pay: '#00b42a', // 支付 - expire: '#f53f3f' // 过期 + expire: '#f53f3f', // 过期 + ck_failed: '#ff7d00', // cookie失效 + jd_order_failed: '#f53f3f' // 下单京东订单失败 }; return colorMap[changeType || ''] || '#86909c'; };