Merge branch 'master' into dev

app-hd/controllers/MainController.php

@@ -84,7 +84,7 @@ class MainController extends BaseController
         $goodsImgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $goodsPage, $scene, $ptStyle);
 
         $prefix = imgUtil::getPrefix();
-        $titleBase64 = stringUtil::ossBase64('扫码买花');
+        $titleBase64 = stringUtil::ossBase64('花束花篮');
 
         if ($pfShopId > 0) {
             $goodsUrl = $prefix . 'shop/miniCodeBg.jpg?x-oss-process=image';
@@ -171,7 +171,7 @@ class MainController extends BaseController
         $flowerImgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $flowerPage, $scene, $ptStyle);
 
         $prefix = imgUtil::getPrefix();
-        $titleBase64 = stringUtil::ossBase64('扫码买花');
+        $titleBase64 = stringUtil::ossBase64('花材绿植');
 
         if ($pfShopId > 0) {
             $flowerUrl = $prefix . 'shop/miniCodeBg.jpg?x-oss-process=image';