花店 宣传页

app-ghs/controllers/SetMealController.php

@@ -50,7 +50,7 @@ class SetMealController extends BaseController
 	{
 		$id = Yii::$app->request->get('id', 1);
 		$detail = SetMealService::getSetById($id);
-		$detail['introduce'] = '适用于5人以下的花店，可以满足日常的经常、管理和营销需求。';
+		$detail['introduce'] = '可以满足日常的经常、管理和营销需求。';
 		$function = [
 			['name' => '小程序商城', 'has' => 1],
 			['name' => '节日涨价', 'has' => 1],

app-hd/controllers/MerchantController.php

@@ -107,11 +107,16 @@ class MerchantController extends BaseController
     //商家信息 ssh 2020.1.11
     public function actionIntroduceShop()
     {
-        $id = Yii::$app->request->get('shopAdminId');
-        if (empty($id)) {
-            util::success([]);
+        $ghsShopAdminId = Yii::$app->request->get('ghsShopAdminId');
+        $hdShopAdminId = Yii::$app->request->get('hdShopAdminId');
+        if (!empty($ghsShopAdminId)) {
+            $relation = ShopAdminClass::getById($ghsShopAdminId);
+        } else {
+            if (empty($hdShopAdminId)) {
+                util::success([]);
+            }
+            $relation = ShopAdminClass::getById($hdShopAdminId);
         }
-        $relation = ShopAdminClass::getById($id);
         if (empty($relation)) {
             util::success([]);
         }

app-hd/controllers/ProductController.php

@@ -115,19 +115,25 @@ class ProductController extends BaseController
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
         $shopId = $get['shopId'] ?? 0;
-        if (empty($id)) {
-            if (!empty($this->shopId)) {
-                $ghs = GhsClass::build($shopId, $this->shopId, $this->sjId);
-                $sjId = $ghs['ghsSjId'] ?? 0;
+        $ghsShopAdminId = isset($get['ghsShopAdminId']) && !empty($get['ghsShopAdminId']) ?? 0;
+        if (!empty($ghsShopAdminId)) {
+
+        } else {
+            if (empty($id)) {
+                if (!empty($this->shopId)) {
+                    $ghs = GhsClass::build($shopId, $this->shopId, $this->sjId);
+                    $sjId = $ghs['ghsSjId'] ?? 0;
+                } else {
+                    $shop = ShopClass::getShopInfo($shopId);
+                    $sjId = $shop['merchantId'] ?? 0;
+                }
             } else {
-                $shop = ShopClass::getShopInfo($shopId);
-                $sjId = $shop['merchantId'] ?? 0;
+                $ghs = GhsClass::getGhsInfo($id);
+                $sjId = $ghs['ghsSjId'] ?? 0;
             }
-        } else {
-            $ghs = GhsClass::getGhsInfo($id);
-            $sjId = $ghs['ghsSjId'] ?? 0;
         }
 
+
         //获取所有当前供应商的分类 （全部、常用）
         //根据分类组装分类下的花材信息
         $classIds = ItemClassClass::getGhsItemClassAll($sjId);

app-hd/controllers/SetMealController.php

@@ -50,7 +50,7 @@ class SetMealController extends BaseController
     {
         $id = Yii::$app->request->get('id', 1);
         $detail = SetMealService::getSetById($id);
-        $detail['introduce'] = '适用于5人以下的花店，可以满足日常的经常、管理和营销需求。';
+        $detail['introduce'] = '可以满足日常的经常、管理和营销需求。';
         $function = [
             ['name' => '小程序商城', 'has' => 1],
             ['name' => '节日涨价', 'has' => 1],

app-pt/controllers/SetMealController.php

@@ -48,7 +48,7 @@ class SetMealController extends BaseController
 	{
 		$id = Yii::$app->request->get('id', 1);
 		$detail = SetMealService::getSetById($id);
-		$detail['introduce'] = '适用于5人以下的花店，可以满足日常的经营、管理和营销需求。';
+		$detail['introduce'] = '可以满足日常的经营、管理和营销需求。';
 		$function = [
 			['name' => '微信商城', 'has' => 1],
 			['name' => '节日自动涨价', 'has' => 1],