Merge branch 'dev' into test

src/pages/commodity/goods/addGoods.tsx

@@ -8,7 +8,7 @@ import {
 import ReutrnEle from '@/components/ReturnEle';
 import styles from './index.less'
 import { PublicApi } from '@/services/api';
-import { GetProductCustomerGetCustomerCategoryTreeResponse } from '@/services';
+import { GetProductCustomerGetCustomerCategoryTreeResponse } from '@/services/ProductApi';
 import { validatorByte } from '@/utils/regExp';
 
 const { Option } = Select;

src/pages/commodity/products/fastModifyPrice.tsx

@@ -80,12 +80,12 @@ const FastModifyPrice: React.FC<{}> = () => {
       </EyePreview>
     },
     {
-      title: '品类',
+      title: '商品品类',
       dataIndex: 'customerCategoryName',
       key: 'customerCategoryName',
     },
     {
-      title: '品牌',
+      title: '商品品牌',
       dataIndex: 'brandName',
       key: 'brandName',
     },
@@ -95,6 +95,19 @@ const FastModifyPrice: React.FC<{}> = () => {
       key: 'unitName',
     },
     {
+      title: '商品定价',
+      dataIndex: 'priceType',
+      key: 'priceType',
+      render: (t, r) => {
+        if(t === 1)
+          return '现货价格'
+        if(t === 2)
+          return '价格需要询价'
+        if(t === 3)
+          return '积分兑换商品'
+      }
+    },
+    {
       title: '价格',
       dataIndex: 'min',
       key: 'min',
@@ -366,6 +379,7 @@ const FastModifyPrice: React.FC<{}> = () => {
                       <Col span={24} style={{ display: 'flex', justifyContent: 'flex-end' }}>
                         <Col span={4}>
                           <Select value={filterParams.priceType} onChange={(v) => setFilterParams({ ...filterParams, priceType: +v })} style={{ width: '100%' }} placeholder="商品定价">
+                            <Option value={0}>所有</Option>
                             <Option value={1}>现货价格</Option>
                             {/* <Option value={2}>价格需要询价</Option> */}
                             <Option value={3}>积分兑换商品</Option>

src/pages/trademark/index.tsx

@@ -100,9 +100,11 @@ const Trademark: React.FC<{}> = () => {
                 <Button type='link' onClick={()=>handleApplyCheck(record)}>提交审核</Button>
                 <Dropdown overlay={
                   <Menu>
-                    <Menu.Item>
+                    {
+                      record.isEnable && <Menu.Item>
                         <Button type='link' onClick={()=>history.push(`/memberCenter/commodityAbility/trademark/edit?id=${record.id}`)}>修改</Button>
                       </Menu.Item>
+                    }
                     <Menu.Item>
                       <Button onClick={() => handelDelete(record)} type='link'>删除</Button>
                     </Menu.Item>
@@ -114,7 +116,9 @@ const Trademark: React.FC<{}> = () => {
                 </Dropdown>
               </> :
               <>
-                <Button type='link' onClick={()=>history.push(`/memberCenter/commodityAbility/trademark/add?id=${record.id}`)}>修改</Button>
+                {
+                  record.isEnable && <Button type='link' onClick={()=>history.push(`/memberCenter/commodityAbility/trademark/add?id=${record.id}`)}>修改</Button>
+                }
                 <Button onClick={() => handelDelete(record)} type='link'>删除</Button>
               </>
             }