Hooke / lls_program

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
bda957c4 1 parent ca570eda

fix(活动页面): 客户需求: 取消活动已结束时的报名按钮限制及提示 

修改ActivitiesCover和ActivitiesDetail页面的报名按钮逻辑，移除活动已结束状态的按钮禁用限制，注释原有已结束活动检查代码及Toast提示。
Inline Side-by-side
Showing 2 changed files with 20 additions and 24 deletions
1 <!-- 1 <!--
2 * @Date: 2022-09-19 14:11:06 2 * @Date: 2022-09-19 14:11:06
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2025-09-26 10:45:08 4 + * @LastEditTime: 2026-05-21 14:33:13
5 * @FilePath: /lls_program/src/pages/ActivitiesCover/index.vue 5 * @FilePath: /lls_program/src/pages/ActivitiesCover/index.vue
6 * @Description: 活动海报页面 - 展示活动信息并处理定位授权 6 * @Description: 活动海报页面 - 展示活动信息并处理定位授权
7 --> 7 -->
...@@ -70,11 +70,9 @@ ...@@ -70,11 +70,9 @@
70 type="primary" 70 type="primary"
71 size="large" 71 size="large"
72 class="join-button" 72 class="join-button"
73 - :color=" 73 + :color="!activityStatus.is_begin ? '#cccccc' : THEME_COLORS.PRIMARY"
74 - activityStatus.is_ended || !activityStatus.is_begin ? '#cccccc' : THEME_COLORS.PRIMARY
75 - "
76 :loading="isJoining || activityStatus.loading" 74 :loading="isJoining || activityStatus.loading"
77 - :disabled="activityStatus.is_ended || !activityStatus.is_begin" 75 + :disabled="!activityStatus.is_begin"
78 @click="checkFamilyStatusAndJoinActivity" 76 @click="checkFamilyStatusAndJoinActivity"
79 > 77 >
80 {{ getButtonText() }} 78 {{ getButtonText() }}
...@@ -418,13 +416,13 @@ const getButtonText = () => { ...@@ -418,13 +416,13 @@ const getButtonText = () => {
418 */ 416 */
419 const checkFamilyStatusAndJoinActivity = async () => { 417 const checkFamilyStatusAndJoinActivity = async () => {
420 // 如果活动已结束，显示提示 418 // 如果活动已结束，显示提示
421 - if (activityStatus.value.is_ended) { 419 + // if (activityStatus.value.is_ended) {
422 - Taro.showToast({ 420 + // Taro.showToast({
423 - title: '活动已结束', 421 + // title: '活动已结束',
424 - icon: 'none', 422 + // icon: 'none',
425 - }) 423 + // })
426 - return 424 + // return
427 - } 425 + // }
428 426
429 // 如果活动未开始，显示提示 427 // 如果活动未开始，显示提示
430 if (!activityStatus.value.is_begin) { 428 if (!activityStatus.value.is_begin) {
......
1 <!-- 1 <!--
2 * @Date: 2026-02-09 2 * @Date: 2026-02-09
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2026-02-10 10:27:35 4 + * @LastEditTime: 2026-05-21 14:31:55
5 * @FilePath: /lls_program/src/pages/ActivitiesDetail/index.vue 5 * @FilePath: /lls_program/src/pages/ActivitiesDetail/index.vue
6 * @Description: 活动详情页面 - 完全使用 map_activity.js 新接口，支持多活动详情展示 6 * @Description: 活动详情页面 - 完全使用 map_activity.js 新接口，支持多活动详情展示
7 --> 7 -->
...@@ -66,11 +66,9 @@ ...@@ -66,11 +66,9 @@
66 type="primary" 66 type="primary"
67 size="large" 67 size="large"
68 class="join-button" 68 class="join-button"
69 - :color=" 69 + :color="!activityStatus.is_begin ? '#cccccc' : THEME_COLORS.PRIMARY"
70 - activityStatus.is_ended || !activityStatus.is_begin ? '#cccccc' : THEME_COLORS.PRIMARY
71 - "
72 :loading="isJoining || activityStatus.loading" 70 :loading="isJoining || activityStatus.loading"
73 - :disabled="activityStatus.is_ended || !activityStatus.is_begin" 71 + :disabled="!activityStatus.is_begin"
74 @click="checkFamilyStatusAndJoinActivity" 72 @click="checkFamilyStatusAndJoinActivity"
75 > 73 >
76 {{ getButtonText() }} 74 {{ getButtonText() }}
...@@ -476,13 +474,13 @@ const navigateToQrCodeCheckin = async () => { ...@@ -476,13 +474,13 @@ const navigateToQrCodeCheckin = async () => {
476 */ 474 */
477 const checkFamilyStatusAndJoinActivity = async () => { 475 const checkFamilyStatusAndJoinActivity = async () => {
478 // 如果活动已结束，显示提示 476 // 如果活动已结束，显示提示
479 - if (activityStatus.value.is_ended) { 477 + // if (activityStatus.value.is_ended) {
480 - Taro.showToast({ 478 + // Taro.showToast({
481 - title: '活动已结束', 479 + // title: '活动已结束',
482 - icon: 'none', 480 + // icon: 'none',
483 - }) 481 + // })
484 - return 482 + // return
485 - } 483 + // }
486 484
487 // 如果活动未开始，显示提示 485 // 如果活动未开始，显示提示
488 if (!activityStatus.value.is_begin) { 486 if (!activityStatus.value.is_begin) {
......