From 4b118675fdd5466975280ab6834318d3d0806695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 11 Mar 2026 18:32:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(shopOrder):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加发货时间和退款时间显示
- 注释掉结算状态标签显示
- 将下单时间标题改为创建时间
---
 src/views/shop/shopOrder/index.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/shop/shopOrder/index.vue b/src/views/shop/shopOrder/index.vue
index 3874245..77f8a73 100644
--- a/src/views/shop/shopOrder/index.vue
+++ b/src/views/shop/shopOrder/index.vue
@@ -120,6 +120,11 @@
                 <a-tag v-if="record.orderStatus === 7" color="pink"
                   >客户端申请退款</a-tag
                 >
+                <!-- 结算状态 -->
+<!--                <a-tag v-if="record.isSettled === 0">未结算</a-tag>-->
+<!--                <a-tag v-if="record.isSettled === 1" color="green"-->
+<!--                  >已结算</a-tag-->
+<!--                >-->
               </a-space>
             </div>
           </template>
@@ -164,6 +169,12 @@
               <a-tooltip title="支付时间">
                 <span class="text-blue-400">{{ record.payTime }}</span>
               </a-tooltip>
+              <a-tooltip title="发货时间">
+                <span class="text-green-400">{{ record.deliveryTime }}</span>
+              </a-tooltip>
+              <a-tooltip title="退款时间">
+                <span class="text-orange-400">{{ record.refundTime }}</span>
+              </a-tooltip>
             </div>
           </template>
           <template v-if="column.key === 'action'">
@@ -401,7 +412,7 @@
     //   align: 'center',
     // },
     {
-      title: '下单时间',
+      title: '创建时间',
       dataIndex: 'createTime',
       key: 'createTime',
       width: 180,