Merge branch 'develop' of ssh://120.24.33.109:11022/hyzjshwo/mp_lanzu_cat into develop

app/Admin/Controllers/LanzuServiceSpeakerController.php

@@ -15,13 +15,17 @@ class LanzuServiceSpeakerController extends AdminController
      *
      * @return Grid
      */
+
+    protected $title = '播报机管理';
+
     protected function grid()
     {
         return Grid::make(new LanzuServiceSpeaker(['store']), function (Grid $grid) {
+            $grid->model()->orderBy('updated_at','desc');
             $grid->id->sortable();
-            $grid->device_name;
-            $grid->store_id;
-            $grid->column('store.name');
+            $grid->column('device_name','设备编号');
+            $grid->column('store_id','商户ID');
+            $grid->column('store.name','商户名');
             $grid->column('is_bind')
             ->using([0=>'未绑定',1=>'已绑定'])
             ->label([0=>'danger',1=>'success']);
@@ -60,6 +64,10 @@ class LanzuServiceSpeakerController extends AdminController
     {
         return Form::make(new LanzuServiceSpeaker(), function (Form $form) {
             $form->display('id');
+            $form->text("device_name",'设备编号')->required();
+            $form->number("store_id",'商户ID')->required();
+            $form->switch('is_bind', '是否绑定');
+
             //$form->image("device_name")->disk('oss');
             $form->display('created_at');
             $form->display('updated_at');

app/Models/LanzuServiceSpeaker.php

@@ -10,6 +10,7 @@ class LanzuServiceSpeaker extends Model
 {
 	use HasDateTimeFormatter;
     protected $table = 'lanzu_service_speakers';
+    protected $dateFormat = 'U';
 
     public function store(){
         return $this->hasOne('\App\Models\LanzuStore','id','store_id');