From 8239ca474fa0aa0622df02c0c82067aadddf7263 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 28 Aug 2023 10:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=B7=AE=E5=BC=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/remaining.ts      | 20 ++------------------
 src/views/mall/trade/order/index.vue |  8 ++++----
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 87ffd1e5..2848164c 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -195,22 +195,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
-  {
-    path: '/trade/order',
-    component: Layout,
-    name: 'order',
-    meta: {
-      hidden: true
-    },
-    children: [
-      {
-        path: 'detail',
-        name: 'TradeOrderDetail',
-        component: () => import('@/views/mall/trade/order/tradeOrderDetail.vue'),
-        meta: { title: '订单详情', hidden: true }
-      }
-    ]
-  },
   {
     path: '/403',
     component: () => import('@/views/Error/403.vue'),
@@ -411,7 +395,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/trade/order',
     component: Layout,
-    name: 'Detail',
+    name: 'Order',
     meta: {
       hidden: true
     },
@@ -419,7 +403,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'detail/:orderId(\\d+)',
         component: () => import('@/views/mall/trade/order/detail/index.vue'),
-        name: 'TradeOrderDetailForm',
+        name: 'TradeOrderDetail',
         meta: { title: '订单详情', icon: '', activeMenu: '/trade/trade/order' }
       }
     ]
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
index 89200465..d4bb6642 100644
--- a/src/views/mall/trade/order/index.vue
+++ b/src/views/mall/trade/order/index.vue
@@ -149,14 +149,14 @@
             :data="scope.row.items"
             :header-cell-style="headerStyle"
             :span-method="spanMethod"
-            border
+            :border="true"
             style="width: 100%"
           >
             <el-table-column min-width="300" prop="spuName">
               <template #header>
                 <div
                   class="flex items-center"
-                  style="height: 35px; background-color: #f7f7f7; width: 100%"
+                  style="width: 100%; height: 35px; background-color: #f7f7f7"
                 >
                   <span class="mr-20px">订单号：{{ scope.row.no }} </span>
                   <span class="mr-20px">下单时间：{{ formatDate(scope.row.createTime) }}</span>
@@ -384,7 +384,7 @@ const spanMethod = ({ row, rowIndex, columnIndex }: SpanMethodProps) => {
     (order) => order.items?.findIndex((item) => item.id === row.id) !== -1
   )?.items?.length
   // 要合并的列，从零开始
-  const colIndex = [3, 4, 5, 6]
+  const colIndex = [3, 4, 5, 6, 7]
   if (colIndex.includes(columnIndex)) {
     // 除了第一行其余的不要
     if (rowIndex !== 0) {
@@ -434,7 +434,7 @@ const imagePreview = (imgUrl: string) => {
 
 /** 查看订单详情 */
 const openForm = (id: number) => {
-  push({ name: 'TradeOrderDetailForm', params: { orderId: id } })
+  push({ name: 'TradeOrderDetail', params: { orderId: id } })
 }
 
 /** 操作分发 */