From eb9883f387993fab9acba34b26ed04cfb724397c Mon Sep 17 00:00:00 2001
From: Yao <734770036@qq.com>
Date: Sat, 28 Sep 2024 13:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/order/Order.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/common/model/order/Order.php b/app/common/model/order/Order.php
index 4b5fbd04..9a929cc7 100755
--- a/app/common/model/order/Order.php
+++ b/app/common/model/order/Order.php
@@ -114,6 +114,7 @@ class Order extends Models
             OrderEnum::SECKILL_ORDER => '秒杀订单',
             OrderEnum::TEAM_ORDER => '拼团订单',
             OrderEnum::BARGAIN_ORDER => '砍价订单',
+            OrderEnum::GROUP_BUY=>'抢购订单',
         ];
 
         if ($type === true) {
@@ -303,7 +304,6 @@ class Order extends Models
      */
     public function getCancelBtnAttr($value, $data)
     {
-
         $btn = 0;
         if (is_string($data['create_time'])) {
             $data['create_time'] = strtotime($data['create_time']);
@@ -314,9 +314,10 @@ class Order extends Models
         if ($limit_time < time()) {
             return $btn;
         }
-        if($data['pay_status'] == PayEnum::ISPAID && $data['order_type'] == OrderEnum::GROUP_BUY){
+        if($data['pay_status'] == PayEnum::ISPAID && $data['order_type'] == '抢购订单'){
             return $btn;
         }
+
         if (($data['order_status'] == OrderEnum::ORDER_STATUS_NO_PAID && $data['pay_status'] == PayEnum::UNPAID)
             || ($data['pay_status'] == PayEnum::ISPAID && $data['order_status'] == OrderEnum::ORDER_STATUS_DELIVERY)) {
             $btn = 1;