|
|
@@ -5,6 +5,7 @@ namespace ghs\controllers;
|
|
|
use biz\admin\classes\AdminClass;
|
|
|
use biz\pt\classes\AgreementClass;
|
|
|
use biz\shop\classes\ShopClass;
|
|
|
+use bizGhs\item\classes\LabelClass;
|
|
|
use bizHd\admin\classes\ShopAdminClass;
|
|
|
use bizGhs\shop\services\ShopAdminService;
|
|
|
use bizGhs\admin\services\AdminService;
|
|
|
@@ -137,6 +138,8 @@ class AuthController extends PublicController
|
|
|
$shopAdmin->super = 0;
|
|
|
}
|
|
|
|
|
|
+ $labelList = LabelClass::getMyUnUseLabelList($mainId);
|
|
|
+
|
|
|
//注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
|
|
|
util::success([
|
|
|
'token' => $token,
|
|
|
@@ -155,6 +158,7 @@ class AuthController extends PublicController
|
|
|
'hasHitNavigate' => $hasHitNavigate,
|
|
|
'staff' => $shopAdmin,
|
|
|
'lookAllShop' => $lookAllShop,
|
|
|
+ 'labelList' => $labelList,
|
|
|
]);
|
|
|
}
|
|
|
|
|
|
@@ -264,6 +268,8 @@ class AuthController extends PublicController
|
|
|
$shopAdmin->super = 0;
|
|
|
}
|
|
|
|
|
|
+ $labelList = LabelClass::getMyUnUseLabelList($mainId);
|
|
|
+
|
|
|
//注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
|
|
|
util::success([
|
|
|
'token' => $token,
|
|
|
@@ -282,6 +288,7 @@ class AuthController extends PublicController
|
|
|
'hasHitNavigate' => $hasHitNavigate,
|
|
|
'staff' => $shopAdmin,
|
|
|
'lookAllShop' => $lookAllShop,
|
|
|
+ 'labelList' => $labelList,
|
|
|
]);
|
|
|
|
|
|
util::success(['admin' => $admin]);
|
|
|
@@ -490,6 +497,7 @@ class AuthController extends PublicController
|
|
|
$remind = getenv('GHS_UPDATE_REMIND') == false ? 0 : getenv('GHS_UPDATE_REMIND');
|
|
|
$shop = ShopClass::getById($currentShopId, true);
|
|
|
$skCustomId = $shop->skCustomId ?? 0;
|
|
|
+ $mainId = $shop->mainId ?? 0;
|
|
|
$apiHost = Yii::$app->params['ghsHost'];
|
|
|
$imgUploadApi = $apiHost . '/upload/save-file';
|
|
|
|
|
|
@@ -521,6 +529,8 @@ class AuthController extends PublicController
|
|
|
$shopAdmin->super = 0;
|
|
|
}
|
|
|
|
|
|
+ $labelList = LabelClass::getMyUnUseLabelList($mainId);
|
|
|
+
|
|
|
//注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
|
|
|
util::success([
|
|
|
'token' => $token,
|
|
|
@@ -539,6 +549,7 @@ class AuthController extends PublicController
|
|
|
'hasHitNavigate' => $hasHitNavigate,
|
|
|
'staff' => $shopAdmin,
|
|
|
'lookAllShop' => $lookAllShop,
|
|
|
+ 'labelList' => $labelList,
|
|
|
]);
|
|
|
}
|
|
|
|
|
|
@@ -624,6 +635,8 @@ class AuthController extends PublicController
|
|
|
$shopAdmin->super = 0;
|
|
|
}
|
|
|
|
|
|
+ $labelList = LabelClass::getMyUnUseLabelList($mainId);
|
|
|
+
|
|
|
//注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
|
|
|
util::success([
|
|
|
'token' => $token,
|
|
|
@@ -642,6 +655,7 @@ class AuthController extends PublicController
|
|
|
'hasHitNavigate' => $hasHitNavigate,
|
|
|
'staff' => $shopAdmin,
|
|
|
'lookAllShop' => $lookAllShop,
|
|
|
+ 'labelList' => $labelList,
|
|
|
]);
|
|
|
}
|
|
|
|