From 407cec8df602010a089b5eff3d006b40cb76cd70 Mon Sep 17 00:00:00 2001
From: yangmf_0726 <13243152557@163.com>
Date: Sat, 11 Oct 2025 18:51:34 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=90=8E=E5=8F=B0=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local                           |  4 ++--
 src/api/mall/trade/order/index.ts    |  6 +++++-
 src/views/mall/trade/order/index.vue | 24 +++++++++++-------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.env.local b/.env.local
index bf41f464..07d4f5f3 100644
--- a/.env.local
+++ b/.env.local
@@ -4,9 +4,9 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='https://yffzpapi.zianxin.com'
+ VITE_BASE_URL='https://yffzpapi.zianxin.com'
 
-VITE_BASE_URL='http://localhost:48088'
+#VITE_BASE_URL='http://localhost:48088'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/api/mall/trade/order/index.ts b/src/api/mall/trade/order/index.ts
index c1f213d8..8cd76063 100644
--- a/src/api/mall/trade/order/index.ts
+++ b/src/api/mall/trade/order/index.ts
@@ -162,7 +162,11 @@ export const deliveryOrder100 = async (data: { id: number }) => {
   return await request.put({ url: `/trade/order/delivery-kuaidi100?id=${data.id}`, data })
 }
 
-// 订单备注
+// 订单取消（传入 id）
+export const cancelOrder = async (id: number) => {
+  return await request.put({ url: `/trade/order/cancel?id=${id}` })
+}
+
 export const updateOrderRemark = async (data: any) => {
   return await request.put({ url: `/trade/order/update-remark`, data })
 }
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
index ac8bcfcd..04259655 100644
--- a/src/views/mall/trade/order/index.vue
+++ b/src/views/mall/trade/order/index.vue
@@ -110,15 +110,9 @@
                     <Icon icon="ep:takeaway-box" />
                     发货
                   </el-dropdown-item>
-                  <el-dropdown-item
-                    v-if="row.deliveryType === DeliveryTypeEnum.EXPRESS.type &&
-                      (row.status === TradeOrderStatusEnum.DELIVERED.status || row.status === TradeOrderStatusEnum.COMPLETED.status)"
-                    command="print">
-                    <Icon icon="ep:printer" />
-                    打印
-                  </el-dropdown-item>
                   <el-dropdown-item v-if="row.deliveryType === DeliveryTypeEnum.EXPRESS.type &&
-                    row.status === TradeOrderStatusEnum.DELIVERED.status" command="cancel">
+                    (row.status === TradeOrderStatusEnum.DELIVERED.status ||
+                      row.status === TradeOrderStatusEnum.UNDELIVERED.status)" command="cancel">
                     <Icon icon="mingcute:delete-2-line" />
                     取消
                   </el-dropdown-item>
@@ -290,6 +284,7 @@ const currentOrderRow = ref<TradeOrderApi.OrderVO | null>(null) // 保存当前
 /** 操作分发 */
 const deliveryFormRef = ref()
 const updateRemarkForm = ref()
+// handleCommand 方法
 const handleCommand = (command: string, row: TradeOrderApi.OrderVO) => {
   switch (command) {
     case 'remark':
@@ -309,11 +304,14 @@ const handleCommand = (command: string, row: TradeOrderApi.OrderVO) => {
       }
       break
     case 'cancel':
-      // 取消订单
-      // TradeOrderApi.cancelOrder({ id: row.id }).then(() => {
-      ElMessage.success('订单已取消')
-    // getList()
-    // })
+      message
+        .confirm('确认取消该订单？')
+        .then(async () => {
+          await TradeOrderApi.cancelOrder(Number(row.id))
+          ElMessage.success('订单已取消')
+          await getList()
+        })
+      break
   }
 }