1

app/admin/controller/setting/SystemAdmin.php

@@ -40,7 +40,6 @@ class SystemAdmin extends AuthController
      */
     public function create()
     {
-        var_dump(123456);die();
         $admin = $this->adminInfo;
         $f = array();
         $f[] = Form::input('account', '管理员账号');
@@ -56,10 +55,10 @@ class SystemAdmin extends AuthController
             return $options;
         })->multiple(1);
         $f[] = Form::select('mer_id', '门店')->setOptions(function () use ($admin) {
-            $list = SystemStore::getStoreList(['type'=>1]);
+            $list = SystemStore::getMer();
             $options = [];
             foreach ($list as $id => $roleName) {
-                $options[] = ['label' => $roleName['name'], 'value' => $roleName['id']];
+                $options[] = ['label' => $roleName, 'value' => $roleName];
             }
             return $options;
         });
@@ -77,7 +76,6 @@ class SystemAdmin extends AuthController
      */
     public function save()
     {
-        var_dump(789963);die();
         $data = Util::postMore([
             'account',
             'conf_pwd',
@@ -129,10 +127,10 @@ class SystemAdmin extends AuthController
             return $options;
         })->multiple(1);
         $f[] = Form::select('mer_id', '门店')->setOptions(function () use ($admin) {
-            $list = SystemStore::getStoreList(['type'=>1]);
+            $list = SystemStore::getMer();
             $options = [];
             foreach ($list as $id => $roleName) {
-                $options[] = ['label' => $roleName['name'], 'value' => $roleName['id']];
+                $options[] = ['label' => $roleName, 'value' => $roleName];
             }
             return $options;
         });

app/admin/model/system/SystemStore.php

@@ -108,7 +108,15 @@ class SystemStore extends BaseModel
         }
         return compact('count', 'data');
     }
-
+    /**
+     * 选择门店
+     * @param int $level
+     * @return array
+     */
+    public static function getMer()
+    {
+        return self::where('is_show',1)->where('is_del',0)->column('name','id');
+    }
     /**
      * 获取连表查询条件
      * @param $type