Merge branch 'redesign‌-260706' into dev

app-hd/controllers/MainController.php

@@ -124,7 +124,7 @@ class MainController extends BaseController
             $goodsShortUrl = 'wx_mini_goods_short_url' . $shopId;
             $goodsLink = Yii::$app->redis->executeCommand('GET', [$goodsShortUrl]);
             if (empty($goodsLink)) {
-                $goods = miniUtil::generateShortLink($merchant, 'pages/home/category?account=' . $shopId, '', $ptStyle);
+                $goods = miniUtil::generateShortLink($merchant, 'pages/home/index?account=' . $shopId, '', $ptStyle);
                 $goodsLink = $goods['link'] ?? '';
                 Yii::$app->redis->executeCommand('SETEX', [$goodsShortUrl, 86400 * 3, $goodsLink]);
             }

app-hd/controllers/ShMethodController.php

@@ -30,9 +30,9 @@ class ShMethodController extends BaseController
         $shopId = $ghs['shopId'] ?? 0;
         $mainId = $ghs['mainId'] ?? 0;
 
-        if (!in_array($shopId, [36523, 0])) {
-            util::success([]);
-        }
+//        if (!in_array($shopId, [36523, 0])) {
+//            util::success([]);
+//        }
 
         try {
             $customId = $ghs['customId'] ?? 0;

biz-hd/goods/classes/GoodsCategoryClass.php

@@ -47,7 +47,7 @@ class GoodsCategoryClass extends BaseClass
             }
         }
         if (!empty($askInfo['searchText'])) {
-            if($askInfo['searchType'] == 1){
+            if(isset($askInfo['searchType']) && $askInfo['searchType'] == 1){
                 $query->andWhere(['xhGoods.sn' => $askInfo['searchText']]);
             }else{
                 $query->andWhere(['like', 'xhGoods.name', $askInfo['searchText']]);