Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa

app/Admin/Controllers/CouponManagement/CouponDetailsController.php

@@ -25,7 +25,12 @@ class CouponDetailsController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Coupon());
-        $grid->model()->orderBy('id','desc');
+        $grid->disableFilter();
+        $grid->disableActions();
+        $grid->disableBatchActions();
+        $grid->disableCreateButton();
+        $id = request('id');
+        $grid->model()->where('id',$id)->orderBy('id','desc');
         $grid->column('id', __('Id'));
         $grid->column('name', __('券名称'));
         $grid->column('title', __('券标题'));

app/Admin/Controllers/CouponManagement/CouponDistributionUserList.php

@@ -27,6 +27,7 @@ class CouponDistributionUserList extends AdminController
     protected function grid()
     {
         $grid = new Grid(new User());
+        $grid->disableCreateButton();
         $grid->filter(function($filter){
             $filter->disableIdFilter();
             $filter->like('nickname','昵称');
@@ -63,7 +64,7 @@ class CouponDistributionUserList extends AdminController
             return date("Y-m-d H:i",$time);
         });
 //            $grid->column('patient', __('患者姓名'))->pluck('name')->map('ucwords')->implode(',');
-        $grid->column('patient', __('患者姓名'))->pluck('name')->label('default');
+//        $grid->column('patient', __('患者姓名'))->pluck('name')->label('default');
         return $grid;
     }
 

app/Admin/Controllers/CouponManagement/CouponManagementController.php

@@ -43,6 +43,20 @@ class CouponManagementController extends AdminController
             }
         });
         $grid->filter(function($filter){
+            $filter->disableIdFilter();
+            $filter->like('name','优惠券名称');
+            $filter->equal('type','优惠券类型')->select([
+                1 => '满减券',
+                2 => '折扣券'
+            ]);
+            $filter->equal('usable_type','优惠券类型')->select([
+                1 => '全部产品通用',
+                2 => '部分产品可用'
+            ]);
+            $filter->equal('position_type','发放平台')->select([
+                1 => '领券中心',
+                2 => '后台发放'
+            ]);
             $filter->timestampBetween('start_time', "有效期开始时间")->datetime();
             $filter->timestampBetween('end_time', "有效期结束时间")->datetime();
         });