From 01bf2fefdfd6507464c3b21c77e09aa5e4546682 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Tue, 15 Sep 2020 20:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AE=A2=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ImsCjdcOrderMainController.php |  1 +
 app/Admin/Extensions/MyDetailPage.php                |  2 +-
 app/Models/ImsCjdcOrderMain.php                      | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

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;
     }