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

src/pages/commodity/productWillCheck/index.tsx

@@ -97,10 +97,18 @@ const Products: 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.max === reocrd.min)
+            return <>￥{reocrd.min}</>
+          else
+            return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
+        }
+        if(reocrd.priceType === 3){
+          if(reocrd.max === reocrd.min)
+            return <>{reocrd.min}</>
+          else
+            return <>{reocrd.min} ~ {reocrd.max}</>
+        }
         if(reocrd.priceType === 2)
           return null
       }

src/pages/commodity/products/index.tsx

@@ -111,10 +111,18 @@ const Products: 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.max === reocrd.min)
+            return <>￥{reocrd.min}</>
+          else
+            return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
+        }
+        if(reocrd.priceType === 3){
+          if(reocrd.max === reocrd.min)
+            return <>{reocrd.min}</>
+          else
+            return <>{reocrd.min} ~ {reocrd.max}</>
+        }
         if(reocrd.priceType === 2)
           return null
       }

src/pages/trademark/trademarkSearch/index.tsx

@@ -48,7 +48,7 @@ const Trademark: React.FC<{}> = () => {
       key: 'memberName',
     },
     {
-      title: '申请时间',
+      title: '申请审核时间',
       dataIndex: 'applyTime',
       key: 'applyTime',
       render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss'),

src/pages/trademark/trademarkWillCheck/index.tsx

@@ -50,7 +50,7 @@ const Trademark: React.FC<{}> = () => {
       key: 'memberName',
     },
     {
-      title: '申请时间',
+      title: '申请审核时间',
       dataIndex: 'applyTime',
       key: 'applyTime',
       render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss'),