hookehuyr

fix(scan-checkin-detail): 修复打卡详情页操作按钮显示逻辑,新增活动结束判断

......@@ -36,7 +36,7 @@
</view>
</view>
<view v-if="detail.isChecked !== true" class="scan-checkin-detail-button-wrap">
<view v-if="shouldShowActionButton" class="scan-checkin-detail-button-wrap">
<nut-button
type="primary"
class="scan-checkin-detail-button"
......@@ -87,11 +87,13 @@ const detail = reactive({
centerLat: null,
radiusMeters: null,
isChecked: false,
isEnded: false,
lastScanCode: '',
scanSubmitting: false,
})
const scanSubmitting = computed(() => detail.scanSubmitting === true)
const shouldShowActionButton = computed(() => detail.isChecked !== true && detail.isEnded !== true)
const actionButtonText = computed(() =>
detail.entryMode === 'direct_submit' ? '点击打卡' : '扫码打卡'
)
......@@ -407,6 +409,7 @@ const applyStageDetail = stageDetail => {
centerLat: stageDetail.center_lat,
radiusMeters: stageDetail.radius_meters,
isChecked: stageDetail.is_checked === true,
isEnded: stageDetail.is_ended === true,
})
}
......