Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/api/model/Category.php

@@ -41,6 +41,8 @@ class Category extends CategoryModel
      */
     public function getListPublic(array $param = []): array
     {
+        //添加店内分类
+        $param['is_in_store'] = !empty($param['is_in_store']) ? $param['is_in_store'] : 0;
         return parent::getList(array_merge($param, ['status' => 1]));
     }
 }

app/api/service/Goods.php

@@ -128,6 +128,7 @@ class Goods extends GoodsService
             'is_delete' => 0,
             'is_brand' => $_GET['is_brand'],
             'is_new' => $_GET['is_new'],
+            'is_in_store' => $_GET['is_in_store'] ?? 0,//是否店内
             'store_id' => $storeid,
             'categoryId' => (int)$_GET['categoryId'],
         ], 15);