diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php index 15865f0..d71b502 100644 --- a/app/Controller/v3/OrderOnlineController.php +++ b/app/Controller/v3/OrderOnlineController.php @@ -109,9 +109,9 @@ class OrderOnlineController extends BaseController $deliveryDistance = config('distance.delivery_distance'); if(isset($distance) && $distance < $deliveryDistance){ if($distance >= 1000){ - $distance_text = '距离' . bcdiv($distance,1000,2) . ' km'; + $distance_text = '距 ' . bcdiv($distance,1000,2) . 'km'; }else{ - $distance_text = '距离' . $distance . ' m'; + $distance_text = '距 ' . $distance . 'm'; } $distributionPrice = $this->distributionPriceService->do($distance); $res['location'] = [ @@ -119,7 +119,7 @@ class OrderOnlineController extends BaseController 'distribution_price' => $distributionPrice, 'distance' => $distance, 'within' => true, - 'distribution_text' => '¥ '.$distributionPrice .'(' .$distance_text .')' + 'distribution_text' => '¥ '.$distributionPrice .'(' .$distance_text .')' ]; }else{ $res['location'] = [ diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php index 60fe819..3a158df 100644 --- a/app/Service/v3/Implementations/UserAddressService.php +++ b/app/Service/v3/Implementations/UserAddressService.php @@ -99,14 +99,14 @@ class UserAddressService implements UserAddressServiceInterface $distance = $this->locationService->getDistanceByTencent($market->lng,$market->lat,$address['address']->lng,$address['address']->lat); $distributionPrice = $this->distributionPriceService->do($distance); if($distance >= 1000){ - $distance_text = '距离' . bcdiv($distance,1000,2) . ' km'; + $distance_text = '距 ' . bcdiv($distance,1000,2) . 'km'; }else{ - $distance_text = '距离' . $distance . ' m'; + $distance_text = '距 ' . $distance . 'm'; } $res['address'] = $address; $res['delivery_distance'] = $distance; $res['distribution_price'] = $distributionPrice; - $res['distribution_text'] = '¥ '.$distributionPrice .'(' .$distance_text .')'; + $res['distribution_text'] = '¥ '.$distributionPrice .'(' .$distance_text .')'; return $res; }