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

Merge pull request 'preview' (#46) from preview into master

Browse Source 
Reviewed-on: #46
This commit is contained in:
mkm 2023-10-17 09:34:11 +08:00
commit 8cedb08510
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

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

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

@ -358,6 +358,12 @@ class Auth extends BaseController
$thirdList[] = $temp; $thirdList[] = $temp;
} }
$data['thirdparty'] = $thirdList; $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); return app('json')->success($data);
} }