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

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

@@ -108,10 +108,10 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
     if (JSON.stringify(brandList) === JSON.stringify(selectBrandList)) {
       return
     }
-    if (selectBrandList.length <= 0) {
-      message.error("请选择要推荐的品牌")
-      return
-    }
+    // if (selectBrandList.length <= 0) {
+    //   message.error("请选择要推荐的品牌")
+    //   return
+    // }
     setConfirmLoading(true)
     saveBrand().then(() => {
       changeProps({

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

@@ -190,11 +190,12 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
     if (JSON.stringify(goodsList) === JSON.stringify(selectGoodsList)) {
       return
     }
-    console.log('handleConfirmSave2')
-    if (selectGoodsList.length <= 0) {
-      message.error("请选择要推荐的商品")
-      return
-    } else if (selectGoodsList.length > 10) {
+    // console.log('handleConfirmSave2')
+    // if (selectGoodsList.length <= 0) {
+    //   message.error("请选择要推荐的商品")
+    //   return
+    // } else 
+    if (selectGoodsList.length > 10) {
       message.error("最多只能推荐10件商品")
       return
     }

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

@@ -110,10 +110,10 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
       return
     }
 
-    if (selectShopsList.length <= 0) {
-      message.error("请选择要推荐的店铺")
-      return
-    }
+    // if (selectShopsList.length <= 0) {
+    //   message.error("请选择要推荐的店铺")
+    //   return
+    // }
     setConfirmLoading(true)
     saveShop().then(() => {
       changeProps({

src/pages/lxMall/commodityDetail/index.tsx

@@ -460,9 +460,9 @@ const CommodityDetail = (props) => {
       return
     }
 
-    if (stockCount < commodityDetail.minOrder) {
+    if (buyCount < commodityDetail.minOrder) {
       message.destroy()
-      message.info("库存不足")
+      message.info("购买数量不能低于最小购买量")
       return
     }
 

src/pages/lxMall/layouts/index.less

@@ -3,5 +3,6 @@
 
   .content {
     position: relative;
+    min-height: 600px;
   }
 }
\ No newline at end of file

src/pages/lxMall/purchaseOrder/index.tsx

@@ -734,7 +734,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
                           }
                         </div>
                         <div className={cx(styles.order_list_item_item, styles.count)}>
-                          <InputNumber disabled={true} max={childItem.stockCount || 0} min={childItem.commodityUnitPrice.commodity.minOrder || 1} value={childItem.count} onChange={(value) => handleCountChange(value, childItem.id)} />
+                          <InputNumber max={childItem.stockCount || 0} min={childItem.commodityUnitPrice.commodity.minOrder || 1} value={childItem.count} onChange={(value) => handleCountChange(value, childItem.id)} />
                           <div className={styles.stock}>
                             <span>(库存{numFormat(childItem.stockCount)}{childItem.commodityUnitPrice.commodity.unitName})</span>
                           </div>