花材

app-hd/controllers/IntraCityController.php

@@ -387,7 +387,7 @@ class IntraCityController extends BaseController
             }
         }
         if (empty($itemList)) {
-            $itemList = [['item_name' => '鲜花花材', 'item_pic_url' => imgUtil::groupImg(''), 'count' => $goodsNum]];
+            $itemList = [['item_name' => '花材', 'item_pic_url' => imgUtil::groupImg(''), 'count' => $goodsNum]];
         }
 
         $cargoName = $orderType == 1 ? '花束' : '花材';

app-hd/controllers/MainController.php

@@ -174,8 +174,12 @@ class MainController extends BaseController
         $flowerPage = 'pages/item/item';
         $flowerImgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $flowerPage, $scene, $ptStyle);
 
+        $sjName = $shop->merchantName ?? '';
+        $shopName = $shop->shopName ?? '';
+        $name = $shopName == '首店' ? $sjName : $sjName . $shopName;
+
         $prefix = imgUtil::getPrefix();
-        $titleBase64 = stringUtil::ossBase64('鲜花花材');
+        $titleBase64 = stringUtil::ossBase64($name);
 
         if ($pfShopId > 0) {
             $flowerUrl = $prefix . 'shop/miniCodeBg.jpg?x-oss-process=image';