|
|
@@ -159,16 +159,17 @@ class SystemStore extends BaseModel
|
|
|
$model = $model->where('is_del', 0);
|
|
|
$model = $model->where('is_show', 1);
|
|
|
$order = '';
|
|
|
+ if ($store_user) {
|
|
|
+ $order = "store_user desc";
|
|
|
+ }
|
|
|
if ($latitude && $longitude) {
|
|
|
$model = $model->field(['*', self::distanceSql($latitude, $longitude)]);
|
|
|
- $order = 'distance asc';
|
|
|
- }
|
|
|
- if ($store_user) {
|
|
|
if ($order)
|
|
|
- $order .= ",store_user desc";
|
|
|
+ $order .= ",distance desc";
|
|
|
else
|
|
|
- $order .= "store_user desc";
|
|
|
+ $order .= "distance desc";
|
|
|
}
|
|
|
+
|
|
|
$list = $model->order($order)->page((int)$page, (int)$limit)
|
|
|
->select()
|
|
|
->hidden(['is_show', 'is_del'])
|