|
|
@@ -33,7 +33,7 @@ class Devices extends Model
|
|
|
$dataList = Devices::alias('d')
|
|
|
->join('user m', 'm.id=d.shop_uid', 'left')
|
|
|
->join('shop s', 's.user_id=d.shop_uid', 'left')
|
|
|
- ->field("m.id,s.name as shop_name,d.name as device_name,d.device_code,s.business_project,s.intro,s.contact_name,s.mobile,s.logo as thumb,d.show_device_code,d.lng,d.color_type,d.lat,distance('{$lng}','{$lat}',d.`lng`,d.`lat`) as dists, d.address as d_address, s.address,s.service_time")
|
|
|
+ ->field("m.id,s.id as shop_id,s.name as shop_name,d.name as device_name,d.device_code,s.business_project,s.intro,s.contact_name,s.mobile,s.logo as thumb,d.show_device_code,d.lng,d.color_type,d.lat,distance('{$lng}','{$lat}',d.`lng`,d.`lat`) as dists, d.address as d_address, s.address,s.service_time")
|
|
|
->where(function ($query) use ($lng, $lat, $distance, $distSql) {
|
|
|
if ($lng && $lat && $distance) {
|
|
|
return $query->where('', 'exp', $distSql);
|
