|
|
@@ -161,6 +161,9 @@ class AuthController extends PublicController
|
|
|
}
|
|
|
$adminId = $admin['id'];
|
|
|
$shopAdmin = ShopAdminService::getByCondition(['adminId' => $adminId, 'delStatus' => 0]);
|
|
|
+ if($shopAdmin['status']==0){
|
|
|
+ util::fail("您的账号还未激活");
|
|
|
+ }
|
|
|
$merchantId = isset($shopAdmin['merchantId']) ? $shopAdmin['merchantId'] : 0;
|
|
|
$shopId = $shopAdmin['shopId'] ?? 0;
|
|
|
if (empty($shopId)) {
|
|
|
@@ -231,4 +234,4 @@ class AuthController extends PublicController
|
|
|
]);
|
|
|
}
|
|
|
|
|
|
-}
|
|
|
+}
|