门店名称

app-mall/controllers/OrderController.php

@@ -140,7 +140,14 @@ class OrderController extends BaseController
     public function actionOrderRelate()
     {
         $regionTree = RegionService::tree();
+
+        //门店名称
         $shop = isset($this->shop) && !empty($this->shop) ? $this->shop->attributes : [];
+        $sjName = $shop['merchantName'] ?? '';
+        $shopName = $shop['shopName'] ?? '';
+        $default = $shop['default'] ?? 0;
+        $shop['showName'] = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+
         $freight = ['first' => 5, 'add' => 2];
         $mapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
         $out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey, 'merchant' => $shop];