hookehuyr

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

...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 </view> 36 </view>
37 </view> 37 </view>
38 38
39 - <view v-if="detail.isChecked !== true" class="scan-checkin-detail-button-wrap"> 39 + <view v-if="shouldShowActionButton" class="scan-checkin-detail-button-wrap">
40 <nut-button 40 <nut-button
41 type="primary" 41 type="primary"
42 class="scan-checkin-detail-button" 42 class="scan-checkin-detail-button"
...@@ -87,11 +87,13 @@ const detail = reactive({ ...@@ -87,11 +87,13 @@ const detail = reactive({
87 centerLat: null, 87 centerLat: null,
88 radiusMeters: null, 88 radiusMeters: null,
89 isChecked: false, 89 isChecked: false,
90 + isEnded: false,
90 lastScanCode: '', 91 lastScanCode: '',
91 scanSubmitting: false, 92 scanSubmitting: false,
92 }) 93 })
93 94
94 const scanSubmitting = computed(() => detail.scanSubmitting === true) 95 const scanSubmitting = computed(() => detail.scanSubmitting === true)
96 +const shouldShowActionButton = computed(() => detail.isChecked !== true && detail.isEnded !== true)
95 const actionButtonText = computed(() => 97 const actionButtonText = computed(() =>
96 detail.entryMode === 'direct_submit' ? '点击打卡' : '扫码打卡' 98 detail.entryMode === 'direct_submit' ? '点击打卡' : '扫码打卡'
97 ) 99 )
...@@ -407,6 +409,7 @@ const applyStageDetail = stageDetail => { ...@@ -407,6 +409,7 @@ const applyStageDetail = stageDetail => {
407 centerLat: stageDetail.center_lat, 409 centerLat: stageDetail.center_lat,
408 radiusMeters: stageDetail.radius_meters, 410 radiusMeters: stageDetail.radius_meters,
409 isChecked: stageDetail.is_checked === true, 411 isChecked: stageDetail.is_checked === true,
412 + isEnded: stageDetail.is_ended === true,
410 }) 413 })
411 } 414 }
412 415
......