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

Merge pull request 'dev' (#45) from dev into preview

Browse Source 
Reviewed-on: #45
This commit is contained in:
mkm 2023-10-17 09:33:49 +08:00
commit df8a2432b9
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
app/controller/api/Auth.php
View File

@ -358,6 +358,12 @@ class Auth extends BaseController
$thirdList[] = $temp;
}
$data['thirdparty'] = $thirdList;
$arr=env('APP_SHOW')??[];
if(in_array($user['uid'],$arr )){
$data['show_controller_applet']=true;
}else{
$data['show_controller_applet']=false;
}
return app('json')->success($data);
}