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

src/pages/classAndProperty/class/index.tsx

@@ -115,6 +115,9 @@ const ClassProperty: React.FC<{}> = () => {
   }
 
   const handlePlateformSelect = (key, node) => {
+    if (node.children && node.children.length > 0) {
+      return ;
+    }
     setPlateformSelectNode({id: key*1, name: node._title})
   }
 

src/pages/classAndProperty/propertyValue/addPropertyValue.tsx

@@ -139,9 +139,14 @@ const AddPropertyValue: React.FC<{}> = () => {
   }
 
   const handlePlateformSelect = (key, node) => {
-    let arr = key.split('_')
-    setSelectKey(arr[arr.length-1]*1)
-    setSelectRow(node)
+    if (node.children && node.children.length > 0) {
+      return ;
+    }
+    if(key){
+      let arr = key.split('_')
+      setSelectKey(arr[arr.length-1]*1)
+      setSelectRow(node)
+    }
   }
 
   const onCommodityAreaChange = (value: any, selected: any) => {

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

@@ -592,6 +592,10 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         }
         rules={[
           {
+            required: true,
+            message: '请输入最小起订数'
+          },
+          {
             pattern: /^\d+(\.\d{1,3})?$/,
             message: '最小起订数小数点后仅限三位',
           }

src/pages/commodity/products/fastModifyPrice.tsx

@@ -99,16 +99,24 @@ const FastModifyPrice: React.FC<{}> = () => {
       dataIndex: 'min',
       key: 'min',
       render: (text:any, reocrd:any) => {
-        if(reocrd.priceType === 1)
-          return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
-        if(reocrd.priceType === 3)
-          return <>{reocrd.min} ~ {reocrd.max}</>
+        if(reocrd.priceType === 1){
+          if(reocrd.min === reocrd.min)
+            return <>￥{reocrd.min}</>
+          else
+            return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
+        }
+        if(reocrd.priceType === 3){
+          if(reocrd.min === reocrd.min)
+            return <>{reocrd.min}</>
+          else
+            return <>{reocrd.min} ~ {reocrd.max}</>
+        }
         if(reocrd.priceType === 2)
           return null
       }
     },
     {
-      title: '审核时间',
+      title: '申请审核时间',
       dataIndex: 'applyTime',
       key: 'applyTime',
       render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss')
@@ -124,9 +132,9 @@ const FastModifyPrice: React.FC<{}> = () => {
         else if (record.status === 2)
           component = (<><span className="commonStatusModify"></span>待审核</>)
         else if (record.status === 3)
-          component = (<><span className="commonStatusValid"></span>审核通过</>)
-        else if (record.status === 4)
           component = (<><span className="commonStatusInvalid"></span>审核不通过</>)
+        else if (record.status === 4)
+          component = (<><span className="commonStatusValid"></span>审核通过</>)
         else if (record.status === 5)
           component = (<span style={{ color: '#00B37A', padding: '2px 5px', background: 'rgba(235,247,242,1)', borderRadius: '4px' }}>已上架</span>)
         else if (record.status === 6)
@@ -358,7 +366,7 @@ const FastModifyPrice: React.FC<{}> = () => {
                         <Col span={4}>
                           <Select value={filterParams.priceType} onChange={(v) => setFilterParams({ ...filterParams, priceType: +v })} style={{ width: '100%' }} placeholder="商品定价">
                             <Option value={1}>现货价格</Option>
-                            <Option value={2}>价格需要询价</Option>
+                            {/* <Option value={2}>价格需要询价</Option> */}
                             <Option value={3}>积分兑换商品</Option>
                           </Select>
                         </Col>