From b55b9966d6e3fd545724474c650635ebfa39f374 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 26 Aug 2023 11:41:43 +0800
Subject: [PATCH] =?UTF-8?q?code=20review=EF=BC=9A=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b8ca5800c6adb7225857b7b8756484d04f5ca8eb)
---
 src/router/modules/remaining.ts               | 29 ++++++++----------
 src/utils/dict.ts                             |  2 +-
 .../order/components/OrderDeliveryForm.vue    |  1 +
 src/views/mall/trade/order/index.vue          | 30 +++++++++++--------
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 4993fc0c..8c8ae8f3 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -346,22 +346,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
-  {
-    path: '/product/property',
-    component: Layout,
-    name: 'Property',
-    meta: {
-      hidden: true
-    },
-    children: [
-      {
-        path: 'value/:propertyId(\\d+)',
-        component: () => import('@/views/mall/product/property/value/index.vue'),
-        name: 'ProductPropertyValue',
-        meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' }
-      }
-    ]
-  },
   {
     path: '/product',
     component: Layout,
@@ -408,6 +392,19 @@ const remainingRouter: AppRouteRecordRaw[] = [
           title: '商品详情',
           activeMenu: '/product/product-spu'
         }
+      },
+      {
+        path: 'property/value/:propertyId(\\d+)',
+        component: () => import('@/views/mall/product/property/value/index.vue'),
+        name: 'ProductPropertyValue',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:view',
+          title: '商品属性值',
+          activeMenu: '/product/property'
+        }
       }
     ]
   },
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index f850af42..1faf663f 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -157,7 +157,7 @@ export enum DICT_TYPE {
   TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
   TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态
   TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态
-  TRADE_DELIVERY_TYPE = 'delivery_type', // 配送方式
+  TRADE_DELIVERY_TYPE = 'trade_delivery_type', // 配送方式
 
   // ========== MALL - 营销模块 ==========
   PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
diff --git a/src/views/mall/trade/order/components/OrderDeliveryForm.vue b/src/views/mall/trade/order/components/OrderDeliveryForm.vue
index 14f9411d..6d4a07c4 100644
--- a/src/views/mall/trade/order/components/OrderDeliveryForm.vue
+++ b/src/views/mall/trade/order/components/OrderDeliveryForm.vue
@@ -34,6 +34,7 @@ import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
 import * as TradeOrderApi from '@/api/mall/trade/order'
 import { copyValueToTarget } from '@/utils'
 
+// TODO @puhui999：要不 Form 保持和别的模块一样，和 index.vue 放在一个目录下，不作为 components；components 更多要支持给多个模块使用哈。
 defineOptions({ name: 'OrderDeliveryForm' })
 
 const { t } = useI18n() // 国际化
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
index cf6fc584..89200465 100644
--- a/src/views/mall/trade/order/index.vue
+++ b/src/views/mall/trade/order/index.vue
@@ -64,6 +64,9 @@
           />
         </el-select>
       </el-form-item>
+      <!-- TODO @puhui999：要不加个 deliveryType 筛选；配送方式；然后如果选了快递，就有【快递公司】筛选；如果选了自提，就有【自提门店】；然后把他们这 3 个，坐在一个 el-form-item 里；
+        目的是；有的时候，会筛选门店，然后做核销；这个时候，就需要筛选自提门店；
+       -->
       <el-form-item label="快递公司" prop="type">
         <el-select v-model="queryParams.logisticsId" class="!w-280px" clearable placeholder="全部">
           <el-option
@@ -125,16 +128,11 @@
   </ContentWrap>
 
   <!-- 列表 -->
-  <!-- TODO @puhui999：列表有可能尽量对齐 https://gitee.com/niushop_team/niushop_b2c_v5_stand/raw/master/image/back_end5.png 哇，主要感觉视觉上有点无法分辨一个订单项，是和哪个订单关联。
-
-  1、订单号、订单类型、订单来源、支付时间那一行，直接做到订单项的数据中
-  2、商品信息、商品原价那一行，应该是在最顶上一行，不用每个订单项都写一条
-  3、然后点击展开和收拢订单项，可以不做哈。
-   -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
       <el-table-column class-name="order-table-col">
         <template #header>
+          <!-- TODO @phui999：小屏幕下，会有偏移，后续看看 -->
           <div class="flex items-center" style="width: 100%">
             <div class="ml-100px mr-200px">商品信息</div>
             <div class="mr-60px">单价(元)/数量</div>
@@ -170,11 +168,15 @@
                   />
                   <span>支付方式：</span>
                   <dict-tag
+                    v-if="scope.row.payChannelCode"
                     :type="DICT_TYPE.PAY_CHANNEL_CODE"
                     :value="scope.row.payChannelCode"
                     class="mr-20px"
                   />
-                  <span class="mr-20px">支付时间：{{ formatDate(scope.row.payTime) }}</span>
+                  <v-else class="mr-20px" v-else>未支付</v-else>
+                  <span class="mr-20px" v-if="scope.row.payTime">
+                    支付时间：{{ formatDate(scope.row.payTime) }}
+                  </span>
                   <span>订单类型：</span>
                   <dict-tag :type="DICT_TYPE.TRADE_ORDER_TYPE" :value="scope.row.type" />
                 </div>
@@ -249,6 +251,11 @@
                 <dict-tag :type="DICT_TYPE.TRADE_DELIVERY_TYPE" :value="scope.row.deliveryType" />
               </template>
             </el-table-column>
+            <el-table-column align="center" label="订单状态" width="120">
+              <template #default>
+                <dict-tag :type="DICT_TYPE.TRADE_ORDER_STATUS" :value="scope.row.status" />
+              </template>
+            </el-table-column>
             <el-table-column align="center" fixed="right" label="操作" width="160">
               <template #default>
                 <!-- TODO 权限后续补齐 -->
@@ -264,7 +271,7 @@
                     </el-button>
                     <template #dropdown>
                       <el-dropdown-menu>
-                        <!--判断下 物流类型 + 状态，快递 + 待发货时展示【发货】按钮 -->
+                        <!-- 如果是【快递】，并且【未发货】，则展示【发货】按钮 -->
                         <el-dropdown-item
                           v-if="scope.row.deliveryType === 1 && scope.row.status === 10"
                           command="delivery"
@@ -272,9 +279,8 @@
                           <Icon icon="ep:takeaway-box" />
                           发货
                         </el-dropdown-item>
-                        <el-dropdown-item command="orderRemarks">
-                          <Icon icon="ep:chat-line-square" />
-                          订单备注
+                        <el-dropdown-item command="remark">
+                          <Icon icon="ep:chat-line-square" /> 备注
                         </el-dropdown-item>
                       </el-dropdown-menu>
                     </template>
@@ -464,6 +470,6 @@ onMounted(async () => {
 </script>
 <style lang="scss" scoped>
 :deep(.order-table-col > .cell) {
-  padding: 0px;
+  padding: 0;
 }
 </style>