shish 4 年 前
コミット
7fd8035ef2

+ 2 - 0
app-ghs/controllers/AdminController.php

@@ -207,6 +207,7 @@ class AdminController extends BaseController
         $switchShop = \biz\shop\classes\ShopAdminClass::hasSwitchShopRight($this->shopAdmin->attributes);
         $openShop = $admin['openShop'] ?? 1;
         $showDemo = 1;
+        $skCustomId = $this->shop->skCustomId ?? 0;
         util::success([
             'token' => '',
             'admin' => $admin,
@@ -217,6 +218,7 @@ class AdminController extends BaseController
             'showDemo' => $showDemo,
             //有小程序新版本提示更新
             'update' => 0,
+            'skCustomId' => $skCustomId,
         ]);
     }
 

+ 7 - 0
app-ghs/controllers/AuthController.php

@@ -3,6 +3,7 @@
 namespace ghs\controllers;
 
 use biz\admin\classes\AdminClass;
+use biz\shop\classes\ShopClass;
 use bizHd\admin\classes\ShopAdminClass;
 use bizGhs\shop\services\ShopAdminService;
 use bizGhs\admin\services\AdminService;
@@ -251,6 +252,8 @@ class AuthController extends PublicController
         $token = jwt::getNewToken($adminId);
         $showDemo = 1;
         $remind = getenv('GHS_UPDATE_REMIND') == false ? 0 : getenv('GHS_UPDATE_REMIND');
+        $shop = ShopClass::getById($currentShopId, true);
+        $skCustomId = $shop->skCustomId ?? 0;
 
         //注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
         util::success([
@@ -263,6 +266,7 @@ class AuthController extends PublicController
             'showDemo' => $showDemo,
             //有小程序新版本提示更新
             'update' => $remind,
+            'skCustomId' => $skCustomId,
         ]);
     }
 
@@ -299,6 +303,8 @@ class AuthController extends PublicController
         //1没有开店 2已申请待审核 3已开店
         $openShop = $admin['openShop'] ?? 1;
         $showDemo = 1;
+        $shop = ShopClass::getById($currentShopId, true);
+        $skCustomId = $shop->skCustomId ?? 0;
 
         //注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
         util::success([
@@ -311,6 +317,7 @@ class AuthController extends PublicController
             'showDemo' => $showDemo,
             //有小程序新版本提示更新
             'update' => 0,
+            'skCustomId' => $skCustomId,
         ]);
     }