Merge branch 'dev'

app/controller/api/warehouse/Home.php

@@ -31,7 +31,8 @@ class Home extends BaseController
     //大仓分类
     public function classify(){
 
-        $merid=$this->merId;
+        // $merid=$this->merId;
+        $merid = $this->request->param('mer_id');
         $cate_arr=[];
         $list = Db::name('store_category')
             -> where('is_show',1)
@@ -49,6 +50,19 @@ class Home extends BaseController
             -> order('sort desc')
             -> group('cate_name')
             -> select();
+        if ($merid) {
+            foreach ($list as $key => $item) {
+                $product = Db::name('store_product')
+                    ->where('is_show',1)
+                    ->where('status',1)
+                    ->where('mer_id',$merid)
+                    ->where('cate_id',$item['store_category_id'])
+                    ->limit(1)
+                    ->find();
+                if(!$product) unset($list[$key]);
+            }
+        }
+
         return app('json')->success($list);
 
     }