Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui...

Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui into feature/20230327_public_takeaway

src/pages/GoodsManage/Takeaway/components/GoodsGroup.jsx

@@ -17,9 +17,10 @@ const GoodsGroup = forwardRef((options, ref) => {
   const [tags, setTags] = useState([]);
 
   const getShopList = async () => {
-    const user = localStorage.getItem('user');
-    const json = JSON.parse(user);
-    const res = await apiSupplierShopList(json.id);
+    const res = await apiSupplierShopList({
+      state: 1,
+      productBusiness: 1,
+    });
     if (res && res.data && res.data.length > 0) {
       setShops(
         res.data.map(item => ({

src/pages/GoodsManage/service.js

@@ -320,8 +320,8 @@ export async function apiTopTakeawayGoods(data) {
   });
 }
 // 获取供应商门店列表
-export async function apiSupplierShopList() {
-  return request.get('/api/merchants/shops/getBySupplierId?state=1', {
+export async function apiSupplierShopList(params) {
+  return request.get(`/api/merchants/shops/getBySupplierId?${stringify(params)}`, {
     prefix: goodsApi,
   });
 }