diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 32025ef..7e5ab6d 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -81,6 +81,7 @@ class ImsCjdcOrderMainController extends AdminController $grid->disableViewButton(); $grid->disableEditButton(); $grid->disableDeleteButton(); + $grid->disableCreateButton(); }); } diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php index 3508e61..e177df0 100644 --- a/app/Admin/Extensions/MyDetailPage.php +++ b/app/Admin/Extensions/MyDetailPage.php @@ -55,7 +55,7 @@ class MyDetailPage extends LazyRenderable coupon_money: "{$order['coupon_money']}", delivery_money: "{$order['delivery_money']}", horseman_name: "{$order['horseman_name']}", - distance: "{$order['distance']}", + distance: "{$order['delivery_distance']}", orders: JSON.parse(orders), show_refund: JSON.parse(show_refund), refund_2:"退款", diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php index 25849cc..7976d06 100644 --- a/app/Models/ImsCjdcOrderMain.php +++ b/app/Models/ImsCjdcOrderMain.php @@ -62,12 +62,12 @@ class ImsCjdcOrderMain extends Model $order['horseman_name'] = LanzuServiceHorseman::getName($order['horseman_id']); //获取市场经纬度 - $market = LanzuMarket::where('id',$order['market_id'])->first()->toArray(); - $order['distance'] = Rpc::getDistance($market['lng'],$market['lat'],$order['lng'],$order['lat'])['result']; - if ($order['distance']>1000){ - $order['distance']= number_format(($order['distance']/1000), 1) .'km'; + //$market = LanzuMarket::where('id',$order['market_id'])->first()->toArray(); + //$order['distance'] = Rpc::getDistance($market['lng'],$market['lat'],$order['lng'],$order['lat'])['result']; + if ($order['delivery_distance']>1000){ + $order['delivery_distance']= number_format(($order['delivery_distance']/1000), 1) .'km'; }else{ - $order['distance'].= '米'; + $order['delivery_distance'].= '米'; } return $order; }