更新

app-hd/controllers/GoodsController.php

@@ -185,9 +185,22 @@ class GoodsController extends BaseController
         }
         GoodsClass::valid($goods, $this->mainId);
         $cover = $goods->cover ?? '';
+        if (empty($cover)) {
+            $shopImg = $goods->shopImg ?? '';
+            if (!empty($shopImg)) {
+                $imgArr = is_string($shopImg) ? json_decode($shopImg, true) : $shopImg;
+                if (!empty($imgArr[0])) {
+                    $cover = $imgArr[0];
+                }
+            }
+        }
         if (empty($cover)) {
             util::fail('请先上传花束封面');
         }
+        // OSS 水印只认桶内相对路径，与花材海报一致，不可 groupImg 拼域名
+        if (strpos($cover, 'http://') === 0 || strpos($cover, 'https://') === 0) {
+            $cover = ltrim(parse_url($cover, PHP_URL_PATH) ?? '', '/');
+        }
 
         $merchant = WxOpenClass::getMallWxInfo();
         $page = 'pages/goods/detail';
@@ -220,7 +233,7 @@ class GoodsController extends BaseController
         $newStaffName = $staffName . ' 为您推荐';
         $staffNameBase64 = stringUtil::ossBase64($newStaffName);
 
-        $goodsCover = imgUtil::groupImg($cover) . '?x-oss-process=image/resize,m_fill,h_750,w_750';
+        $goodsCover = $cover . '?x-oss-process=image/resize,m_fill,h_750,w_750';
         $goodsCoverBase64 = stringUtil::ossBase64($goodsCover);
 
         $logoBase64 = '';