合并分支 'wxg' 到 'master'

前台购买咨询功能、前台店铺详情页面



查看合并请求 !61

@@ -43,7 +43,7 @@ class Car extends Frontend
         $store = $storeModel->selectData(['id'=>['in',$store_ids]]);
         $store = collection($store)->toArray();
         foreach($store as $key1 => $s){
-            $car = $carModel->selectData(['store_id'=>$s['id']]);
+            $car = $carModel->selectData(['store_id'=>$s['id'],'user_id'=>$user_id]);
             foreach($car as $key2 => $c){
                 $goods = $goodsModel->findData(['g.id'=>$c['goods_id']]);
                 $car[$key2]['goods'] = $goods;