open

app-hd/controllers/AdminController.php

@@ -139,7 +139,6 @@ class AdminController extends BaseController
         $encryptedData = isset($post['encryptedData']) ? $post['encryptedData'] : '';
         $merchant = WxOpenService::getWxInfo();
         $appId = $merchant['miniAppId'];
-        $admin = $this->admin->attributes;
         $miniOpenId = $post['miniOpenId'];
         if (empty($miniOpenId)) {
             util::fail('启用失败');

app-hd/controllers/AuthController.php

@@ -231,23 +231,23 @@ class AuthController extends PublicController
         if (empty($openid)) {
             Yii::info(json_encode($arr));
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'autoLoginOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
         $admin = AdminService::getByMiniOpenId($openid);
         if (empty($admin)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'autoLoginOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
         $adminId = $admin['id'];
         $currentShopId = $admin['currentShopId'] ?? 0;
         if (empty($currentShopId)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'autoLoginOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
         $shopAdmin = ShopAdminClass::getByCondition(['shopId' => $currentShopId, 'adminId' => $adminId], true);
         if (empty($shopAdmin)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'autoLoginOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
         $shopAdmin->lastLogin = date("Y-m-d H:i:s");
         $shopAdmin->save();