新增分享logo

app-hd/controllers/AdminController.php

@@ -8,6 +8,7 @@ use bizHd\admin\classes\AdminClass;
 use bizHd\admin\classes\ShopAdminClass;
 use bizHd\admin\services\AdminService;
 use bizHd\wx\services\WxOpenService;
+use common\components\imgUtil;
 use common\components\noticeUtil;
 use common\components\util;
 use Yii;
@@ -76,6 +77,10 @@ class AdminController extends BaseController
         }
         $pfShopId = $currentShop->pfShopId ?? 0;
         $onlyCg = $currentShop->onlyCg ?? 1;
+        $shareLogo = '';
+        if (isset($currentShop->shareLogo) && !empty($currentShop->shareLogo)) {
+            $shareLogo = imgUtil::groupImg($currentShop->shareLogo);
+        }
         $mainId = $currentShop->mainId ?? 0;
         $adminId = $admin['id'];
         $shopAdmin = ShopAdminService::getByCondition(['adminId' => $adminId, 'mainId' => $mainId, 'delStatus' => 0], true);
@@ -115,6 +120,7 @@ class AdminController extends BaseController
             'switchShop' => $switchShop,
             'pfShopId' => $pfShopId,
             'onlyCg' => $onlyCg,
+            'shareLogo' => $shareLogo,
             'showDemo' => $showDemo,
             'imgUploadApi' => $imgUploadApi,
             //有小程序新版本提示更新

app-hd/controllers/ApplyController.php

@@ -219,6 +219,12 @@ class ApplyController extends BaseController
             $newShopId = $newShop->id ?? 0;
             $pfShopId = $newShop->pfShopId ?? 0;
             $onlyCg = isset($newShop->onlyCg) ? $newShop->onlyCg : 1;
+
+            $shareLogo = '';
+            if (isset($newShop->shareLogo) && !empty($newShop->shareLogo)) {
+                $shareLogo = imgUtil::groupImg($newShop->shareLogo);
+            }
+
             //前端用于判断是否注册
             $admin['currentShopId'] = $newShopId;
             $adminId = $admin['id'];
@@ -258,6 +264,7 @@ class ApplyController extends BaseController
                 'switchShop' => $switchShop,
                 'pfShopId' => $pfShopId,
                 'onlyCg' => $onlyCg,
+                'shareLogo' => $shareLogo,
                 'showDemo' => $showDemo,
                 'imgUploadApi' => $imgUploadApi,
                 //有小程序新版本提示更新

app-hd/controllers/AuthController.php

@@ -87,6 +87,12 @@ class AuthController extends PublicController
         $pfShopId = $currentShop->pfShopId ?? 0;
         $onlyCg = $currentShop->onlyCg ?? 1;
         $mainId = $currentShop->mainId ?? 0;
+
+        $shareLogo = '';
+        if (isset($currentShop->shareLogo) && !empty($currentShop->shareLogo)) {
+            $shareLogo = imgUtil::groupImg($currentShop->shareLogo);
+        }
+
         $shopAdmin = ShopAdminService::getByCondition(['adminId' => $adminId, 'mainId' => $mainId], true);
         if (empty($shopAdmin)) {
             util::fail('无法操作');
@@ -129,6 +135,7 @@ class AuthController extends PublicController
             'switchShop' => $switchShop,
             'pfShopId' => $pfShopId,
             'onlyCg' => $onlyCg,
+            'shareLogo' => $shareLogo,
             'showDemo' => $showDemo,
             'imgUploadApi' => $imgUploadApi,
             //有小程序新版本提示更新
@@ -171,6 +178,12 @@ class AuthController extends PublicController
         $mainId = $currentShop->mainId ?? 0;
         $pfShopId = $currentShop->pfShopId ?? 0;
         $onlyCg = $currentShop->onlyCg ?? 1;
+
+        $shareLogo = '';
+        if (isset($currentShop->shareLogo) && !empty($currentShop->shareLogo)) {
+            $shareLogo = imgUtil::groupImg($currentShop->shareLogo);
+        }
+
         $adminId = $admin['id'];
         $shopAdmin = ShopAdminService::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
         if (empty($shopAdmin)) {
@@ -216,6 +229,7 @@ class AuthController extends PublicController
             'switchShop' => $switchShop,
             'pfShopId' => $pfShopId,
             'onlyCg' => $onlyCg,
+            'shareLogo' => $shareLogo,
             'imgUploadApi' => $imgUploadApi,
             'showDemo' => $showDemo,
             //有小程序新版本提示更新
@@ -272,6 +286,12 @@ class AuthController extends PublicController
         }
         $pfShopId = $currentShop->pfShopId ?? 0;
         $onlyCg = $currentShop->onlyCg ?? 1;
+
+        $shareLogo = '';
+        if (isset($currentShop->shareLogo) && !empty($currentShop->shareLogo)) {
+            $shareLogo = imgUtil::groupImg($currentShop->shareLogo);
+        }
+
         $adminId = $admin['id'];
         $mainId = $currentShop->mainId ?? 0;
         $shopAdmin = ShopAdminService::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
@@ -317,6 +337,7 @@ class AuthController extends PublicController
             'shopAdminId' => $shopAdminId,
             'pfShopId' => $pfShopId,
             'onlyCg' => $onlyCg,
+            'shareLogo' => $shareLogo,
             'switchShop' => $switchShop,
             'showDemo' => $showDemo,
             'imgUploadApi' => $imgUploadApi,
@@ -553,6 +574,12 @@ class AuthController extends PublicController
         $mainId = $currentShop->mainId ?? 0;
         $pfShopId = $currentShop->pfShopId ?? 0;
         $onlyCg = $currentShop->onlyCg ?? 1;
+
+        $shareLogo = '';
+        if (isset($currentShop->shareLogo) && !empty($currentShop->shareLogo)) {
+            $shareLogo = imgUtil::groupImg($currentShop->shareLogo);
+        }
+
         $shopAdmin = ShopAdminClass::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
         if (empty($shopAdmin)) {
             //没有管理店铺不允许登录
@@ -597,6 +624,7 @@ class AuthController extends PublicController
             'switchShop' => $switchShop,
             'pfShopId' => $pfShopId,
             'onlyCg' => $onlyCg,
+            'shareLogo' => $shareLogo,
             'showDemo' => $showDemo,
             'imgUploadApi' => $imgUploadApi,
             //有小程序新版本提示更新