From 2f3b0ca5022f7097df8c67269c6720fe917ab59b Mon Sep 17 00:00:00 2001 From: wuhaotian <442384644@qq.com> Date: Tue, 3 Jun 2025 16:41:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E6=9D=BF=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketing/storeIntegralOrder/components/tableList.vue | 2 +- .../src/pages/order/orderList/components/tableList.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue index fbe39cddd..22c4c67a5 100644 --- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue +++ b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue @@ -14,7 +14,7 @@ - 用户已删除 + 用户已删除 diff --git a/template/admin/src/pages/order/orderList/components/tableList.vue b/template/admin/src/pages/order/orderList/components/tableList.vue index d036b0472..d05623c1f 100644 --- a/template/admin/src/pages/order/orderList/components/tableList.vue +++ b/template/admin/src/pages/order/orderList/components/tableList.vue @@ -40,8 +40,8 @@ {{ scope.row.order_id }} {{ scope.row.pink_name }} - 用户已删除 - 订单已退款 + 用户已删除 + 订单已退款 @@ -133,7 +133,7 @@ (scope.row.status === 4 || scope.row._status === 2 || scope.row._status === 8) && scope.row.shipping_type === 1 && (scope.row.pinkStatus === null || scope.row.pinkStatus === 2) && - scope.row.is_del !== 1 && + scope.row.is_del !== 1 && !scope.row.refund.length " >发送货