From 52c92731c81ac62ea049525d36bace7efb63ed6f Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Thu, 12 Nov 2026 09:49:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E5=A4=8D=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=8F=8A=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 canShowRefundTag 函数，未支付订单不再展示退款标签
- 已取消(CANCELLED)订单的支付方式字段返回空字符串
- 修改 isUnpaid 函数，排除已取消订单被误判为未支付状态
---
 buyer/src/pages/home/orderCenter/MyOrder.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue
index 364c5753f..1fe6a8ea7 100644
--- a/buyer/src/pages/home/orderCenter/MyOrder.vue
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@@ -73,7 +73,7 @@
                   </div>
                   <div class="goods-num">共{{ goods.num }}件</div>
                   <div class="goods-extra">
-                    <el-tag v-if="refundPriceList(goods.isRefund) && !isUnpaid(order)" type="warning" size="small">{{ refundPriceList(goods.isRefund) }}</el-tag>
+                    <el-tag v-if="canShowRefundTag(order, goods)" type="warning" size="small">{{ refundPriceList(goods.isRefund) }}</el-tag>
                   </div>
                 </div>
               </div>
@@ -160,7 +160,7 @@
                 </div>
                 <div class="goods-num">共{{ goods.num }}件</div>
                 <div class="goods-extra">
-                  <el-tag v-if="refundPriceList(goods.isRefund) && !isUnpaid(order)" type="warning" size="small">{{ refundPriceList(goods.isRefund) }}</el-tag>
+                  <el-tag v-if="canShowRefundTag(order, goods)" type="warning" size="small">{{ refundPriceList(goods.isRefund) }}</el-tag>
                 </div>
               </div>
             </div>
@@ -264,6 +264,11 @@ function refundPriceList(status) {
       return "";
   }
 }
+function canShowRefundTag (order, goods) {
+  // 未支付订单未发生资金交易，不展示退款标签
+  if (!order || order.payStatus !== 'PAID') return false;
+  return !!refundPriceList(goods?.isRefund);
+}
 function goodsDetail (skuId, goodsId) {
   // 跳转商品详情
   let routeUrl = router.resolve({
@@ -445,13 +450,16 @@ function paymentLabel (order) {
   if (order.paymentMethod && map[order.paymentMethod]) {
     return map[order.paymentMethod]
   }
+  if (order.orderStatus === 'CANCELLED') {
+    return ''
+  }
   if (isUnpaid(order)) {
     return '待支付'
   }
   return ''
 }
 function isUnpaid (order) {
-  return order.payStatus === 'UNPAID' || order.orderStatus === 'UNPAID'
+  return (order.payStatus === 'UNPAID' || order.orderStatus === 'UNPAID') && order.orderStatus !== 'CANCELLED'
 }
 
 watch(() => route.query.tag, () => {