Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
owen
2023-09-29 21:08:48 +08:00
15 changed files with 372 additions and 34 deletions

View File

@ -278,12 +278,16 @@ export const PromotionDiscountTypeEnum = {
*/
export const BrokerageBindModeEnum = {
ANYTIME: {
mode: 0,
name: '没有推广人'
mode: 1,
name: '首次绑定'
},
REGISTER: {
mode: 1,
name: '新用户'
mode: 2,
name: '注册绑定'
},
OVERRIDE: {
mode: 3,
name: '覆盖绑定'
}
}
/**
@ -291,11 +295,11 @@ export const BrokerageBindModeEnum = {
*/
export const BrokerageEnabledConditionEnum = {
ALL: {
condition: 0,
condition: 1,
name: '人人分销'
},
ADMIN: {
condition: 1,
condition: 2,
name: '指定分销'
}
}