Merge branch 'phoenix' into develop

app/Admin/Controllers/v3/GoodsNewController.php

@@ -28,6 +28,8 @@ class GoodsNewController extends AdminController
            
             // 二级分类
             $categoryList = CategoryModel::getArray([['parent_id','>',0]],[0=>'选择分类']);
+            // 店铺
+            $storeList = StoreModel::getStoreArray();
 
             $grid->id->sortable();
             $grid->cover_img_url->image('',50);
@@ -55,8 +57,9 @@ class GoodsNewController extends AdminController
             $grid->on_sale->switch();
 
             $grid->actions([new GoodsNewCopy()]);
-            $grid->filter(function (Grid\Filter $filter) {
+            $grid->filter(function (Grid\Filter $filter) use($storeList){
                 $filter->like('name');
+                $filter->equal('store_id')->select($storeList);
             });
 
             $grid->model()->orderBy('category_id', 'asc');