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

src/pages/commodity/products/addChannelItem/selectChannel.tsx

@@ -12,6 +12,7 @@ import ModalTable from '@/components/ModalTable'
 import { store } from '@/store'
 import { observer } from 'mobx-react'
 import EyePreview from '@/components/EyePreview';
+import { clearModalParams } from '@/utils';
 
 const { Search } = Input
 const { Option } = Select
@@ -199,6 +200,7 @@ const SelectChannel:React.FC<IProps> = (props) => {
     setVisibleChannelMember(false)
     console.log(memberRowCtl.selectRow, memberRowCtl.selectedRowKeys, '选中的项')
     setSelectMemberRow(memberRowCtl.selectRow)
+    clearModalParams()
   }
 
   const clickDeleteMember = (record: any) => {
@@ -210,6 +212,7 @@ const SelectChannel:React.FC<IProps> = (props) => {
 
   const handleCancelAddMember = () => {
     setVisibleChannelMember(false)
+    clearModalParams()
   }
 
   const roleChange = (value: number, option: IOption) => {

src/pages/commodity/products/addChannelItem/selectProduct.tsx

@@ -19,6 +19,7 @@ import Submit from '@/components/NiceForm/components/Submit'
 
 import { inject, observer } from 'mobx-react'
 import { store } from '@/store'
+import { clearModalParams } from '@/utils';
 
 const layout = {
   labelCol: {
@@ -173,11 +174,13 @@ const SelectProduct:React.FC<IProps> = (props) => {
   const handleOkAddTabs = () => {
     setSelectProduct(productRowCtl.selectRow)
     setVisibleAddTabs(false)
+    clearModalParams()
   }
 
   const handleCancelAddTabs = () => {
     setVisibleAddTabs(false)
     productRowCtl.setSelectedRowKeys([])
+    clearModalParams()
   }
 
   const clickDelete = (record: any) => {

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -690,6 +690,11 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
             message: '请输入最小起订数'
           },
           {
+            type: 'number',
+            min: 0.001,
+            message: '请输入大于0的数值',
+          },
+          {
             pattern: /^\d+(\.\d{1,3})?$/,
             message: '最小起订数小数点后仅限三位',
           }
@@ -714,7 +719,8 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         // initialValue={planPrice}
       >
         {
-          history.location.query?.id ? <Radio.Group onChange={handlePlanPriceChange} disabled={!productInfoByEdit.isUpdateAttribute}>
+          // disabled={!productInfoByEdit.isUpdateAttribute}
+          history.location.query?.id ? <Radio.Group onChange={handlePlanPriceChange}>
             <Radio value={1}>现货价格</Radio>
             <Radio value={2}>价格需要询价</Radio>
             <Radio value={3}>积分兑换商品</Radio>