店铺和商品搜索-权限优化

商品操作-优化

app/Admin/Actions/Grid/v3/CouponForbidden.php

@@ -10,7 +10,7 @@ class CouponForbidden extends RowAction
     /**
      * @return string
      */
-    protected $title = '禁用';
+    protected $title = ' 禁用 ';
 
 
     public function handle()

app/Admin/Actions/Grid/v3/CouponPublish.php

@@ -11,7 +11,7 @@ class CouponPublish extends RowAction
     /**
      * @return string
      */
-    protected $title = '发布';
+    protected $title = ' 发布 ';
 
     public function render()
     {

app/Admin/Actions/Grid/v3/GoodsActivityCopy.php

@@ -12,7 +12,7 @@ class GoodsActivityCopy extends RowAction
     /**
      * @return string
      */
-    protected $title = '复制';
+    protected $title = ' 复制 ';
 
     public function render()
     {

app/Admin/Actions/Grid/v3/GoodsCopy.php

@@ -11,7 +11,7 @@ class GoodsCopy extends RowAction
     /**
      * @return string
      */
-    protected $title = '复制';
+    protected $title = '复制 ';
 
     public function render()
     {

app/Admin/Actions/Grid/v3/GoodsImage.php

@@ -11,7 +11,7 @@ class GoodsImage extends RowAction
     /**
      * @return string
      */
-    protected $title = '上传图片';
+    protected $title = ' 图片 ';
 
     public function render()
     {

app/Admin/Actions/Grid/v3/GoodsSpec.php

@@ -11,7 +11,7 @@ class GoodsSpec extends RowAction
     /**
      * @return string
      */
-    protected $title = '管理规格';
+    protected $title = ' 规格 ';
 
     public function render()
     {

app/Admin/Actions/Grid/v3/StoreSetTime.php

@@ -11,7 +11,7 @@ class StoreSetTime extends RowAction
     /**
      * @return string
      */
-    protected $title = '营业时间';
+    protected $title = ' 营业时间 ';
 
     public function render()
     {

app/Admin/Actions/Grid/v3/StoreUserPassword.php

@@ -11,7 +11,7 @@ class StoreUserPassword extends RowAction
     /**
      * @return string
      */
-    protected $title = '修改密码';
+    protected $title = ' 修改密码 ';
 
     public function render()
     {

app/Admin/Controllers/v3/GoodsActivityController.php

@@ -35,14 +35,16 @@ class GoodsActivityController extends AdminController
         if ($marketId){
             //$build = new \App\Models\v3\Goods();
             $build =  $build::where('market_id',$marketId);
+            $storeList = StoreModel::getStoreArray([['market_id','=',$marketId]]);
         }else{
             //$build = new GoodsActivity();
+            $storeList = StoreModel::getStoreArray([['market_id','=',$marketId]]);
         }
-        return Grid::make($build, function (Grid $grid) {
+        return Grid::make($build, function (Grid $grid) use($storeList){
             // 二级分类
             $categoryList = CategoryModel::getArray([['parent_id','>',0]],['选择分类'=>0]);
             // 店铺
-            $storeList = StoreModel::getStoreArray();
+            // $storeList = StoreModel::getStoreArray();
             // 商品类目
             $goodsCategoryList = GoodsCategoryModel::getArray([],['选择类目'=>0]);
             //市场
@@ -63,7 +65,7 @@ class GoodsActivityController extends AdminController
             $grid->column('store_id')->display(function($storeId){
                 $item = StoreModel::getStoreInfo($storeId,'name');
                 return empty($item) ? '' : $item->name;
-            });
+            })->width('12%');
             $grid->column('category_id')->display(function($categoryId){
                 $item = CategoryModel::getInfo($categoryId,'title');
                 return empty($item) ? '' : $item->title;
@@ -161,17 +163,22 @@ class GoodsActivityController extends AdminController
      */
     protected function form()
     {
+        $marketId = Auth::getMarket();
         $builder =  GoodsActivityModel::with(['ImageBanners','VideoBanners']);
-        return Form::make($builder, function (Form $form) {
+        return Form::make($builder, function (Form $form) use($marketId){
             $form->hidden('id');
 
             // 二级分类
             $categoryList = CategoryModel::getArray([['parent_id','>',0]]);
             // 店铺
-            $storeList = StoreModel::getStoreArray();
+            if($marketId){
+                $storeList = StoreModel::getStoreArray([['market_id','=',$marketId]]);
+            }else{
+                $storeList = StoreModel::getStoreArray();
+            }
             //市场
             $marketList = MarketModel::getMarketArray();
-            $marketId = $form->model()->market_id;
+            // $marketId = $form->model()->market_id;
 
             $form->column(6, function (Form $form) use($storeList,$categoryList,$marketList){
                 $form->text('goods_id')->default(0)->help('输入正常商品id，用于关联商品。');

app/Admin/Controllers/v3/GoodsController.php

@@ -33,14 +33,16 @@ class GoodsController extends AdminController
         if ($marketId){
             $build = new \App\Models\v3\Goods();
             $build =  $build::where('market_id',$marketId);
+            $storeList = StoreModel::getStoreArray([['market_id','=',$marketId]]);
         }else{
             $build = new Goods();
+            $storeList = StoreModel::getStoreArray();
         }
-        return Grid::make($build, function (Grid $grid) {
+        return Grid::make($build, function (Grid $grid) use($storeList){
             // 二级分类
             $categoryList = CategoryModel::getArray([['parent_id','>',0]],['选择分类'=>0]);
             // 店铺
-            $storeList = StoreModel::getStoreArray();
+            // $storeList = StoreModel::getStoreArray();
             // 商品类目
             $goodsCategoryList = GoodsCategoryModel::getArray([],['选择类目'=>0]);
 
@@ -74,7 +76,7 @@ class GoodsController extends AdminController
             });
             $grid->store_id->display(function ($storeId) use($storeList){
                 return isset($storeList[$storeId]) ? $storeList[$storeId] : '';
-            });
+            })->width('12%');
             $grid->category_id->select($categoryList);
             // $grid->category_id->display(function ($categoryId) use($categoryList){
             //     return isset($categoryList[$categoryId]) ? $categoryList[$categoryId] : '';
@@ -196,16 +198,19 @@ class GoodsController extends AdminController
     protected function form()
     {
         $builder =  GoodsModel::with(['ImageBanners','VideoBanners']);
-
-        return Form::make($builder, function (Form $form) {
+        $marketId = Auth::getMarket();
+        return Form::make($builder, function (Form $form) use($marketId){
             $form->hidden('id');
 
             // 二级分类
             $categoryList = CategoryModel::getArray([['parent_id','>',0]]);
             // 商品类目
             // $goodsCategoryList = GoodsCategoryModel::getArray();
-            // 店铺
-            $storeList = StoreModel::getStoreArray();
+            if($marketId){
+                $storeList = StoreModel::getStoreArray([['market_id','=',$marketId]]);
+            }else{
+                $storeList = StoreModel::getStoreArray();
+            }
             //市场
             // $marketList = MarketModel::getMarketArray();
 

app/Admin/Controllers/v3/StoreController.php

@@ -48,7 +48,7 @@ class StoreController extends AdminController
 
             $grid->id->sortable();
             $grid->logo_url->image('',50);
-            $grid->name;
+            $grid->name->width('12%');
 
             $grid->market_id->display(function ($marketId) use($marketList){
                 return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
@@ -85,7 +85,9 @@ class StoreController extends AdminController
             $grid->filter(function (Grid\Filter $filter) use($marketList){
                 $filter->equal('id');
                 $filter->like('name');
-                $filter->equal('market_id')->select($marketList);
+                if (!(Admin::user()->isRole('market_service'))){
+                    $filter->equal('market_id')->select($marketList);
+                }
             });
             $grid->model()->orderBy('id','desc');
             // 每页10条