1

app/shopapi/lists/OrderLists.php

@@ -74,8 +74,6 @@ class OrderLists extends BaseShopDataLists
                 $list['order_status_desc'] = ($list['order_status'] == OrderEnum::STATUS_WAIT_DELIVERY) ? TeamEnum::getStatusDesc($list['is_team_success']) : OrderEnum::getOrderStatusDesc($list['order_status']);
             }
 
-
-
             //订单类型
             $list['order_type_desc'] = ($list['delivery_type'] == DeliveryEnum::SELF_DELIVERY) ? '自提订单' : OrderEnum::getOrderTypeDesc($list['order_type']);
             
@@ -87,15 +85,15 @@ class OrderLists extends BaseShopDataLists
             if($this->params['type'] == 'return'){
                 $afterOrder = AfterSale::where(['order_id'=>$list['id']])->find();
                 $list['after_order'] = $afterOrder;
-                $list['btn']['confirm_btn'] = 0 ;
-                $list['btn']['delivery_btn'] = 0 ;
-            }
-
-            if($this->params['type'] == 'take'){
-                $list['btn']['express_btn'] = 0 ;
-                $list['btn']['reapply_btn'] = 0 ;
-                $list['btn']['return_cancel_btn'] = 0 ;
+//                $list['btn']['confirm_btn'] = 0 ;
+//                $list['btn']['delivery_btn'] = 0 ;
             }
+//
+//            if($this->params['type'] == 'take'){
+//                $list['btn']['express_btn'] = 0 ;
+//                $list['btn']['reapply_btn'] = 0 ;
+//                $list['btn']['return_cancel_btn'] = 0 ;
+//            }
 
         }
 

app/shopapi/logic/Order/OrderBtnLogic.php

@@ -55,9 +55,9 @@ class OrderBtnLogic extends BaseLogic
             'refund_btn'    => self::getRefundBtn($order),
             'delete_btn'    => self::getDeletedBtn($order),
             'content_btn'   => self::getContentBtn($order),
-            'express_btn'   => self::getExpressBtn($order), //快递单号btn
-            'reapply_btn'   => self::getReapplyBtn($order), //重新申请
-            'return_cancel_btn'    => self::getReturnCancelBtn($order),  //撤销申请
+//            'express_btn'   => self::getExpressBtn($order), //快递单号btn
+//            'reapply_btn'   => self::getReapplyBtn($order), //重新申请
+//            'return_cancel_btn'    => self::getReturnCancelBtn($order),  //撤销申请
         ];
     }