moonsflyer 5 месяцев назад
Родитель
Сommit
35c15978b6
2 измененных файлов с 4 добавлено и 3 удалено
  1. 2 1
      app/shopapi/lists/OrderLists.php
  2. 2 2
      app/shopapi/logic/Order/OrderBtnLogic.php

+ 2 - 1
app/shopapi/lists/OrderLists.php

@@ -49,12 +49,13 @@ class OrderLists extends BaseShopDataLists
                     ->append(['goods_image', 'spec_value_str'])
                     ->hidden(['goods_snap']);
             }])
-            ->field(['id', 'sn', 'order_type', 'order_status', 'total_num', 'order_amount', 'delivery_type', 'is_team_success', 'pay_way', 'pay_status', 'pay_time', 'express_status','delivery_content', 'delivery_content1', 'delivery_content_type', 'create_time', 'presell_id', 'transaction_id' ])
+            ->field(['id', 'sn', 'order_type', 'order_status', 'total_num', 'order_amount', 'delivery_type', 'is_team_success', 'pay_way', 'pay_status', 'pay_time', 'express_status','delivery_content', 'delivery_content1', 'delivery_content_type', 'create_time', 'presell_id', 'transaction_id' ,'is_after_sale' ,'after_sale_status' ])
             ->append(['btn'])
             ->order(['id' => 'desc'])
             ->limit($this->limitOffset, $this->limitLength)
             ->select()->toArray();
 
+
         foreach ($lists as &$list){
             //查看提货码按钮
             $list['btn']['pickup_btn'] = ($list['order_status'] == OrderEnum::STATUS_WAIT_DELIVERY && $list['delivery_type'] == DeliveryEnum::SELF_DELIVERY) ? 1 : 0;

+ 2 - 2
app/shopapi/logic/Order/OrderBtnLogic.php

@@ -55,8 +55,8 @@ 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), //重新申请
+//            'express_btn'   => self::getExpressBtn($order), //快递单号btn
+//            'reapply_btn'   => self::getReapplyBtn($order), //重新申请
         ];
     }