dlh/dlhmaster
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

已完成的订单添加删除订单按钮

Browse Source
This commit is contained in:
wangxiaowei 2024-07-27 14:32:11 +08:00
parent 4f8f505283
commit 170386e4a0
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/logic/OrderLogic.php
View File

@ -1429,8 +1429,6 @@ class OrderLogic extends Logic
//取消订单按钮 //取消订单按钮
$list['cancel_btn'] = 1; $list['cancel_btn'] = 1;
} }
$data = [ $data = [
'list' => $lists, 'list' => $lists,

6
app/common/model/order/Order.php
View File

@ -35,7 +35,7 @@ class Order extends Models
public function orderGoods() public function orderGoods()
{ {
return $this->hasMany('order_goods', 'order_id', 'id') 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) public function getDelBtnAttr($value, $data)
{ {
$btn = 0; $btn = 0;
if ( if (
($data['order_status'] == OrderEnum::ORDER_STATUS_DOWN && $data['pay_status'] == PayEnum::UNPAID) || ($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; $btn = 1;
} }