Merge branch 'master' into dev

app-ghs/controllers/MerchantController.php

@@ -53,6 +53,10 @@ class MerchantController extends BaseController
         $merchant['hsFreeKm'] = $intraCityRet['hsFreeKm'];
         $merchant['hsAddFee'] = $intraCityRet['hsAddFee'];
 
+        $shop = $this->shop;
+        $pfLevel = $shop->pfLevel ?? 0;
+        $merchant['pfLevel'] = $pfLevel;
+
         util::success($merchant);
     }
 
@@ -144,4 +148,4 @@ class MerchantController extends BaseController
         util::success(['introduce' => $merchant]);
     }
 
-}
+}

app-mall/controllers/ShopController.php

@@ -28,34 +28,41 @@ class ShopController extends BaseController
         // 测试 / 正式各写死 3 家；shopId 请换成真实 xhShop.id（ptStyle=1）
         $rows = $isProd
             ? [
-                [
-                    'shopId' => 2,
-                    'name' => '龙岩花掌柜',
-                    'address' => '龙岩市交易城新杰路138号',
-                    'businessHours' => '09:00-22:00',
-                    'cover' => 'hhb/images/guest/shop1.jpg',
-                ],
                 [
                     'shopId' => 501,
                     'name' => '楼兰花艺',
-                    'address' => '深圳市龙岗区坂田街道岗头社区中围路33号',
+                    'address' => '厦门市集美区凤林前山路147号',
                     'businessHours' => '09:00-22:00',
                     'cover' => 'shop/wsf_ll.png',
                 ],
                 [
-                    'shopId' => 106502,
-                    'name' => '吉星鲜花',
-                    'address' => '福州市仓山区浦上大道339-30号',
+                    'shopId' => 1,
+                    'name' => '国兰花尚',
+                    'address' => '厦门市思明区后埭溪路128号',
                     'businessHours' => '09:00-22:00',
                     'cover' => 'hhb/images/guest/shop2.jpg',
                 ],
                 [
-                    'shopId' => 106473,
-                    'name' => '大自然鲜花',
-                    'address' => '漳州市龙海区鸿江路15号',
+                    'shopId' => 17117,
+                    'name' => '淘花里鲜花',
+                    'address' => '广东省中山市歧关西路20号',
                     'businessHours' => '09:00-22:00',
                     'cover' => 'hhb/images/guest/shop3.jpg',
                 ],
+                [
+                    'shopId' => 77702,
+                    'name' => '天天鲜花',
+                    'address' => '厦门市思明区双涵路97号',
+                    'businessHours' => '09:00-22:00',
+                    'cover' => 'hhb/images/guest/shop1.jpg',
+                ],
+                [
+                    'shopId' => 2,
+                    'name' => '龙岩花掌柜',
+                    'address' => '龙岩市交易城C区',
+                    'businessHours' => '09:00-22:00',
+                    'cover' => 'hhb/images/guest/shop2.jpg',
+                ]
             ]
             : [
                 [