|
@@ -59,13 +59,13 @@ class Order extends SubCommon
|
|
|
$model->where('order_no',$data['order_no']);
|
|
|
}
|
|
|
|
|
|
- $list=$model
|
|
|
+ $model
|
|
|
->with(['info'])
|
|
|
->order('id','desc');
|
|
|
|
|
|
$extend=[];
|
|
|
if($export){
|
|
|
- return MobileOrderExport::export($list);
|
|
|
+ return MobileOrderExport::export($model->paginate($limit));
|
|
|
}else{
|
|
|
$extend['total']=$model->sum('amount');
|
|
|
$extend['alipay']=$model->where('pay_type',1)->sum('amount');
|
|
@@ -76,7 +76,7 @@ class Order extends SubCommon
|
|
|
$extend['refund']=$model->sum('amount_refund');
|
|
|
}
|
|
|
|
|
|
- $list=$list->paginate($limit,false);
|
|
|
+ $list=$model->paginate($limit);
|
|
|
|
|
|
$this->assign('list',$list);
|
|
|
$this->assign('extend',$extend);
|