From 39772f06f2c8f88d496aec3a1ed8779f4ad3671f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 20 Oct 2026 16:46:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=AE=A1=E7=90=86=E7=AB=AF):=20=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95/=E5=94=AE=E5=90=8E=E5=88=97=E8=A1=A8=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=8C=BA=E7=BB=9F=E4=B8=80=E5=86=85=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

中台订单、实物订单、售后列表的表格与分页包进 table-content 容器，与 tab 栏对齐
---
 .../admin/src/pages/order/afterSale/index.vue | 122 ++++---
 .../src/pages/order/orderCenter/index.vue     | 207 ++++++-----
 .../normal/order/components/OrderTable.vue    | 344 +++++++++---------
 3 files changed, 346 insertions(+), 327 deletions(-)

diff --git a/frontend/admin/src/pages/order/afterSale/index.vue b/frontend/admin/src/pages/order/afterSale/index.vue
index f76377a4a..7a9724e97 100644
--- a/frontend/admin/src/pages/order/afterSale/index.vue
+++ b/frontend/admin/src/pages/order/afterSale/index.vue
@@ -88,66 +88,68 @@
         <el-tab-pane label="全部" name=""></el-tab-pane>
         <el-tab-pane v-for="item in statusOptions" :key="item.key" :label="item.label" :name="item.key"></el-tab-pane>
       </el-tabs>
-      <el-table :data="list" ref="table" v-loading="loading" empty-text="暂无数据" class="afterSaleData">
-        <el-table-column label="售后单号" min-width="180">
-          <template #default="scope">
-            <span>{{ scope.row.after_sale_no }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="订单号" min-width="160">
-          <template #default="scope">
-            <span>{{ scope.row.order_no }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="售后类型" width="110">
-          <template #default="scope">
-            <el-tag :type="getTypeClass(scope.row.type)" effect="plain">{{
-              scope.row.type_text || scope.row.type
-            }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="售后状态" width="110">
-          <template #default="scope">
-            <el-tag :type="getStatusClass(scope.row.status)">{{ scope.row.status_text || scope.row.status }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="产品类型" width="110">
-          <template #default="scope">
-            <span>{{ getProductTypeLabel(scope.row.product_type) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="退款金额" min-width="120">
-          <template #default="scope">
-            <span class="price">¥{{ scope.row.refund_price || '0.00' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="申请时间" min-width="160">
-          <template #default="scope">
-            <span>{{ scope.row.add_time ? formatDate(scope.row.add_time) : '--' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" width="140">
-          <template #default="scope">
-            <a v-db-click @click="viewDetail(scope.row)">详情</a>
-            <template v-if="scope.row.status === 'pending_audit'">
-              <el-divider direction="vertical" />
-              <a v-db-click @click="goAudit(scope.row)" v-auth="['admin-order-afterSale-audit']">审核</a>
+      <div class="table-content">
+        <el-table :data="list" ref="table" v-loading="loading" empty-text="暂无数据" class="afterSaleData">
+          <el-table-column label="售后单号" min-width="180">
+            <template #default="scope">
+              <span>{{ scope.row.after_sale_no }}</span>
             </template>
-            <template v-if="canRemark(scope.row.status)">
-              <el-divider direction="vertical" />
-              <a v-db-click @click="editRemark(scope.row)" v-auth="['admin-order-afterSale-remark']">备注</a>
+          </el-table-column>
+          <el-table-column label="订单号" min-width="160">
+            <template #default="scope">
+              <span>{{ scope.row.order_no }}</span>
             </template>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="acea-row row-right page">
-        <pagination
-          v-if="total"
-          :total="total"
-          v-model:page="page.page"
-          v-model:limit="page.limit"
-          @pagination="getList"
-        />
+          </el-table-column>
+          <el-table-column label="售后类型" width="110">
+            <template #default="scope">
+              <el-tag :type="getTypeClass(scope.row.type)" effect="plain">{{
+                scope.row.type_text || scope.row.type
+              }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="售后状态" width="110">
+            <template #default="scope">
+              <el-tag :type="getStatusClass(scope.row.status)">{{ scope.row.status_text || scope.row.status }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="产品类型" width="110">
+            <template #default="scope">
+              <span>{{ getProductTypeLabel(scope.row.product_type) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="退款金额" min-width="120">
+            <template #default="scope">
+              <span class="price">¥{{ scope.row.refund_price || '0.00' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="申请时间" min-width="160">
+            <template #default="scope">
+              <span>{{ scope.row.add_time ? formatDate(scope.row.add_time) : '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="140">
+            <template #default="scope">
+              <a v-db-click @click="viewDetail(scope.row)">详情</a>
+              <template v-if="scope.row.status === 'pending_audit'">
+                <el-divider direction="vertical" />
+                <a v-db-click @click="goAudit(scope.row)" v-auth="['admin-order-afterSale-audit']">审核</a>
+              </template>
+              <template v-if="canRemark(scope.row.status)">
+                <el-divider direction="vertical" />
+                <a v-db-click @click="editRemark(scope.row)" v-auth="['admin-order-afterSale-remark']">备注</a>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="acea-row row-right page">
+          <pagination
+            v-if="total"
+            :total="total"
+            v-model:page="page.page"
+            v-model:limit="page.limit"
+            @pagination="getList"
+          />
+        </div>
       </div>
     </el-card>
     <!-- 备注弹窗 -->
@@ -504,6 +506,10 @@ onMounted(() => {
   width: 250px;
 }
 
+.table-content {
+  padding: 12px 20px 0;
+}
+
 .price {
   color: #ed4014;
   font-weight: bold;
diff --git a/frontend/admin/src/pages/order/orderCenter/index.vue b/frontend/admin/src/pages/order/orderCenter/index.vue
index 2e0d629a4..ecc5aa53f 100644
--- a/frontend/admin/src/pages/order/orderCenter/index.vue
+++ b/frontend/admin/src/pages/order/orderCenter/index.vue
@@ -151,106 +151,108 @@
         <el-tab-pane :label="getTabLabel('售后中', 'after_sale')" name="after_sale"></el-tab-pane>
         <el-tab-pane :label="getTabLabel('已删除', 'deleted')" name="deleted"></el-tab-pane>
       </el-tabs>
-      <el-table :data="orderList" ref="table" v-loading="loading" empty-text="暂无数据" class="orderData">
-        <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column label="订单号" width="170">
-          <template #default="scope">
-            <span>{{ scope.row.order_no }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="订单分类" width="120">
-          <template #default="scope">
-            <span :class="getOrderCategoryClass(scope.row.order_category)">{{
-              getOrderCategoryLabel(scope.row.order_category)
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="产品类型" width="120">
-          <template #default="scope">
-            <span>{{ getProductTypeLabel(scope.row.product_type) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="活动类型" width="120">
-          <template #default="scope">
-            <span>{{ scope.row.activity_type_text || '--' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品信息" min-width="250">
-          <template #default="scope">
-            <div class="tab">
-              <img v-lazy="scope.row.image" />
-              <el-tooltip placement="top" :open-delay="300">
-                <template #content
-                  ><div>
-                    <div>
-                      <span>商品名称：</span><span>{{ scope.row.title }}</span>
-                    </div>
-                    <div>
-                      <span>购买数量：</span><span>{{ scope.row.total_num }}</span>
-                    </div>
-                  </div></template
-                >
-                <span class="line2 w-250">{{ scope.row.title }}</span>
-              </el-tooltip>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="用户信息" min-width="150">
-          <template #default="scope">
-            <div>{{ scope.row.nickname || '--' }}</div>
-            <div>{{ scope.row.user_phone || '--' }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="订单金额" min-width="120">
-          <template #default="scope">
-            <div>
-              <span>总价：</span><span class="price">¥{{ scope.row.total_price }}</span>
-            </div>
-            <div>
-              <span>实付：</span><span class="price">¥{{ scope.row.pay_price }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="支付状态" width="100">
-          <template #default="scope">
-            <el-tag :type="getPayStatusClass(scope.row.pay_status)">{{
-              getPayStatusLabel(scope.row.pay_status)
-            }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="订单状态" min-width="120">
-          <template #default="scope">
-            <el-tag :type="getStatusClass(scope.row.status_code)">{{ getStatusLabel(scope.row.status_code) }}</el-tag>
-            <div v-if="scope.row.business_status">
-              <span class="business-status">{{ scope.row.business_status.label }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" min-width="160">
-          <template #default="scope">
-            <span>{{ scope.row.add_time ? formatDate(scope.row.add_time * 1000) : '--' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" width="180">
-          <template #default="scope">
-            <a v-db-click @click="viewDetail(scope.row)">详情</a>
-            <el-divider direction="vertical" />
-            <a v-db-click @click="editRemark(scope.row)" v-auth="['admin-order-orderCenter-remark']">备注</a>
-            <template v-if="statusTab === 'deleted'">
-              <el-divider direction="vertical" />
-              <a v-db-click @click="deleteOrder(scope.row)" v-auth="['admin-order-orderCenter-delete']">删除</a>
+      <div class="table-content">
+        <el-table :data="orderList" ref="table" v-loading="loading" empty-text="暂无数据" class="orderData">
+          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column label="订单号" width="170">
+            <template #default="scope">
+              <span>{{ scope.row.order_no }}</span>
             </template>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="acea-row row-right page">
-        <pagination
-          v-if="total"
-          :total="total"
-          v-model:page="page.page"
-          v-model:limit="page.limit"
-          @pagination="getList"
-        />
+          </el-table-column>
+          <el-table-column label="订单分类" width="120">
+            <template #default="scope">
+              <span :class="getOrderCategoryClass(scope.row.order_category)">{{
+                getOrderCategoryLabel(scope.row.order_category)
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="产品类型" width="120">
+            <template #default="scope">
+              <span>{{ getProductTypeLabel(scope.row.product_type) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="活动类型" width="120">
+            <template #default="scope">
+              <span>{{ scope.row.activity_type_text || '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品信息" min-width="250">
+            <template #default="scope">
+              <div class="tab">
+                <img v-lazy="scope.row.image" />
+                <el-tooltip placement="top" :open-delay="300">
+                  <template #content
+                    ><div>
+                      <div>
+                        <span>商品名称：</span><span>{{ scope.row.title }}</span>
+                      </div>
+                      <div>
+                        <span>购买数量：</span><span>{{ scope.row.total_num }}</span>
+                      </div>
+                    </div></template
+                  >
+                  <span class="line2 w-250">{{ scope.row.title }}</span>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="用户信息" min-width="150">
+            <template #default="scope">
+              <div>{{ scope.row.nickname || '--' }}</div>
+              <div>{{ scope.row.user_phone || '--' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单金额" min-width="120">
+            <template #default="scope">
+              <div>
+                <span>总价：</span><span class="price">¥{{ scope.row.total_price }}</span>
+              </div>
+              <div>
+                <span>实付：</span><span class="price">¥{{ scope.row.pay_price }}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="支付状态" width="100">
+            <template #default="scope">
+              <el-tag :type="getPayStatusClass(scope.row.pay_status)">{{
+                getPayStatusLabel(scope.row.pay_status)
+              }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单状态" min-width="120">
+            <template #default="scope">
+              <el-tag :type="getStatusClass(scope.row.status_code)">{{ getStatusLabel(scope.row.status_code) }}</el-tag>
+              <div v-if="scope.row.business_status">
+                <span class="business-status">{{ scope.row.business_status.label }}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" min-width="160">
+            <template #default="scope">
+              <span>{{ scope.row.add_time ? formatDate(scope.row.add_time * 1000) : '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="180">
+            <template #default="scope">
+              <a v-db-click @click="viewDetail(scope.row)">详情</a>
+              <el-divider direction="vertical" />
+              <a v-db-click @click="editRemark(scope.row)" v-auth="['admin-order-orderCenter-remark']">备注</a>
+              <template v-if="statusTab === 'deleted'">
+                <el-divider direction="vertical" />
+                <a v-db-click @click="deleteOrder(scope.row)" v-auth="['admin-order-orderCenter-delete']">删除</a>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="acea-row row-right page">
+          <pagination
+            v-if="total"
+            :total="total"
+            v-model:page="page.page"
+            v-model:limit="page.limit"
+            @pagination="getList"
+          />
+        </div>
       </div>
     </el-card>
     <el-dialog v-model="remarkModal" title="订单备注" width="500px">
@@ -518,7 +520,8 @@ function getPayStatusClass(status) {
 }
 
 function getTabLabel(text, statusCode) {
-  const count = statusCode === 'deleted' ? statData.value.deleted_count : statData.value.status_counts?.[statusCode]?.count;
+  const count =
+    statusCode === 'deleted' ? statData.value.deleted_count : statData.value.status_counts?.[statusCode]?.count;
   return count ? `${text}(${count})` : text;
 }
 
@@ -546,6 +549,10 @@ onMounted(() => {
   width: 250px;
 }
 
+.table-content {
+  padding: 12px 20px 0;
+}
+
 .tab {
   display: flex;
   align-items: center;
diff --git a/frontend/admin/src/pages/plugin/normal/order/components/OrderTable.vue b/frontend/admin/src/pages/plugin/normal/order/components/OrderTable.vue
index 862a64b53..c89fe6a73 100644
--- a/frontend/admin/src/pages/plugin/normal/order/components/OrderTable.vue
+++ b/frontend/admin/src/pages/plugin/normal/order/components/OrderTable.vue
@@ -22,182 +22,184 @@
     </div>
 
     <!-- 订单列表 -->
-    <el-table
-      :data="tableData"
-      v-loading="loading"
-      stripe
-      empty-text="暂无数据"
-      class="orderData"
-      @select="onSelectRow"
-      @select-all="onSelectAll"
-    >
-      <el-table-column type="expand" width="50">
-        <template #default="scope">
-          <OrderExpand :row="scope.row" />
-        </template>
-      </el-table-column>
-      <el-table-column type="selection" width="50" />
+    <div class="table-content">
+      <el-table
+        :data="tableData"
+        v-loading="loading"
+        stripe
+        empty-text="暂无数据"
+        class="orderData"
+        @select="onSelectRow"
+        @select-all="onSelectAll"
+      >
+        <el-table-column type="expand" width="50">
+          <template #default="scope">
+            <OrderExpand :row="scope.row" />
+          </template>
+        </el-table-column>
+        <el-table-column type="selection" width="50" />
 
-      <el-table-column label="订单号" width="180">
-        <template #default="scope">
-          <div>{{ scope.row.order_no }}</div>
-          <div style="font-size: 11px; color: var(--prev-color-text-secondary)">
-            [{{ getShippingTypeLabel(scope.row) }}]
-          </div>
-          <span v-if="scope.row.is_del === 1" style="color: #ed4014; font-size: 12px">用户已删除</span>
-          <span v-if="scope.row.is_cancel === 1 && scope.row.is_del === 0" style="color: #ed4014; font-size: 12px"
-            >用户已取消</span
-          >
-        </template>
-      </el-table-column>
-      <el-table-column label="商品信息" min-width="240">
-        <template #default="scope">
-          <div class="tab">
-            <img v-lazy="scope.row.image" />
-            <el-tooltip placement="top" :open-delay="300">
-              <template #content
-                ><div>
-                  <div>
-                    <span>商品名称：</span><span>{{ scope.row.title }}</span>
-                  </div>
-                  <div v-if="scope.row.subtitle">
-                    <span>副标题：</span><span>{{ scope.row.subtitle }}</span>
-                  </div>
-                  <div>
-                    <span>购买数量：</span><span>{{ scope.row.total_num }}</span>
-                  </div>
-                </div></template
-              >
-              <span class="line2 w-250">{{ scope.row.title }}</span>
-            </el-tooltip>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="用户信息" min-width="150">
-        <template #default="scope">
-          <div>{{ scope.row.nickname || '--' }}</div>
-          <div>{{ scope.row.user_phone || '--' }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单金额" min-width="130">
-        <template #default="scope">
-          <div>
-            <span>总价：</span><span class="price">¥{{ scope.row.total_price }}</span>
-          </div>
-          <div>
-            <span>实付：</span><span class="price">¥{{ scope.row.pay_price }}</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付方式" width="90">
-        <template #default="scope">
-          <span>{{ scope.row.pay_type_name || scope.row.pay_type || '--' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付状态" width="90">
-        <template #default="scope">
-          <el-tag :type="isPaid(scope.row) ? 'success' : 'danger'">
-            {{ isPaid(scope.row) ? '已支付' : '未支付' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单状态" min-width="100">
-        <template #default="scope">
-          <el-tag :type="getBusinessStatus(scope.row).type">
-            {{ getRowStatusLabel(scope.row) }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="售后" width="100">
-        <template #default="scope">
-          <el-tooltip
-            v-if="scope.row.after_sale && scope.row.after_sale.has_after_sale"
-            placement="top"
-            :open-delay="300"
-          >
-            <template #content
-              ><div>
-                <div>售后单数：{{ scope.row.after_sale.count }}</div>
-                <div>售后类型：{{ formatAfterSaleTypes(scope.row.after_sale.types) }}</div>
-                <div>售后状态：{{ formatAfterSaleStatuses(scope.row.after_sale.statuses) }}</div>
-              </div></template
-            >
-            <el-tag :type="scope.row.after_sale.is_processing ? 'warning' : 'info'">
-              {{ scope.row.after_sale.is_processing ? '售后中' : '有售后' }}
-            </el-tag>
-          </el-tooltip>
-          <span v-else style="color: #c0c4cc">--</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="配送信息" min-width="150">
-        <template #default="scope">
-          <template v-if="scope.row.delivery_name">
-            <div>{{ scope.row.delivery_name || '--' }}</div>
-            <div style="font-size: 12px; color: var(--prev-color-text-secondary)">
-              {{ scope.row.delivery_id || '--' }}
+        <el-table-column label="订单号" width="180">
+          <template #default="scope">
+            <div>{{ scope.row.order_no }}</div>
+            <div style="font-size: 11px; color: var(--prev-color-text-secondary)">
+              [{{ getShippingTypeLabel(scope.row) }}]
             </div>
-            <a
-              v-if="scope.row.delivery_type === 'express' && scope.row.delivery_id"
-              v-db-click
-              @click="onLogistics(scope.row)"
-              style="font-size: 12px"
-              >物流查询</a
+            <span v-if="scope.row.is_del === 1" style="color: #ed4014; font-size: 12px">用户已删除</span>
+            <span v-if="scope.row.is_cancel === 1 && scope.row.is_del === 0" style="color: #ed4014; font-size: 12px"
+              >用户已取消</span
             >
           </template>
-          <span v-else style="color: var(--prev-color-text-secondary)">{{
-            isPickupOrder(scope.row) ? '--' : '未发货'
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" width="160">
-        <template #default="scope">
-          <span>{{ scope.row.add_time ? formatTime(scope.row.add_time) : '--' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" fixed="right" width="200">
-        <template #default="scope">
-          <a v-db-click @click="onDetail(scope.row)">详情</a>
-          <el-divider direction="vertical" />
-          <el-dropdown @command="(cmd) => handleCommand(scope.row, cmd)" :transfer="true">
-            <span class="el-dropdown-link"> 更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
-            <template #dropdown
-              ><el-dropdown-menu>
-                <!-- 确认付款（线下支付待支付） -->
-                <el-dropdown-item command="confirmPay" v-if="canConfirmPay(scope.row)">确认付款</el-dropdown-item>
-                <!-- 发货 -->
-                <el-dropdown-item command="shipment" v-if="canShip(scope.row)">发货</el-dropdown-item>
-                <!-- 确认收货 / 到店核销 -->
-                <el-dropdown-item command="confirm" v-if="canConfirm(scope.row)">{{
-                  getConfirmLabel(scope.row)
-                }}</el-dropdown-item>
-                <!-- 订单编辑 -->
-                <el-dropdown-item command="editOrder" v-if="canEditOrder(scope.row)">订单编辑</el-dropdown-item>
-                <!-- 小票打印 -->
-                <el-dropdown-item command="printReceipt" v-if="canPrint(scope.row)">小票打印</el-dropdown-item>
-                <!-- 配货单打印 -->
-                <el-dropdown-item command="printPick" v-if="canPrint(scope.row)">配货单打印</el-dropdown-item>
-                <!-- 修改地址 -->
-                <el-dropdown-item command="editAddress" v-if="canEditAddress(scope.row)">修改地址</el-dropdown-item>
-                <!-- 订单备注 -->
-                <el-dropdown-item command="remark">订单备注</el-dropdown-item>
-                <!-- 立即退款 -->
-                <el-dropdown-item command="refund" v-if="canRefund(scope.row)">立即退款</el-dropdown-item>
-                <!-- 配送信息 -->
-                <el-dropdown-item command="deliveryInfo" v-if="canShowDeliveryInfo(scope.row)"
-                  >配送信息</el-dropdown-item
+        </el-table-column>
+        <el-table-column label="商品信息" min-width="240">
+          <template #default="scope">
+            <div class="tab">
+              <img v-lazy="scope.row.image" />
+              <el-tooltip placement="top" :open-delay="300">
+                <template #content
+                  ><div>
+                    <div>
+                      <span>商品名称：</span><span>{{ scope.row.title }}</span>
+                    </div>
+                    <div v-if="scope.row.subtitle">
+                      <span>副标题：</span><span>{{ scope.row.subtitle }}</span>
+                    </div>
+                    <div>
+                      <span>购买数量：</span><span>{{ scope.row.total_num }}</span>
+                    </div>
+                  </div></template
                 >
-                <!-- 删除订单 -->
-                <el-dropdown-item command="delete" v-if="canDelete()">删除订单</el-dropdown-item>
-              </el-dropdown-menu></template
+                <span class="line2 w-250">{{ scope.row.title }}</span>
+              </el-tooltip>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户信息" min-width="150">
+          <template #default="scope">
+            <div>{{ scope.row.nickname || '--' }}</div>
+            <div>{{ scope.row.user_phone || '--' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单金额" min-width="130">
+          <template #default="scope">
+            <div>
+              <span>总价：</span><span class="price">¥{{ scope.row.total_price }}</span>
+            </div>
+            <div>
+              <span>实付：</span><span class="price">¥{{ scope.row.pay_price }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付方式" width="90">
+          <template #default="scope">
+            <span>{{ scope.row.pay_type_name || scope.row.pay_type || '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付状态" width="90">
+          <template #default="scope">
+            <el-tag :type="isPaid(scope.row) ? 'success' : 'danger'">
+              {{ isPaid(scope.row) ? '已支付' : '未支付' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单状态" min-width="100">
+          <template #default="scope">
+            <el-tag :type="getBusinessStatus(scope.row).type">
+              {{ getRowStatusLabel(scope.row) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="售后" width="100">
+          <template #default="scope">
+            <el-tooltip
+              v-if="scope.row.after_sale && scope.row.after_sale.has_after_sale"
+              placement="top"
+              :open-delay="300"
             >
-          </el-dropdown>
-        </template>
-      </el-table-column>
-    </el-table>
+              <template #content
+                ><div>
+                  <div>售后单数：{{ scope.row.after_sale.count }}</div>
+                  <div>售后类型：{{ formatAfterSaleTypes(scope.row.after_sale.types) }}</div>
+                  <div>售后状态：{{ formatAfterSaleStatuses(scope.row.after_sale.statuses) }}</div>
+                </div></template
+              >
+              <el-tag :type="scope.row.after_sale.is_processing ? 'warning' : 'info'">
+                {{ scope.row.after_sale.is_processing ? '售后中' : '有售后' }}
+              </el-tag>
+            </el-tooltip>
+            <span v-else style="color: #c0c4cc">--</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="配送信息" min-width="150">
+          <template #default="scope">
+            <template v-if="scope.row.delivery_name">
+              <div>{{ scope.row.delivery_name || '--' }}</div>
+              <div style="font-size: 12px; color: var(--prev-color-text-secondary)">
+                {{ scope.row.delivery_id || '--' }}
+              </div>
+              <a
+                v-if="scope.row.delivery_type === 'express' && scope.row.delivery_id"
+                v-db-click
+                @click="onLogistics(scope.row)"
+                style="font-size: 12px"
+                >物流查询</a
+              >
+            </template>
+            <span v-else style="color: var(--prev-color-text-secondary)">{{
+              isPickupOrder(scope.row) ? '--' : '未发货'
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160">
+          <template #default="scope">
+            <span>{{ scope.row.add_time ? formatTime(scope.row.add_time) : '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="200">
+          <template #default="scope">
+            <a v-db-click @click="onDetail(scope.row)">详情</a>
+            <el-divider direction="vertical" />
+            <el-dropdown @command="(cmd) => handleCommand(scope.row, cmd)" :transfer="true">
+              <span class="el-dropdown-link"> 更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+              <template #dropdown
+                ><el-dropdown-menu>
+                  <!-- 确认付款（线下支付待支付） -->
+                  <el-dropdown-item command="confirmPay" v-if="canConfirmPay(scope.row)">确认付款</el-dropdown-item>
+                  <!-- 发货 -->
+                  <el-dropdown-item command="shipment" v-if="canShip(scope.row)">发货</el-dropdown-item>
+                  <!-- 确认收货 / 到店核销 -->
+                  <el-dropdown-item command="confirm" v-if="canConfirm(scope.row)">{{
+                    getConfirmLabel(scope.row)
+                  }}</el-dropdown-item>
+                  <!-- 订单编辑 -->
+                  <el-dropdown-item command="editOrder" v-if="canEditOrder(scope.row)">订单编辑</el-dropdown-item>
+                  <!-- 小票打印 -->
+                  <el-dropdown-item command="printReceipt" v-if="canPrint(scope.row)">小票打印</el-dropdown-item>
+                  <!-- 配货单打印 -->
+                  <el-dropdown-item command="printPick" v-if="canPrint(scope.row)">配货单打印</el-dropdown-item>
+                  <!-- 修改地址 -->
+                  <el-dropdown-item command="editAddress" v-if="canEditAddress(scope.row)">修改地址</el-dropdown-item>
+                  <!-- 订单备注 -->
+                  <el-dropdown-item command="remark">订单备注</el-dropdown-item>
+                  <!-- 立即退款 -->
+                  <el-dropdown-item command="refund" v-if="canRefund(scope.row)">立即退款</el-dropdown-item>
+                  <!-- 配送信息 -->
+                  <el-dropdown-item command="deliveryInfo" v-if="canShowDeliveryInfo(scope.row)"
+                    >配送信息</el-dropdown-item
+                  >
+                  <!-- 删除订单 -->
+                  <el-dropdown-item command="delete" v-if="canDelete()">删除订单</el-dropdown-item>
+                </el-dropdown-menu></template
+              >
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <!-- 分页 -->
-    <div class="acea-row row-right page" v-if="total">
-      <pagination :total="total" v-model:page="page.page" v-model:limit="page.limit" @pagination="onPageChange" />
+      <!-- 分页 -->
+      <div class="acea-row row-right page" v-if="total">
+        <pagination :total="total" v-model:page="page.page" v-model:limit="page.limit" @pagination="onPageChange" />
+      </div>
     </div>
   </el-card>
 </template>
@@ -619,6 +621,10 @@ defineExpose({ selectedIds, page });
   border-bottom: 1px solid var(--prev-border-color-lighter);
 }
 
+.table-content {
+  padding: 12px 20px 0;
+}
+
 .orderData {
   .tab {
     display: flex;