From 170386e4a046e05b8950ad0bb21ebd48ae884af0 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Sat, 27 Jul 2024 14:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/OrderLogic.php     | 2 --
 app/common/model/order/Order.php | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php
index 342c0f44..d19584f7 100644
--- a/app/api/logic/OrderLogic.php
+++ b/app/api/logic/OrderLogic.php
@@ -1429,8 +1429,6 @@ class OrderLogic extends Logic
 
             //取消订单按钮
             $list['cancel_btn'] = 1;
-
-
         }
         $data = [
             'list' => $lists,
diff --git a/app/common/model/order/Order.php b/app/common/model/order/Order.php
index db4ad70b..f031ec14 100644
--- a/app/common/model/order/Order.php
+++ b/app/common/model/order/Order.php
@@ -35,7 +35,7 @@ class Order extends Models
     public function orderGoods()
     {
         return $this->hasMany('order_goods', 'order_id', 'id')
-            ->field('id,order_id,p_id,w_price,goods_id,item_id,goods_name,goods_price,spec_value,image,goods_num,is_comment,refund_status,commission_ratio,total_pay_price');
+            ->field('id,order_id,goods_id,item_id,goods_name,goods_price,spec_value,image,goods_num,is_comment,refund_status,commission_ratio,total_pay_price');
     }
 
     /**
@@ -380,11 +380,11 @@ class Order extends Models
      */
     public function getDelBtnAttr($value, $data)
     {
-
         $btn = 0;
         if (
             ($data['order_status'] == OrderEnum::ORDER_STATUS_DOWN && $data['pay_status'] == PayEnum::UNPAID) ||
-            ($data['order_status'] == OrderEnum::ORDER_STATUS_DOWN && $data['pay_status'] == PayEnum::REFUNDED)
+            ($data['order_status'] == OrderEnum::ORDER_STATUS_DOWN && $data['pay_status'] == PayEnum::REFUNDED) ||
+            ($data['order_status'] == OrderEnum::ORDER_STATUS_COMPLETE)
         ) {
             $btn = 1;
         }
@@ -496,7 +496,7 @@ class Order extends Models
         }
         return $btn;
     }
-    
+
 
     /**
      * @notes 查看开票按钮