更新

app/Admin/Controllers/UserManagement/BmUser/UserCouponsController.php

@@ -33,37 +33,44 @@ class UserCouponsController extends AdminController
         });
         $grid->disableActions();
         $grid->column('id', __('Id'));
-        $grid->column('user_id', __('用户ID'));
-        $grid->column('order_id', __('订单'));
         $grid->column('coupon_id', __('优惠券ID'));
         $grid->column('name', __('券名称'));
+        $grid->column('icon', __('券图标'))->image('',50,50);
         $grid->column('title', __('券标题'));
-        $grid->column('desc', __('使用说明'));
-        $grid->column('rules', __('使用规则'));
-        $grid->column('icon', __('券图标'))->image();
-        $grid->column('status', __('状态'))->using([1=>'可用',2=>'已用',3=>'已过期']);
         $grid->column('type', __('类型'))->using([1=>'满减券',2=>'折扣券']);
         $grid->column('usable_type', __('可用类型'))->using([1=>'全部产品通用',2=>'部分产品可用']);
         $grid->column('money', __('满减券的优惠钱数'))->display(function ($money){
             return $money/100;
         });
-        $grid->column('discount', __('折扣'));
         $grid->column('min_consume_amount', __('最低消费金额'))->display(function ($money){
             return $money/100;
         });
+        $grid->column('discount', __('折扣'));
         $grid->column('max_reduce_amount', __('折扣券的最大抵扣金额'))->display(function ($money){
             return $money/100;
         });
         $grid->column('expire_type', __('过期类型'))->using([1=>'领取N天过期',2=>'设置固定过期时间']);
         $grid->column('effective_days', __('有效天数'));
         $grid->column('start_time', __('有效期开始时间'))->display(function ($time){
-            return date("Y-m-d H:i",$time);
+            if($time == 0)
+            {
+                return '';
+            }else
+                return date("Y-m-d H:i",$time);
         });
         $grid->column('end_time', __('有效期结束时间'))->display(function ($time){
-            return date("Y-m-d H:i",$time);
+            if($time == 0)
+            {
+                return '';
+            }else
+                return date("Y-m-d H:i",$time);
         });
         $grid->column('expire_time', __('过期时间'))->display(function ($time){
-            return date("Y-m-d H:i",$time);
+            if($time == 0)
+            {
+                return '';
+            }else
+                return date("Y-m-d H:i",$time);
         });
         $grid->column('use_time', __('使用时间'))->display(function ($time){
             if($time == 0)
@@ -72,6 +79,7 @@ class UserCouponsController extends AdminController
             }else
                 return date("Y-m-d H:i",$time);
         });
+        $grid->column('status', __('优惠券状态'))->using([1=>'可用',2=>'已用',3=>'已过期']);
         $grid->column('created_at', __('创建时间'));
         $grid->column('updated_at', __('更新时间'));