|
|
@@ -35,7 +35,7 @@ class Product extends Model
|
|
|
}
|
|
|
}else{
|
|
|
if($data['sort'] == 'sort'){
|
|
|
- $model->where('is_best', 1)->order('sort DESC, add_time DESC');
|
|
|
+ $model->where('is_best', 1)->order('stars DESC, add_time DESC');
|
|
|
}
|
|
|
}
|
|
|
if($data['sort'] == 'sales'){
|
|
|
@@ -47,7 +47,7 @@ class Product extends Model
|
|
|
if($data['sort'] == 'new'){
|
|
|
$model->order('add_time DESC');
|
|
|
}
|
|
|
- $list = $model->page((int)$page, (int)$limit)->field('id,store_name,image,price,cost,ot_price,(price-ot_price) as commission,IFNULL(sales,0) + IFNULL(ficti,0) as sales')->select();
|
|
|
+ $list = $model->page((int)$page, (int)$limit)->field('id,store_name,image,price,cost,ot_price,(price-ot_price) as commission,IFNULL(sales,0) + IFNULL(ficti,0) as sales,label')->select();
|
|
|
$list = count($list) ? $list->toArray() : [];
|
|
|
return $list;
|
|
|
}
|