合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2590

@@ -345,6 +345,11 @@ class ProductLogic extends  BaseLogic
         }else{
         }else{
             $param['category_id'] = '';
             $param['category_id'] = '';
         }
         }
+        if(isset($param['og_image']) && !empty($param['og_image'])){
+            $param['og_image'] = str_replace_url($param['og_image'] ?? '');
+        }else{
+            $param['og_image'] = $param['gallery'][0]['url'] ?? '';
+        }
         //产品图
         //产品图
         if(isset($param['gallery']) && !empty($param['gallery'])){
         if(isset($param['gallery']) && !empty($param['gallery'])){
             foreach ($param['gallery'] as $k => $v){
             foreach ($param['gallery'] as $k => $v){
@@ -357,11 +362,6 @@ class ProductLogic extends  BaseLogic
             $param['thumb'] = Arr::a2s([]);
             $param['thumb'] = Arr::a2s([]);
             $param['gallery'] = Arr::a2s([]);
             $param['gallery'] = Arr::a2s([]);
         }
         }
-        if(isset($param['og_image']) && !empty($param['og_image'])){
-            $param['og_image'] = str_replace_url($param['og_image'] ?? '');
-        }else{
-            $param['og_image'] = $param['thumb']['url'] ?? '';
-        }
         if(isset($param['files'])){
         if(isset($param['files'])){
             $param['files']['url'] = str_replace_url($param['files']['url'] ?? '');
             $param['files']['url'] = str_replace_url($param['files']['url'] ?? '');
             $param['files'] = Arr::a2s($param['files'] ?? []);
             $param['files'] = Arr::a2s($param['files'] ?? []);