Merge remote-tracking branch 'origin/preview' into dev

.example.env

@@ -16,7 +16,16 @@ USERNAME = preview_shop_lihaink_cn
 PASSWORD = HwQ2RsjDTDJWcS7r
 CHARSET  = utf8mb4
 DEBUG    = true
-
+[DATABASE]
+TYPE = mysql
+HOSTNAME = 47.109.36.146
+DATABASE = ceshi_shop_lihaink_cn
+PREFIX   = eb_
+HOSTPORT = 3306
+USERNAME = ceshi_shop_lihaink_cn
+PASSWORD = 4EfPeWfkx2rtGQef
+CHARSET  = utf8mb4
+DEBUG    = true
 [LANG]
 default_lang = zh-cn
 

app/common/repositories/store/product/ProductRepository.php

@@ -767,7 +767,6 @@ class ProductRepository extends BaseRepository
                         } 
                     }
     
-    
                 }
             }else{
                 $content = $arr;
@@ -1254,24 +1253,10 @@ class ProductRepository extends BaseRepository
         $res->append($append);
         if ($res['content'] && $res['content']['type'] == 1) {
             $content= json_decode($res['content']['content']);
-            if(is_Array($content) && isset($content['image'])){
+            if(isset($content['image'])){
-                // $img='<p>';
-                $image= $content['image']??[];
-                // foreach($content['image'] as $k=>$v){
-                //     $img =$img. '<img src="'.$v.'"/>';
-                // }
-                $res['content']['content']=['image'=>$image];
-
-            }elseif(is_object($content)){
-               $image= $content->image??[];
-            //    $img='<p>';
-            //     foreach($image as $k=>$v){
-            //         $img =$img. '<img src="'.$v.'"/>';
-            //     }
-                $res['content']['content']=['image'=>$image];
-            }
-            else{
                 $res['content']['content'] =$content;
+            }else{
+                $res['content']['content'] =['image'=>$content];
             }
         }