Merge branch 'fix418' into 'v2-220418'

src/pages/commodity/products/components/putawayGuide/index.tsx

@@ -37,6 +37,8 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
     ...restProps
   } = props
 
+  const _data = Array.from(new Set(data))
+
   return (
     <Modal
       title={intl.formatMessage({ id: 'commodity.putawayGuide.modal.title', defaultMessage: "商品上架引导" })}
@@ -66,7 +68,7 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
             currentStep === GuideMenu.ConfigStore
             ?
             <>
-              <p>{intl.formatMessage({id: 'commodity.putawayGuide.modal.p.2.first',defaultMessage:'您选择的商品：'})}{data.toString()} {intl.formatMessage({id: 'commodity.putawayGuide.modal.p.2.last',defaultMessage:'还没有配置仓位库存。'})}</p>
+              <p>{intl.formatMessage({id: 'commodity.putawayGuide.modal.p.2.first',defaultMessage:'您选择的商品：'})}{_data.toString()} {intl.formatMessage({id: 'commodity.putawayGuide.modal.p.2.last',defaultMessage:'还没有配置仓位库存。'})}</p>
               <Button onClick={()=> history.push('/memberCenter/commodityAbility/repositories')}>{intl.formatMessage({id: 'commodity.putawayGuide.modal.button.2', defaultMessage: '配置仓位库存'})}</Button>
             </>
             :
@@ -80,7 +82,7 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
             currentStep === GuideMenu.ConfigProcess
             ?
             <>
-              <p>{intl.formatMessage({id: 'commodity.putawayGuide.modal.p.3.first',defaultMessage:'您选择的商品：'})}{data.toString()} {intl.formatMessage({id: 'commodity.putawayGuide.modal.p.3.last',defaultMessage:'还没有配置订单流程。'})}</p>
+              <p>{intl.formatMessage({id: 'commodity.putawayGuide.modal.p.3.first',defaultMessage:'您选择的商品：'})}{_data.toString()} {intl.formatMessage({id: 'commodity.putawayGuide.modal.p.3.last',defaultMessage:'还没有配置订单流程。'})}</p>
               <Button onClick={()=> history.push('/memberCenter/tranactionAbility/transactionRules') }>{intl.formatMessage({id: 'commodity.putawayGuide.modal.button.3', defaultMessage: '配置订单流程'})}</Button>
             </>
             :

src/pages/trademark/addBrand.tsx

@@ -10,7 +10,8 @@ import { validatorByte } from '@/utils/regExp'
 import UploadImage from '@/components/UploadImage'
 import { getAuth } from '@/utils/auth'
 import { getProductBrandGetBrand, postProductBrandApplyCheckBrand, postProductBrandSaveOrUpdateBrand } from '@/services/ProductV2Api'
-import { postManageActivityShopRuleExistShop } from '@/services/ManageV2Api'
+import { getManagePaasSiteEnableMultiTenancy } from '@/services/ManageV2Api'
+import { GlobalConfig } from '@/global/config'
 
 const { Step } = Steps;
 
@@ -60,9 +61,11 @@ const AddBrand: React.FC<{}> = () => {
         }
       })
     }
-    postManageActivityShopRuleExistShop({memberId, memberRoleId}, { ctlType: 'none' }).then(res => {
-      const { code, data } = res
-      setHasSelfStore(data)
+    const siteId = GlobalConfig.global.siteInfo.id
+    getManagePaasSiteEnableMultiTenancy({siteId}).then(({code, data}) => {
+      if(code === 1000) {
+        setHasSelfStore(data)
+      }
     })
   }, [])
 

src/pages/trademark/checkBrandDetail.tsx

@@ -11,8 +11,9 @@ import ReutrnEle from '@/components/ReturnEle'
 import moment from 'moment'
 import styles from './index.less'
 import { getProductBrandGetBrandCheckRecord, getProductBrandGetBrand, postProductBrandCheckBrand } from '@/services/ProductV2Api'
-import { postManageActivityShopRuleExistShop } from '@/services/ManageV2Api'
+import { getManagePaasSiteEnableMultiTenancy } from '@/services/ManageV2Api'
 import { getAuth } from '@/utils/auth'
+import { GlobalConfig } from '@/global/config'
 
 const { Step } = Steps
 const { TextArea } = Input
@@ -38,9 +39,11 @@ const CheckBrandDetail: React.FC<{}> = () => {
     if(id){
       loadPageData(id)
     }
-    postManageActivityShopRuleExistShop({memberId, memberRoleId}, { ctlType: 'none' }).then(res => {
-      const { code, data } = res
-      setHasSelfStore(data)
+    const siteId = GlobalConfig.global.siteInfo.id
+    getManagePaasSiteEnableMultiTenancy({siteId}).then(({code, data}) => {
+      if(code === 1000) {
+        setHasSelfStore(data)
+      }
     })
   }, [])