|
|
@@ -8,7 +8,6 @@ use biz\shop\classes\ShopClass;
|
|
|
use biz\shop\classes\ShopExtClass;
|
|
|
use biz\sj\classes\SjClass;
|
|
|
use biz\sj\services\MerchantExtendService;
|
|
|
-use biz\sj\services\MerchantService;
|
|
|
use bizGhs\admin\services\AdminService;
|
|
|
use common\components\dict;
|
|
|
use common\components\jwt;
|
|
|
@@ -22,7 +21,8 @@ class BaseController extends PublicController
|
|
|
public $appId;
|
|
|
public $isWx = false;
|
|
|
public $isLogin = false;
|
|
|
- public $guestAccess = [];//不需要登陆的方法名
|
|
|
+ //不需要登陆的方法名
|
|
|
+ public $guestAccess = [];
|
|
|
|
|
|
//ssh 2020.3.8
|
|
|
public function beforeAction($action)
|
|
|
@@ -60,19 +60,19 @@ class BaseController extends PublicController
|
|
|
$shop = ShopClass::getById($currentShopId, true);
|
|
|
$this->shop = $shop;
|
|
|
if (empty($shop)) {
|
|
|
- util::fail('没有找到您管理的门店');
|
|
|
+ util::fail('没有找到您的门店');
|
|
|
}
|
|
|
$shopExt = ShopExtClass::getByCondition(['shopId' => $currentShopId], true);
|
|
|
if (empty($shopExt)) {
|
|
|
- util::fail('没有找到门店拓展信息');
|
|
|
+ util::fail('门店信息有问题,请联系管理员');
|
|
|
}
|
|
|
$this->shopExt = $shopExt;
|
|
|
$shopAdmin = ShopAdminClass::getByCondition(['shopId' => $currentShopId, 'adminId' => $adminId, 'delStatus' => 0], true);
|
|
|
if (empty($shopAdmin)) {
|
|
|
- util::logout('没有找到员工信息');
|
|
|
+ util::logout('没有找到员工');
|
|
|
}
|
|
|
if (isset($shopAdmin->delStatus) && $shopAdmin->delStatus == 1) {
|
|
|
- util::fail('您还不是员工哦');
|
|
|
+ util::fail('您还不是员工');
|
|
|
}
|
|
|
if (isset($shopAdmin->status) && $shopAdmin->status == 0) {
|
|
|
util::fail('您的帐号已被禁用');
|