From 028620f12d221ff704625ae4cac7afadcfeca936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 9 Mar 2026 12:47:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E4=BC=98=E5=8C=96=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单列表中为创建时间和支付时间添加双行显示
- 为订单编号列设置固定宽度200px提升可读性
- 移除独立的支付时间列并整合到时间信息中
- 添加订单状态条件限制发货操作的显示逻辑
- 为创建时间字段设置固定宽度180px便于排序查看
---
 src/views/shop/shopOrder/index.vue | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/shop/shopOrder/index.vue b/src/views/shop/shopOrder/index.vue
index d9313a1..3874245 100644
--- a/src/views/shop/shopOrder/index.vue
+++ b/src/views/shop/shopOrder/index.vue
@@ -156,6 +156,16 @@
             <a-tag v-if="record.status === 0" color="green">显示</a-tag>
             <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
           </template>
+          <template v-if="column.key === 'createTime'">
+            <div class="flex flex-col">
+              <a-tooltip title="创建时间">
+                <span class="text-gray-400">{{ record.createTime }}</span>
+              </a-tooltip>
+              <a-tooltip title="支付时间">
+                <span class="text-blue-400">{{ record.payTime }}</span>
+              </a-tooltip>
+            </div>
+          </template>
           <template v-if="column.key === 'action'">
             <a-space>
               <!-- 查看详情 - 所有状态都可以查看 -->
@@ -176,6 +186,7 @@
                 v-if="
                 record.payStatus &&
                 record.deliveryStatus === 10 &&
+                record.orderStatus === 0 &&
                 !isCancelledStatus(record.orderStatus) &&
                 !isRefundStatus(record.orderStatus)
               "
@@ -349,6 +360,7 @@
       title: '订单编号',
       dataIndex: 'orderNo',
       key: 'orderNo',
+      width: 200,
       align: 'center'
     },
     {
@@ -388,19 +400,11 @@
     //   key: 'comments',
     //   align: 'center',
     // },
-    // {
-    //   title: '支付时间',
-    //   dataIndex: 'payTime',
-    //   key: 'payTime',
-    //   align: 'center',
-    //   width: 180,
-    //   sorter: true,
-    //   ellipsis: true
-    // },
     {
       title: '下单时间',
       dataIndex: 'createTime',
       key: 'createTime',
+      width: 180,
       align: 'center',
       sorter: true,
       customRender: ({ text }) => toDateString(text)