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/StockModal.jsx

@@ -42,7 +42,7 @@ const StockModal = options => {
       skuId: options.skuIds[0],
       shopId: options.shopId,
     });
-    if (res && res.code === '0000' && res.businessCode === '0000') {
+    if (res && res.code === '0000' && res.businessCode === '0000' && res.data) {
       const info = res.data;
       form.setFieldsValue({
         autoStockStep: info.autoStockStep,

src/pages/GoodsManage/Takeaway/index.jsx

@@ -60,8 +60,8 @@ const Takeaway = options => {
     const res = await apiTakeawayGoods(params);
     setLoading(false);
     if (res && res.data) {
-      setTableData(res.data.records);
-      setTotal(res.data.total);
+      setTableData(res.data.records || []);
+      setTotal(res.data.total || 0);
     }
   };
   const onPageChange = (page, size) => {