diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index c7293b6..11b8ce7 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -186,8 +186,8 @@ class OrderController extends Controller $order_price = 0; //订单总价 $costPrice = 0; //供应商成本总价 foreach ($spec as $v) { - $order_price = bcadd($order_price, bcmul($v['price'], $formData['num'], 6), 6); - $costPrice = bcadd($costPrice, bcmul($v['cost_price'], $formData['num'], 6), 6); + $order_price = bcadd($order_price, bcmul($v['price'], $formData['num'], 6), 6); //订单总价 + $costPrice = bcadd($costPrice, bcmul($v['cost_price'], $formData['num'], 6), 6); //供应商成本总价 } $order_price = round($order_price, 2); diff --git a/config/admin-agent.php b/config/admin-agent.php index 9e3aa99..4e75ba4 100644 --- a/config/admin-agent.php +++ b/config/admin-agent.php @@ -343,4 +343,12 @@ return [ | Whether enable default breadcrumb for every page content. */ 'enable_default_breadcrumb' => true, + + //地图配置 + 'map_provider' => 'tencent', + 'map' => [ + 'keys' => [ + 'tencent' => env('TENCENT_MAP_KEY','') + ] + ] ]; diff --git a/config/admin.php b/config/admin.php index e699c57..f5b8abb 100644 --- a/config/admin.php +++ b/config/admin.php @@ -363,4 +363,12 @@ return [ // the extension files will be generated in this directory. 'dir' => base_path('dcat-admin-extensions'), ], + + //地图配置 + 'map_provider' => 'tencent', + 'map' => [ + 'keys' => [ + 'tencent' => env('TENCENT_MAP_KEY','') + ] + ] ];