From 8b40022d423cb9734813326e60957ec513b8a942 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 23:07:17 +0800
Subject: [PATCH] fix: bug
---
apps/cMiniApp/src/pages/task/InnerPage.vue | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 052f54a..6be8d8a 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -28,6 +28,10 @@
:addressName="item.addressName"
:begin-time="item.beginTime"
:end-time="item.endTime"
+ :showActions="
+ item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
+ queryState.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
+ "
@click="goSubmitTaskDetail(item)"
/>
</template>
@@ -39,7 +43,7 @@
import { MyTaskCard, ProTabs, ProTabPane, Calendar } from '@12333/components';
import Taro from '@tarojs/taro';
import { useCheckReceiveTasks, useTaskList } from '@12333/hooks';
-import { EnumTaskCheckReceiveStatus } from '@12333/constants';
+import { EnumTaskCheckReceiveStatus, EnumTaskCheckReceiveMethod } from '@12333/constants';
defineOptions({
name: 'InnerPage',
@@ -53,13 +57,21 @@
url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
});
}
- if (
- Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
- Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed
- ) {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
- });
+ if (item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
+ if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${queryState.date}`,
+ });
+ }
+ } else {
+ if (
+ Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
+ Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed
+ ) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+ });
+ }
}
}
</script>
@@ -67,14 +79,16 @@
<style lang="scss">
@import '@/styles/common.scss';
-.task-list-container {
- flex: 1;
- min-height: 0;
- display: flex;
- flex-direction: column;
-}
+.task-page-wrapper {
+ .task-list-container {
+ flex: 1;
+ min-height: 0;
+ display: flex;
+ flex-direction: column;
+ }
-.task-list {
- @include infiniteLoadingInTabBarPage;
+ .task-list {
+ @include infiniteLoadingInTabBarPage;
+ }
}
</style>
--
Gitblit v1.9.1