1

app/shopapi/lists/OrderLists.php

@@ -40,10 +40,11 @@ class OrderLists extends BaseShopDataLists
      */
     public function lists(): array
     {
-        $r_where = [] ;
-        if($this->params['type'] == 'return'){
-            $r_where[] = ['is_after_sale', '=', 1];
-        }
+//        $r_where = [] ;
+//        if($this->params['type'] == 'return'){
+//            $r_where[] = ['is_after_sale', '=', 1];
+//        }
+
         $lists = Order::withSearch(['order_type', 'user_id'], [
                 'order_type' => $this->params['type'],
                 'user_id' => $this->userId
@@ -53,7 +54,7 @@ class OrderLists extends BaseShopDataLists
                     ->append(['goods_image', 'spec_value_str'])
                     ->hidden(['goods_snap']);
             }])
-            ->where($r_where)
+//            ->where($r_where)
             ->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'])