Commit 3cc799a9 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 商品品牌新增用于判断流程是平台审核还是供应商审核

parent 268c0496
......@@ -10,6 +10,7 @@ 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'
const { Step } = Steps;
......@@ -32,7 +33,8 @@ const AddBrand: React.FC<{}> = () => {
const [formValues, setFormValues] = useState<any>({})
const [isDisabledSave, setIsDisabledSave] = useState<boolean>(false)
const [isDisabledCheck, setDisabledCheck] = useState<boolean>(true)
const { roles, memberRoleId } = getAuth() || {};
const [hasSelfStore, setHasSelfStore] = useState<boolean>(false)
const { roles, memberRoleId, memberId } = getAuth() || {};
useEffect(() => {
const { id } = history.location.query
......@@ -58,6 +60,10 @@ const AddBrand: React.FC<{}> = () => {
}
})
}
postManageActivityShopRuleExistShop({memberId, memberRoleId}, { ctlType: 'none' }).then(res => {
const { code, data } = res
setHasSelfStore(data)
})
}, [])
useEffect(() => {
......@@ -143,7 +149,13 @@ const AddBrand: React.FC<{}> = () => {
<Card headStyle={{ borderBottom: 'none' }} title={intl.formatMessage({ id: 'trademark.addBrand.card.1' })}>
<Steps progressDot current={currentStep}>
<Step title={intl.formatMessage({ id: 'trademark.addBrand.card.1.step.1' })} description={roles.filter(item => item.memberRoleId === memberRoleId)[0]['memberRoleName']} />
<Step title={intl.formatMessage({ id: 'trademark.addBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.addBrand.card.1.step.2.description' })} />
{
hasSelfStore
?
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} />
:
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} />
}
<Step title={intl.formatMessage({ id: 'trademark.addBrand.card.1.step.3' })} description="" />
</Steps>
</Card>
......
......@@ -212,7 +212,7 @@ const CheckBrandDetail: React.FC<{}> = () => {
<Card headStyle={{borderBottom:'none'}} title={intl.formatMessage({ id: 'trademark.viewBrand.card.1' })}>
<Steps progressDot current={fixStep}>
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} />
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} />
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} />
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description="" />
</Steps>
</Card>
......
......@@ -12,6 +12,8 @@ import moment from 'moment'
import styles from './index.less'
import { productStatusColor, productStatusLabel } from '../commodity/products/constant'
import { getProductBrandGetBrand, getProductBrandGetBrandCheckRecord } from '@/services/ProductV2Api'
import { getAuth } from '@/utils/auth'
import { postManageActivityShopRuleExistShop } from '@/services/ManageV2Api'
const { Step } = Steps;
......@@ -24,10 +26,12 @@ const BrandOpeartionLabel = [
const viewBrand: React.FC<{}> = () => {
const intl = useIntl();
const { memberId, memberRoleId } = getAuth() || {};
const [brandInfo, setBrandInfo] = useState<any>({})
const [fixStep, setFixStep] = useState(0)
const [recordData, setRecordData] = useState<any[]>([])
const [hasSelfStore, setHasSelfStore] = useState<boolean>(false)
useEffect(() => {
const { id } = history.location.query
......@@ -47,6 +51,10 @@ const viewBrand: React.FC<{}> = () => {
if (res.code === 1000)
setRecordData(res.data)
})
postManageActivityShopRuleExistShop({memberId, memberRoleId}, { ctlType: 'none' }).then(res => {
const { code, data } = res
setHasSelfStore(data)
})
}
}, [])
......@@ -141,7 +149,13 @@ const viewBrand: React.FC<{}> = () => {
<Card headStyle={{ borderBottom: 'none' }} title={intl.formatMessage({ id: 'trademark.viewBrand.card.1' })}>
<Steps progressDot current={fixStep}>
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} />
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} />
{
hasSelfStore
?
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} />
:
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} />
}
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description="" />
</Steps>
</Card>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment