mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
shengchanzhe 2023-10-17 09:26:52 +08:00
commit 237ae4b863
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.example.env
View File

@ -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

23
app/common/repositories/store/product/ProductRepository.php
View File

@ -766,7 +766,6 @@ class ProductRepository extends BaseRepository
$content.='<img src='.$v.'></br>';
}
}
}
}else{
@ -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'])){
// $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;
if(isset($content['image'])){
$res['content']['content'] =$content;
}else{
$res['content']['content'] =['image'=>$content];
}
}