Browse Source

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

whj 4 years ago
parent
commit
050607e192

+ 1 - 1
app/Admin/Controllers/OrdersManagement/ServicePackDetailsController.php

@@ -40,7 +40,7 @@ class ServicePackDetailsController extends AdminController
         $grid->column('pack_price', __('服务包价格'))->display(function ($price){
         $grid->column('pack_price', __('服务包价格'))->display(function ($price){
             return $price/100;
             return $price/100;
         });
         });
-        $grid->column('phone_minutes', __('剩余电话分钟数'));
+        $grid->column('phone_minutes', __('剩余电话数'));
         $grid->column('chat_num', __('剩余图文咨询次数'));
         $grid->column('chat_num', __('剩余图文咨询次数'));
         $grid->column('appoint_num', __('剩余门诊预约次数'));
         $grid->column('appoint_num', __('剩余门诊预约次数'));
         $grid->column('vaccine_limit_amount', __('剩余疫苗次数'));
         $grid->column('vaccine_limit_amount', __('剩余疫苗次数'));

+ 1 - 0
app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php

@@ -54,6 +54,7 @@ class ServicePackOrderController extends AdminController
             });
             });
         //操作
         //操作
         $grid->actions(function ($actions) {
         $grid->actions(function ($actions) {
+            $actions->disableView();
             // 去掉删除
             // 去掉删除
             $actions->disableDelete();
             $actions->disableDelete();
             // 去掉编辑
             // 去掉编辑

+ 1 - 4
app/Admin/Controllers/VaccinesManagement/VaccinesController.php

@@ -91,10 +91,7 @@ class VaccinesController extends AdminController
             $tools->append(new ImportAction());
             $tools->append(new ImportAction());
         });
         });
 
 
-        $grid->actions(function ($actions){
-            $actions->disableDelete();
-            $actions->disableEdit();
-        });
+        $grid->disableActions();
 
 
         return $grid;
         return $grid;
     }
     }