|
|
@@ -130,10 +130,11 @@ class OrderController extends BaseController
|
|
|
$regionTree = RegionService::tree();
|
|
|
$shop = ShopService::getDefaultShop($this->merchant);
|
|
|
$freight = MerchantExtendService::getFreight($this->merchantExtend);
|
|
|
- $out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree];
|
|
|
+ $mapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
|
|
|
+ $out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'mapKey' => $mapKey];
|
|
|
util::success($out);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//余额支付 shish 2019.12.6
|
|
|
public function actionBalancePay()
|
|
|
{
|
shish