From 83e780da06daf38da658c1745bc963e90b9b7209 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 22 Aug 2023 17:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=87=8D=E6=9E=84:=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E3=80=81=E8=AE=A2=E5=8D=95=E8=B0=83=E4=BB=B7?=
 =?UTF-8?q?=E3=80=81=E8=AE=A2=E5=8D=95=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/trade/order/components/DeliveryOrderForm.vue |  1 +
 src/views/mall/trade/order/index.vue                  | 11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/views/mall/trade/order/components/DeliveryOrderForm.vue b/src/views/mall/trade/order/components/DeliveryOrderForm.vue
index 579a376c..5bb2ab84 100644
--- a/src/views/mall/trade/order/components/DeliveryOrderForm.vue
+++ b/src/views/mall/trade/order/components/DeliveryOrderForm.vue
@@ -66,6 +66,7 @@ const submitForm = async () => {
     const data = unref(formData)
     if (radio.value === '2') {
       data.logisticsId = 0
+      data.logisticsNo = ''
     }
     await TradeOrderApi.delivery(data)
     message.success(t('common.updateSuccess'))
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
index 4c59f97f..7bc67d96 100644
--- a/src/views/mall/trade/order/index.vue
+++ b/src/views/mall/trade/order/index.vue
@@ -164,7 +164,7 @@
             </el-table-column>
             <el-table-column align="center" label="配送方式" width="120">
               <template #default>
-                <span>{{ scope.row.deliveryType || '快递' }}</span>
+                <dict-tag :type="DICT_TYPE.DELIVERY_TYPE" :value="scope.row.deliveryType" />
               </template>
             </el-table-column>
             <el-table-column align="center" fixed="right" label="操作" width="160">
@@ -189,10 +189,6 @@
                           <Icon icon="ep:chat-line-square" />
                           订单备注
                         </el-dropdown-item>
-                        <el-dropdown-item command="refund">
-                          <Icon icon="ep:credit-card" />
-                          立即退款
-                        </el-dropdown-item>
                       </el-dropdown-menu>
                     </template>
                   </el-dropdown>
@@ -221,7 +217,7 @@
         min-width="180"
         prop="payTime"
       />
-      <el-table-column align="center" label="支付类型" min-width="100" prop="payChannelCode">
+      <el-table-column align="center" label="支付类型" min-width="120" prop="payChannelCode">
         <template #default="{ row }">
           <dict-tag
             v-if="row.payChannelCode"
@@ -314,13 +310,10 @@ const spanMethod = ({ rowIndex, columnIndex }: SpanMethodProps) => {
 }
 /** 操作分发 */
 const handleCommand = (command: string, row: OrderVO) => {
-  console.log(row)
   switch (command) {
     case 'orderRemarks':
       orderRemarksFormRef.value?.open(row)
       break
-    case 'refund':
-      break
     case 'delivery':
       deliveryOrderFormRef.value?.open(row.id)
       break