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 查看开票按钮