Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/hainan

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

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','')
+		]
+	]
 ];

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','')
+		]
+	]
 ];