Merge pull request '修复问题' (#11) from dev into master

Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/11
This commit is contained in:
mkm 2023-05-22 11:54:40 +08:00
commit 9ff9e05d92

View File

@ -101,8 +101,8 @@ class StoreSpu extends BaseController
'keyword', 'cate_id', 'order', 'price_on', 'price_off', 'brand_id', 'pid', 'mer_cate_id', ['product_type', 0], 'action', 'common'
]);
if ($where['action']) unset($where['product_type']);
$category_id=Db::name('merchant')->where('mer_id',$id)->value('category_id');
$mer_id=Db::name('merchant')->where('mer_state',1)->where('status',1)->where('category_id',$category_id)->where('type_id',11)->value('mer_id');
// $category_id=Db::name('merchant')->where('mer_id',$id)->value('category_id');->where('category_id',$category_id)
$mer_id=Db::name('merchant')->where('mer_state',1)->where('status',1)->where('type_id',11)->value('mer_id');
if (!$mer_id){
return app('json')->success(['count'=>0,'list'=>[]]);