From fe7c2ab6bb7be4c2e1985c67fdbe18cf29ef3925 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 25 Sep 2020 10:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=8A=A5=E6=9C=BA2=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/LanzuServiceSpeakerController.php     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Admin/Controllers/LanzuServiceSpeakerController.php b/app/Admin/Controllers/LanzuServiceSpeakerController.php
index 40b7f3e..4a08bbe 100755
--- a/app/Admin/Controllers/LanzuServiceSpeakerController.php
+++ b/app/Admin/Controllers/LanzuServiceSpeakerController.php
@@ -21,12 +21,10 @@ class LanzuServiceSpeakerController extends AdminController
 
     protected $title = '播报机管理';
 
-    protected $storeList = [];
-
     protected function grid()
     {
         return Grid::make(new LanzuServiceSpeaker(['store']), function (Grid $grid) {
-            $this->storeList = StoreModel::getStoreArray();
+           
             $grid->model()->orderBy('updated_at', 'desc');
             $grid->id->sortable();
             $grid->column('device_name', '设备编号');
@@ -40,9 +38,10 @@ class LanzuServiceSpeakerController extends AdminController
             $grid->column('bind_time_text', '绑定时间')->sortable();
 
             $grid->filter(function (Grid\Filter $filter) {
+                $storeList = StoreModel::getStoreArray();
                 $filter->equal('id');
                 $filter->like('device_name', '设备编号');
-                $filter->equal('store_id','商户')->select($this->storeList);
+                $filter->equal('store_id','商户')->select($storeList);
             });
         });
     }
@@ -90,8 +89,8 @@ class LanzuServiceSpeakerController extends AdminController
             //$form->number("store_id",'商户ID')->required();
             // $form->select('market_id','所在市场')->options('/api/getAllMarket');
 
-            // $storeList = StoreModel::getStoreArray();
-            $form->select('store_id', '商户')->options($this->storeList);
+            $storeList = StoreModel::getStoreArray();
+            $form->select('store_id', '商户')->options($storeList);
             $form->switch('is_bind', '是否绑定')
                     ->customFormat(function ($v) {
                         return $v == 1 ? 1 : 0;