|
|
@@ -73,7 +73,13 @@ class Product extends BaseController
|
|
|
'mer_form_id',
|
|
|
'cate_hot'
|
|
|
]);
|
|
|
-
|
|
|
+ if ($where['is_ficti']==1){
|
|
|
+ $where['is_ficti'] = 0;
|
|
|
+ $where['is_gift'] = 1;
|
|
|
+ }elseif ($where['is_ficti']==2){
|
|
|
+ $where['is_ficti'] = 0;
|
|
|
+ $where['is_oil'] = 1;
|
|
|
+ }
|
|
|
// 根据类型和商家ID获取查询条件
|
|
|
$where = array_merge($where, $this->repository->switchType($type, $this->request->merId(), 0));
|
|
|
// 调用仓库方法获取列表数据并返回JSON格式的响应
|
