From 471bad4975d3bec21cb64f544bfa99fbd3ecee6a Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Wed, 14 Oct 2020 12:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8--=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=9B=9E=E6=98=BE=E5=92=8C=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/CouponTieController.php | 11 +++++---
 app/Admin/Controllers/v3/CouponController.php | 21 ++++++++-------
 .../v3/CouponSettingController.php            |  3 +++
 app/Admin/Forms/CouponTieForm.php             |  2 ++
 app/Admin/Repositories/CouponTie.php          | 27 ++++++++++++-------
 5 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/app/Admin/Controllers/CouponTieController.php b/app/Admin/Controllers/CouponTieController.php
index fdb76c5..e4534ce 100644
--- a/app/Admin/Controllers/CouponTieController.php
+++ b/app/Admin/Controllers/CouponTieController.php
@@ -32,14 +32,17 @@ class CouponTieController extends AdminController
     {
         $grid = Grid::make(new CouponTie(), function (Grid $grid) {
             $grid->id;
-            $grid->activity->sortable();
-            $grid->forward->sortable();
-            $grid->repay->sortable();
+            $grid->activity;
+            $grid->forward;
+            $grid->repay;
 
+            $grid->disableCreateButton();
             $grid->disableViewButton();
             $grid->disableEditButton();
             $grid->disableDeleteButton();
-
+            $grid->paginate(1);
+            $grid->disablePagination();
+            $grid->disableRowSelector();
             $grid->actions(new CouponTieEdit());
         });
         return $content
diff --git a/app/Admin/Controllers/v3/CouponController.php b/app/Admin/Controllers/v3/CouponController.php
index 659795b..4bbd9af 100644
--- a/app/Admin/Controllers/v3/CouponController.php
+++ b/app/Admin/Controllers/v3/CouponController.php
@@ -28,7 +28,7 @@ class CouponController extends AdminController
     {
         return Grid::make(new Coupon(), function (Grid $grid) {
             $grid->id->sortable();
-            $grid->title;
+            $grid->title->width('12%');
             $grid->start_time_text;
             $grid->end_time_text;
 
@@ -62,18 +62,21 @@ class CouponController extends AdminController
                 }
             });
             $grid->filter(function (Grid\Filter $filter) {
+                $discountTypeList = CouponModel::$discountType;
+                $activeTypeList = CouponModel::$activeType;
                 $filter->like('title','标题');
-                $filter->equal('discount_type')->select(config('coupon.discount_type'));
-                $filter->equal('active_type')->select(config('coupon.active_type'));
-                $status = config('coupon.status');
+                $filter->equal('discount_type')->select($discountTypeList);
+                $filter->equal('active_type')->select($activeTypeList);
+                $status = CouponModel::$status;
                 unset($status[-1]);/* 去掉删除状态 */
                 $filter->in('status')->multipleSelect($status);
             });
 
             $grid->disableBatchDelete();
-            // $grid->disableCreateButton();
+            $grid->disableCreateButton();
             $grid->disableDeleteButton();
             // $grid->disableEditButton();
+            $grid->disableRowSelector();
         });
     }
 
@@ -168,10 +171,10 @@ class CouponController extends AdminController
                 $form->datetime('start_time')->required()
                     ->customFormat(function ($start_time){
                         return date('Y-m-d H:i:s',$start_time);
-                    })
-                    ->rules('after:now',[
-                        'after' => '只能选择今天和之后的时间'
-                    ]);
+                    });
+                    // ->rules('after:now',[
+                    //     'after' => '只能选择今天和之后的时间'
+                    // ]);
                 $form->datetime('end_time')->required()
                     ->customFormat(function ($start_time){
                         return date('Y-m-d H:i:s',$start_time);
diff --git a/app/Admin/Controllers/v3/CouponSettingController.php b/app/Admin/Controllers/v3/CouponSettingController.php
index 19eeb5e..67c212b 100644
--- a/app/Admin/Controllers/v3/CouponSettingController.php
+++ b/app/Admin/Controllers/v3/CouponSettingController.php
@@ -29,8 +29,11 @@ class CouponSettingController extends AdminController
 
             $grid->model()->orderBy('id','desc');
             $grid->filter(function (Grid\Filter $filter) {
+                // $categoryList = SettingModel::$category;
                 $filter->like('name');
+                // $filter->equal('category')->select($categoryList);
             });
+            $grid->disableRowSelector();
         });
     }
 
diff --git a/app/Admin/Forms/CouponTieForm.php b/app/Admin/Forms/CouponTieForm.php
index 7ce64ec..a4995d3 100644
--- a/app/Admin/Forms/CouponTieForm.php
+++ b/app/Admin/Forms/CouponTieForm.php
@@ -48,6 +48,8 @@ class CouponTieForm extends Form
         $this->text('activity')->required()->value($coupon['activity']);
         $this->text('forward')->required()->value($coupon['forward']);
         $this->text('repay')->required()->value($coupon['repay']);
+        
+        $this->disableResetButton();
     }
 
     /**
diff --git a/app/Admin/Repositories/CouponTie.php b/app/Admin/Repositories/CouponTie.php
index 77b9537..c7b19c1 100644
--- a/app/Admin/Repositories/CouponTie.php
+++ b/app/Admin/Repositories/CouponTie.php
@@ -26,17 +26,26 @@ class CouponTie extends Repository
                 'repay' => ''
             ];
         }
-        return $model->makePaginator(
-            1,
+        $data =  [
             [
-                [
-                    'id'=>1,
-                    'activity'=>$coupon['activity'],
-                    'forward'=>$coupon['forward'],
-                    'repay' => $coupon['repay']
-                ],
+            'id'=>1,
+            'activity'=>$coupon['activity'],
+            'forward'=>$coupon['forward'],
+            'repay' => $coupon['repay']
             ]
-        );
+        ];
+        return $data;
+        // return $model->makePaginator(
+        //     1,
+        //     [
+        //         [
+        //             'id'=>1,
+        //             'activity'=>$coupon['activity'],
+        //             'forward'=>$coupon['forward'],
+        //             'repay' => $coupon['repay']
+        //         ],
+        //     ]
+        // );
     }
 
 }
\ No newline at end of file