Merge branch 'phoenix' into develop

app/Admin/Controllers/v3/StoreController.php

@@ -87,6 +87,9 @@ class StoreController extends AdminController
 
             // 每页10条
             $grid->paginate(10);
+
+            $grid->disableDeleteButton();
+
         });
     }
 
@@ -149,8 +152,11 @@ class StoreController extends AdminController
                 $show->width(6)->loudspeaker_imei;
             });
 
-            // $show->created_at;
-            // $show->updated_at;
+            $show->panel()->tools(function ($tools) {
+                
+                $tools->disableDelete();
+               
+            });
         });
     }
 
@@ -298,6 +304,7 @@ class StoreController extends AdminController
             $form->disableViewCheck();
             $form->disableEditingCheck();
             $form->disableCreatingCheck();
+            $form->disableDeleteButton();
         });
     }
 

app/Admin/Controllers/v3/UserController.php

@@ -105,6 +105,7 @@ class UserController extends AdminController
             $form->disableViewCheck();
             $form->disableEditingCheck();
             $form->disableCreatingCheck();
+            $form->disableDeleteButton();
         });
     }
 }