注册审核

app-ghs/controllers/AuthController.php

@@ -69,7 +69,11 @@ class AuthController extends PublicController
             $admin = AdminService::replaceAdmin($adminInfo, $fromApp);
         }
         $currentShopId = $admin['currentShopId'] ?? 0;
+        $openShop = $admin['openShop'] ?? 1;
         if (empty($currentShopId)) {
+            if ($openShop == 2) {
+                util::fail('开店申请审核状中');
+            }
             util::fail('请先注册');
         }
         $adminId = $admin['id'] ?? 0;
@@ -375,16 +379,17 @@ class AuthController extends PublicController
         $currentShopId = $admin['currentShopId'] ?? 0;
         if (empty($currentShopId)) {
             if ($openShop == 2) {
-                util::fail('开店申请审核状中，请耐心等待');
+                util::fail('开店申请审核状中');
             }
+            util::fail('请先注册');
         }
         $adminId = $admin['id'];
         $shopAdmin = ShopAdminService::getByCondition(['adminId' => $adminId, 'delStatus' => 0], true);
         if (empty($shopAdmin)) {
-            util::fail('没有员工信息');
+            util::fail('出错了');
         }
         if ($shopAdmin->status == 0) {
-            util::fail("您的账号还未激活");
+            util::fail("您的账号已冻结");
         }
         $shopId = $shopAdmin->shopId ?? 0;
         if (empty($shopId)) {