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

src/locales/zh-CN/shop.ts

@@ -100,8 +100,8 @@ export default {
   'channel.member.relieve.confirm': '确定要解除吗',
   'channel.member.relieve': '解除绑定关系',
   'channel.member.relieve.batch': '批量解除绑定关系',
-  'channel.member.select':'请先选择业务员',
-  'channel.member.wait.bind.select':'选择待绑定渠道会员',
+  'channel.member.select': '请先选择业务员',
+  'channel.member.wait.bind.select': '选择待绑定会员',
   'channel.form.salesman': '业务员',
   'channel.modal.member.select': '选择渠道会员',
   'channel.form.name.placeholder': '输入姓名',

src/pages/classAndProperty/categoryAttributes/index.tsx

@@ -88,6 +88,7 @@ const CategoryAttributes: React.FC<{}> = () => {
   const [selectedTableRowKeys, setSelectedTableRowKeys] = useState<Array<number>>([]) //表格选择
   const [linkTableRowData, setLinkTableRowData] = useState<any[]>([])
   const [goodsRowSelection, goodsRowCtl] = useRowSelectionTable()
+  const flag = useRef<boolean>(false) // 标识 初始点击品类不执行effect的重载表格
 
   const {
     treeStatus,
@@ -107,12 +108,17 @@ const CategoryAttributes: React.FC<{}> = () => {
 
   // 获取选中项的关联属性列表
   useEffect(() => {
-    if (selectKey)
+    if (selectKey && flag.current) {
       ref.current.reload()
-    // ref.current.reload({ current: 1, pageSize: 10, name: '', categoryId: selectKey, isByCategory: true })
+    } else if(!selectKey) {
+      flag.current = false
+    } else {
+      flag.current = true
+    }
   }, [selectKey])
 
   const fetchLinkAttributeData = (params: any) => {
+    console.log(1)
     return new Promise((resolve, reject) => {
       getProductCustomerGetCustomerCategoryAttributeList({
         ...params,
@@ -128,6 +134,7 @@ const CategoryAttributes: React.FC<{}> = () => {
 
   // 获取所有属性列表
   const fetchAttributeData = (params: any) => {
+    console.log(2)
     return new Promise((resolve, reject) => {
       getProductCustomerGetCustomerCategoryAttributeList({
         ...params,

src/pages/classAndProperty/propertyValue/index.tsx

@@ -95,6 +95,7 @@ const PropertyValue: React.FC<{}> = () => {
   // const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
   // const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
   const [rowSelection, rowSelectionCtl] = useRowSelectionTable({ customKey: 'id' })
+  const flag = useRef<boolean>(false) // 标识 初始点击品类不执行effect的重载表格
 
   const {
     treeData,
@@ -119,8 +120,12 @@ const PropertyValue: React.FC<{}> = () => {
   }, [])
 
   useEffect(() => {
-    if (selectKey) {
+    if (selectKey && flag.current) {
       ref.current.reload({ current: 1, pageSize: 10, name: '', customerAttributeId: selectKey })
+    } else if(!selectKey) {
+      flag.current = false
+    } else {
+      flag.current = true
     }
   }, [selectKey])
 
@@ -217,7 +222,7 @@ const PropertyValue: React.FC<{}> = () => {
                   type='link'
                   onClick={() => history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/edit?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}`)}
                 >
-                  {intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.option.button.1' })}
+                  {intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.1' })}
                 </Button>
                 <Popconfirm
                   title={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2.popconfirm.title' })}

src/pages/commodity/products/checkProduct.tsx

@@ -12,7 +12,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const'
 import { createFormActions, FormEffectHooks } from '@formily/antd'
 import { searchBrandOptionEffect, searchCustomerCategoryOptionEffect } from './effect'
-import { getProductCommodityGetPlatformCommodityList } from '@/services/ProductV2Api'
+import { getProductCommodityGetUnCheckCommodityList } from '@/services/ProductV2Api'
 
 const formActions = createFormActions();
 
@@ -142,7 +142,7 @@ const CheckProduct: React.FC<{}> = () => {
 
   const fetchData = (params) => {
     return new Promise((resolve, reject) => {
-      getProductCommodityGetPlatformCommodityList({ ...params, status: 2 }).then(res => {
+      getProductCommodityGetUnCheckCommodityList(params).then(res => {
         const { data } = res
         resolve(data)
       })

src/pages/commodity/products/checkProductDetail.tsx

@@ -451,7 +451,7 @@ const CheckProductDetail: React.FC<{}> = () => {
           <Steps progressDot current={fixStep}>
             <Step title={intl.formatMessage({ id: 'commodity.checkProductDetail.step.title.1' })} description={intl.formatMessage({ id: 'commodity.checkProductDetail.step.description.1' })} />
             <Step title={intl.formatMessage({ id: 'commodity.checkProductDetail.step.title.2' })} description={intl.formatMessage({ id: 'commodity.checkProductDetail.step.description.2' })} />
-            <Step title={intl.formatMessage({ id: 'commodity.checkProductDetail.step.title.3' })} description={intl.formatMessage({ id: 'commodity.checkProductDetail.step.description.3' })} />
+            <Step title={intl.formatMessage({ id: 'commodity.checkProductDetail.step.title.3' })} description={intl.formatMessage({ id: 'commodity.checkProductDetail.step.description.2' })} />
             <Step title={intl.formatMessage({ id: 'commodity.checkProductDetail.step.title.4' })} description="" />
           </Steps>
         </Card>

src/pages/commodity/products/viewProducts.tsx

@@ -274,7 +274,13 @@ const viewProducts: React.FC<{}> = () => {
           <Steps progressDot current={fixStep}>
             <Step title={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.1' })} description={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.1.description' })} />
             <Step title={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.2' })} description={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.2.description' })} />
-            <Step title={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.3' })} description={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.3.description' })} />
+            {
+              productDetail?.checkType === 1
+              ?
+              <Step title={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.3' })} description={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.2.description' })} />
+              :
+              <Step title={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.3' })} description={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.3.description' })} />
+            }
             <Step title={intl.formatMessage({ id: 'commodity.products.viewProducts.card.1.step.4' })} description="" />
           </Steps>
         </Card>