diff --git a/pages/mine/distribution/join.vue b/pages/mine/distribution/join.vue index b7b3427..5a551c1 100644 --- a/pages/mine/distribution/join.vue +++ b/pages/mine/distribution/join.vue @@ -8,10 +8,25 @@ {{ DISTRIBUTION_RETREAT_MESSAGE }} + + + + 已成为分销员 + 恭喜您已通过审核,可进入分销员中心开始推广 + 进入分销员中心 + + + + + ! + 等待审核 + {{ DISTRIBUTION_APPLY_MESSAGE }} + + 暂未开放线上招募 - + @@ -91,16 +106,8 @@ - - - - 已成为分销员 - 恭喜您已通过审核,可进入分销员中心开始推广 - 进入分销员中心 - - - + 您已满足加入条件,系统将自动为您申请成为分销员 @@ -112,19 +119,19 @@ - + - + 我已阅读并同意 《分销员推广服务协议》 - {{ isApplyPending ? '等待审核' : '申请成为分销员' }} + 申请成为分销员 @@ -178,7 +185,7 @@ import config from '@/config/config' import { parseGoodsImageUrl, tipsToLogin } from '@/utils/filters.js' import { resolveRecruitDistributionIdFromScene } from '@/utils/distributionBind.js' import { getRecruitPage, getRecruitProgress, getRecruitInviter, submitRecruitApplication } from '@/api/distribution' -import { DISTRIBUTION_RETREAT_MESSAGE, DISTRIBUTION_STATUS } from '@/utils/distributionStatus' +import { DISTRIBUTION_APPLY_MESSAGE, DISTRIBUTION_RETREAT_MESSAGE, DISTRIBUTION_STATUS } from '@/utils/distributionStatus' const defaultAvatar = config.defaultUserPhoto @@ -277,7 +284,7 @@ const inviterName = computed(() => inviterInfo.value?.memberName || '分销员') const inviterAvatar = computed(() => parseGoodsImageUrl(inviterInfo.value?.memberAvatar) || defaultAvatar) const showManualApply = computed(() => { - return !isRetreated.value && isUserLoggedIn.value && !showApplyResult.value && conditionsMet.value && isManualApply.value + return !isRetreated.value && isUserLoggedIn.value && !showApplyResult.value && isManualApply.value }) const showAutoApplyTip = computed(() => { @@ -289,7 +296,7 @@ const showApplyForm = computed(() => { }) const canApply = computed(() => { - return showManualApply.value && agreed.value + return showManualApply.value && conditionsMet.value && agreed.value }) const selfPurchaseOk = computed(() => { @@ -483,6 +490,10 @@ function submit() { if (!showManualApply.value) { return } + if (!conditionsMet.value) { + uni.showToast({ title: '请先满足加入条件', icon: 'none' }) + return + } if (!agreed.value) { uni.showToast({ title: '请先同意分销推广服务协议', icon: 'none' }) return