|
|
@ -105,7 +105,7 @@ class Order extends OrderModel |
|
|
|
$query = $query->whereOr($filterOr); |
|
|
|
$query = $query->whereOr($filterOr); |
|
|
|
} |
|
|
|
} |
|
|
|
$list = $query->order(['order.create_time' => 'desc']) |
|
|
|
$list = $query->order(['order.create_time' => 'desc']) |
|
|
|
->paginate(10); |
|
|
|
->paginate($param['pageSize'] ?? 15); |
|
|
|
return $list; |
|
|
|
return $list; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -161,7 +161,7 @@ class Order extends OrderModel |
|
|
|
} |
|
|
|
} |
|
|
|
// 加载关联订单数据 |
|
|
|
// 加载关联订单数据 |
|
|
|
$list = $query->order(['order.create_time' => 'desc']) |
|
|
|
$list = $query->order(['order.create_time' => 'desc']) |
|
|
|
->paginate(10); |
|
|
|
->paginate($param['pageSize'] ?? 15); |
|
|
|
$list = static::preload($list, ['goods.image', 'user.avatar', 'address', 'delivery'], true); |
|
|
|
$list = static::preload($list, ['goods.image', 'user.avatar', 'address', 'delivery'], true); |
|
|
|
return $list; |
|
|
|
return $list; |
|
|
|
} |
|
|
|
} |
|
|
|