diff --git a/src/views/user/registration/index.vue b/src/views/user/registration/index.vue index 07248ee..7bdbaa2 100644 --- a/src/views/user/registration/index.vue +++ b/src/views/user/registration/index.vue @@ -306,7 +306,7 @@ const tableRef = ref(); const initParam = ref({ refresh: true }); const columns = ref([ - { type: 'index', label: '序号', align: 'center', width: 70 }, + { type: 'index', label: '序号', align: 'center', width: 70, fixed: 'left' }, { prop: 'name', label: '赛事名称', @@ -408,9 +408,11 @@ const eventStatusTagType = (status) => { }; const isEventEnrolling = (row) => { - // 用户端“去报名”只对报名中开放 + // 用户端"去报名"只对报名中开放,同时需要用户通过商户认证 const s = row?.status ?? row?.eventStatus; - return s === 'Enrolling' || s === 'enrolling' || s === 0 || s === '0'; + const isEnrolling = s === 'Enrolling' || s === 'enrolling' || s === 0 || s === '0'; + const canRegister = row?.canRegister ?? row?.CanRegister ?? false; + return isEnrolling && canRegister; }; // -------------------- 赛事详情 --------------------