|
|
@@ -75,6 +75,7 @@ class AuthController extends PublicController
|
|
|
util::fail('没有找到门店');
|
|
|
}
|
|
|
$pfShopId = $currentShop->pfShopId ?? 0;
|
|
|
+ $onlyCg = $currentShop->onlyCg ?? 1;
|
|
|
$mainId = $currentShop->mainId ?? 0;
|
|
|
$adminId = $admin['id'];
|
|
|
$shopAdmin = ShopAdminService::getByCondition(['adminId' => $adminId, 'mainId' => $mainId], true);
|
|
|
@@ -113,6 +114,7 @@ class AuthController extends PublicController
|
|
|
'shopAdminId' => $shopAdminId,
|
|
|
'switchShop' => $switchShop,
|
|
|
'pfShopId' => $pfShopId,
|
|
|
+ 'onlyCg' => $onlyCg,
|
|
|
'showDemo' => $showDemo,
|
|
|
'imgUploadApi' => $imgUploadApi,
|
|
|
//有小程序新版本提示更新
|
|
|
@@ -153,6 +155,7 @@ class AuthController extends PublicController
|
|
|
}
|
|
|
$mainId = $currentShop->mainId ?? 0;
|
|
|
$pfShopId = $currentShop->pfShopId ?? 0;
|
|
|
+ $onlyCg = $currentShop->onlyCg ?? 1;
|
|
|
$adminId = $admin['id'];
|
|
|
$shopAdmin = ShopAdminService::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
|
|
|
if (empty($shopAdmin)) {
|
|
|
@@ -192,6 +195,7 @@ class AuthController extends PublicController
|
|
|
'shopAdminId' => $shopAdminId,
|
|
|
'switchShop' => $switchShop,
|
|
|
'pfShopId' => $pfShopId,
|
|
|
+ 'onlyCg' => $onlyCg,
|
|
|
'imgUploadApi' => $imgUploadApi,
|
|
|
'showDemo' => $showDemo,
|
|
|
//有小程序新版本提示更新
|
|
|
@@ -246,6 +250,7 @@ class AuthController extends PublicController
|
|
|
util::fail('登录失败,没有找到门店');
|
|
|
}
|
|
|
$pfShopId = $currentShop->pfShopId ?? 0;
|
|
|
+ $onlyCg = $currentShop->onlyCg ?? 1;
|
|
|
$adminId = $admin['id'];
|
|
|
$mainId = $currentShop->mainId ?? 0;
|
|
|
$shopAdmin = ShopAdminService::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
|
|
|
@@ -285,6 +290,7 @@ class AuthController extends PublicController
|
|
|
'shopId' => $currentShopId,
|
|
|
'shopAdminId' => $shopAdminId,
|
|
|
'pfShopId' => $pfShopId,
|
|
|
+ 'onlyCg' => $onlyCg,
|
|
|
'switchShop' => $switchShop,
|
|
|
'showDemo' => $showDemo,
|
|
|
'imgUploadApi' => $imgUploadApi,
|
|
|
@@ -483,6 +489,7 @@ class AuthController extends PublicController
|
|
|
}
|
|
|
$mainId = $currentShop->mainId ?? 0;
|
|
|
$pfShopId = $currentShop->pfShopId ?? 0;
|
|
|
+ $onlyCg = $currentShop->onlyCg ?? 1;
|
|
|
$shopAdmin = ShopAdminClass::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
|
|
|
if (empty($shopAdmin)) {
|
|
|
//没有管理店铺不允许登录
|
|
|
@@ -521,6 +528,7 @@ class AuthController extends PublicController
|
|
|
'shopAdminId' => $shopAdminId,
|
|
|
'switchShop' => $switchShop,
|
|
|
'pfShopId' => $pfShopId,
|
|
|
+ 'onlyCg' => $onlyCg,
|
|
|
'showDemo' => $showDemo,
|
|
|
'imgUploadApi' => $imgUploadApi,
|
|
|
//有小程序新版本提示更新
|