Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/api/controller/PublicController.php

@@ -2,6 +2,7 @@
 
 namespace app\api\controller;
 
+use app\admin\model\system\SystemAdmin;
 use app\admin\model\system\SystemAttachment;
 use app\models\store\StoreCart;
 use app\models\store\StoreCategory;
@@ -320,7 +321,11 @@ class PublicController
         ], $request, true);
         $store = false;
         if ($request->uid()) {
-            $store = $request->user()['admin_id'];
+            $user = $request->user();
+            if ($user['admin_id']) {
+                $admin = SystemAdmin::where('id', $user['admin_id'])->find();
+                $store = SystemStore::where('id', $admin['store_id'] ?? 0)->value('see');
+            }
         }
         $list = SystemStore::lst($latitude, $longitude, $page, $limit, $store);
         if (!$list) $list = [];