|
@@ -134,19 +134,21 @@ class Purchase extends Auth
|
|
|
$list=$query
|
|
|
->paginate($request['limit']?:15)->toArray();
|
|
|
|
|
|
- foreach ($list['data'] as $k=>$v){
|
|
|
- $count = count($v['items']);
|
|
|
- $a = '';
|
|
|
- foreach ($v['items'] as $key=>$value){
|
|
|
- if($value['is_matched'] == 1){
|
|
|
- $a++;
|
|
|
- if($a == $count){
|
|
|
- unset($list['data'][$k]);
|
|
|
+ if($request['tab'] == 1){
|
|
|
+ foreach ($list['data'] as $k=>$v){
|
|
|
+ $count = count($v['items']);
|
|
|
+ $a = '';
|
|
|
+ foreach ($v['items'] as $key=>$value){
|
|
|
+ if($value['is_matched'] == 1){
|
|
|
+ $a++;
|
|
|
+ if($a == $count){
|
|
|
+ unset($list['data'][$k]);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ $list['data'] = array_values($list['data']);
|
|
|
}
|
|
|
- $list['data'] = array_values($list['data']);
|
|
|
$this->success('',$list);
|
|
|
}
|
|
|
|