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

Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store

Browse Source
This commit is contained in:
liu 2024-06-11 18:09:15 +08:00
commit 4ef2a02134
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/system_store/SystemStoreLogic.php
View File

@ -46,6 +46,8 @@ class SystemStoreLogic extends BaseLogic
'city' => $params['city_code'], 'city' => $params['city_code'],
'area' => $params['area_code'], 'area' => $params['area_code'],
'street' => $params['street_code'], 'street' => $params['street_code'],
'is_store' => $params['is_store'] ?? 0,
'is_send' => $params['is_send'] ?? 0,
]); ]);
$taff = [ $taff = [
'store_id' => $store['id'], 'store_id' => $store['id'],

6
app/api/lists/product/ProductLists.php
View File

@ -76,6 +76,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface
public function lists(): array public function lists(): array
{ {
$class_all=$this->request->get('class_all'); $class_all=$this->request->get('class_all');
$cate_id=$this->request->get('class');
$name = $this->request->get('name',''); $name = $this->request->get('name','');
$order_param = $this->request->get('order'); $order_param = $this->request->get('order');
$store_id = $this->request->get('store_id',2); $store_id = $this->request->get('store_id',2);
@ -88,9 +89,9 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface
if($arr){ if($arr){
$arr2=Cate::where('pid','in',$arr)->column('id'); $arr2=Cate::where('pid','in',$arr)->column('id');
$where[]=['cate_id','in',array_merge($arr,$arr2)]; $where[]=['cate_id','in',array_merge($arr,$arr2)];
}else{
$where[]=['cate_id','=',$class_all];
} }
}else{
$where[]=['cate_id','=',$cate_id];
} }
if(!empty($order_param)){ if(!empty($order_param)){
@ -117,7 +118,6 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface
}else{ }else{
$where[]=['store_id','=',2]; $where[]=['store_id','=',2];
} }
$M_store_id=$this->request->__get('store_id'); $M_store_id=$this->request->__get('store_id');
if($M_store_id){ if($M_store_id){
$where[]=['store_id','=',$M_store_id]; $where[]=['store_id','=',$M_store_id];