|
|
@@ -29,7 +29,7 @@ class ProductController extends BaseController
|
|
|
|
|
|
//访问店铺时用户增加最近访问的店铺 shish 2021.3.1
|
|
|
AdminClass::addRecentShop($this->lookShopId,$this->admin);
|
|
|
-
|
|
|
+
|
|
|
//获取所有当前供应商的分类 (全部、常用)
|
|
|
//根据分类组装分类下的花材信息
|
|
|
$classIds = ItemClassClass::getGhsItemClassAll($this->sjId);
|
|
|
@@ -44,6 +44,10 @@ class ProductController extends BaseController
|
|
|
$itemIds = array_intersect($itemIds,$pyNameItemIds);
|
|
|
}
|
|
|
$shopId = $this->shopId;
|
|
|
+ //兼容客户根据门店下单
|
|
|
+ if($this->lookShopId){
|
|
|
+ $shopId = $this->lookShopId;
|
|
|
+ }
|
|
|
//库存预警
|
|
|
if($type=='waring'){
|
|
|
//shopId 改为可以前端传,默认是当前shopId linqh 2021.1.26
|