Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/editor/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.tsx

@@ -105,6 +105,7 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
       }
       if (selectKeys.length > 4) {
         message.error('最多推荐4个二级品类')
+        reject()
         return
       }
       const param = {
@@ -126,6 +127,8 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
         } else {
           reject()
         }
+      }).catch(() => {
+        reject()
       })
     })
   }

src/pages/editor/settingsPanel/propsSettings/components/GoodsSetting/index.tsx

@@ -98,7 +98,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
 
   useEffect(() => {
     fetchGoodsList()
-  }, [filterParam, current])
+  }, [filterParam, current, pageSize])
 
   const fetchGoodsList = () => {
     let param: any = {
@@ -199,7 +199,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
     //   message.error("请选择要推荐的商品")
     //   return
     // } else
-    if (selectGoodsList.length > 10) {
+    if (selectGoodsList.length > 9) {
       message.error("最多只能推荐10件商品")
       return
     }