feat: 修改商品名称

src/pages/ServiceGoods/components/FormInformationBasic.jsx

@@ -12,6 +12,7 @@ import { ServiceContext } from '../context';
 import { debounce } from '@/utils/utils';
 import AddMenusModal from './AddMenusModal';
 import UploadImage from './UploadImage';
+import UploadCropImage from './UploadCropImage'
 import { apiShopIds, apiQueryShopList, getByProductType } from '../service';
 import GroupInfo from '../../GoodsManage/Takeaway/components/GroupInfo';
 
@@ -202,7 +203,7 @@ const FormInformationBasic = forwardRef((props, ref) => {
           name="name"
           label="商品名称"
           rules={[
-            { required: true, min: 2, message: '请输入最少两个字符的商品名称', whitespace: true },
+            { required: true, min: 2, max: 30, message: '请输入大于2个且小于30字符的商品名称', whitespace: true },
           ]}
         >
           <Input placeholder="请输入商品名称" disabled={customer.isDisabled} />
@@ -270,7 +271,7 @@ const FormInformationBasic = forwardRef((props, ref) => {
             },
           ]}
         >
-          <UploadImage
+          <UploadCropImage
             name="takeawayImageList"
             limit={5}
             disabled={customer.isDisabled}

src/pages/ServiceGoods/components/FormTakeaway.jsx

@@ -31,7 +31,7 @@ import { Title } from './CommonTemplate';
 import { formItemLayout, ENUM_REPERTORY, ENUM_SET_REPERTORY, ENUM_WEEK } from '../config';
 import { ServiceContext } from '../context';
 import { debounce } from '@/utils/utils';
-import UploadImage from './UploadImage';
+import UploadCropImage from './UploadCropImage';
 // import AddSellTimeModal from './AddSellTimeModal';
 import styles from '../common.less';
 import AddRepertoryModal from './AddRepertoryModal';
@@ -163,7 +163,8 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
         salePrice,
         maxStock,
         quantity,
-        unit: (Array.isArray(unit) && unit?.length && unit?.splice(unit?.length - 1)[0]) || unit,
+        // unit: (Array.isArray(unit) && unit?.length && unit?.splice(unit?.length - 1)[0]) || unit,
+        unit,
         productStock,
         specGroupName: '份量',
       };
@@ -471,6 +472,19 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
       if (!editData) return;
       let { label, firstCategoryId, secondCategoryId, thirdCategoryId, id } = editData;
       editData.label = label.split(',').map(item => +item);
+      let specList = editData?.specList;
+      let weight = specList.filter(item => item.specGroupName === '份量');
+      const tempWeightName = JSON.parse(sessionStorage.getItem('weightUnits'));
+      weight.forEach(item => {
+        if (item?.specs?.length) {
+          item.specs.forEach(itm => {
+            if (tempWeightName.includes(itm.unit)) {
+              itm.quantity =
+                itm?.quantity.indexOf('约') > -1 ? itm?.quantity.slice(1) : itm?.quantity || '';
+            }
+          });
+        }
+      });
       if (editData?.skuList.length) {
         editData.minPurchaseNum = editData?.skuList[0]?.serviceItem.minPurchaseNum;
         // 单规格
@@ -483,7 +497,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
           } = editData?.skuList[0];
           let { quantity, unit, salePrice } = specs[0];
           editData.productStock = productStock;
-          editData.quantity = quantity;
+          editData.quantity =  `${quantity}`.indexOf('约') > -1 ? quantity.slice(1) :quantity || '';;
           editData.unit = unit;
           editData.salePrice = salePrice;
           editData.maxStock = maxStock;
@@ -583,7 +597,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
           label="商品图片"
           extra="支持.jpg/png格式图片，建议单张切片宽750像素，大小200kb左右，您可以拖拽图片调整顺序，最多上传5张。"
         >
-          <UploadImage
+          <UploadCropImage
             name="detailImageList"
             limit={5}
             disabled={customer.isDisabled}
@@ -601,7 +615,6 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
           <InputNumber
             min={1}
             max={999999999}
-            precision={2}
             style={{ width: 200 }}
             placeholder="请输入购买量"
           />
@@ -695,7 +708,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
         )}
         <Form.Item name="label" label="商品标签">
           <Select
-            mode="multiple"
+            // mode="multiple"
             allowClear
             placeholder="请选择商品标签"
             style={{ width: 400 }}
@@ -793,7 +806,6 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
                 <InputNumber
                   min={0}
                   max={999999999}
-                  precision={2}
                   style={{ width: 200, display: 'inline-block' }}
                   placeholder="请输入"
                 />
@@ -813,7 +825,6 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
               <InputNumber
                 max={999999999}
                 min={0}
-                precision={2}
                 style={{ width: 200 }}
                 placeholder="请输入"
                 onChange={onChangeMaxStock}

src/pages/ServiceGoods/components/UploadCropImage.jsx

@@ -238,7 +238,7 @@ const UploadCropImage = forwardRef((props, ref) => {
       {limit !== null && fileList.length >= limit ? (
         ''
       ) : (
-        <ImgCrop rotationSlider modalWidth={1200} quality={0.5} showReset>
+        <ImgCrop rotationSlider modalWidth={900} modalHeight={900} quality={0.5} showReset>
           <Upload
             {...uploadParams}
             disabled={Boolean(disabled)}

src/pages/ServiceGoods/utils.js

@@ -117,10 +117,10 @@ export const filterSendData = (type, params) => {
     temp.categoryId = (Array.isArray(temp.categoryId) && temp.categoryId?.slice(temp.categoryId?.length - 1)?.toString())
     temp.productRefShopId = temp.productRefShopId.toString()
     const tempWeightName = JSON.parse(sessionStorage.getItem('weightUnits'))
-    // console.log(tempWeightName, 'tempWeightName');
     temp.items.forEach(item => {
       item.autoStock = item.autoStock ? 1 : 0
       item.serviceItem.autoStock = item?.serviceItem?.autoStock ? 1 : 0
+      item.productStock = item?.serviceItem?.productStock
       if (item?.specs?.length) {
         item?.specs.forEach(itm => {
           if (tempWeightName.includes(itm.unit)) {
@@ -132,6 +132,7 @@ export const filterSendData = (type, params) => {
     temp.specList && temp.specList.forEach(item => {
       if (item?.specs?.length) {
         item?.specs.forEach(itm => {
+          itm.unit = (Array.isArray(itm.unit) && itm.unit?.length>=2 && itm.unit?.splice(itm.unit?.length - 1)[0]) ||  itm.unit
           if (tempWeightName.includes(itm.unit)) {
             itm.quantity = `${itm?.quantity}`.indexOf('约') > -1 ? itm?.quantity : `约${itm?.quantity}`
           }