From 1138cd0ece8fda7dda4508e8cf4bf050f53c0f0a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 十一月 2025 14:07:47 +0800
Subject: [PATCH] fix: bug
---
apps/cMiniApp/src/pages/task/InnerPage.vue | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 7340bc5..375515e 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -29,7 +29,7 @@
:begin-time="item.beginTime"
:end-time="item.endTime"
:showActions="
- item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
+ OrderUtils.isContainCheckIn(item.checkReceiveMethods) &&
queryState.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
"
@click="goSubmitTaskDetail(item)"
@@ -44,6 +44,8 @@
import Taro from '@tarojs/taro';
import { useCheckReceiveTasks, useTaskList } from '@12333/hooks';
import { EnumTaskCheckReceiveStatus, EnumTaskCheckReceiveMethod } from '@12333/constants';
+import { OrderUtils } from '@12333/utils';
+import dayjs from 'dayjs';
defineOptions({
name: 'InnerPage',
@@ -52,27 +54,32 @@
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
+ const _date = dayjs(queryState.date).format('YYYY-MM-DD');
if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitSubmit) {
Taro.navigateTo({
- url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
+ url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${_date}`,
+ });
+ } else {
+ 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}`,
- });
- }
- }
+ // if (item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
+ // if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed) {
+ // Taro.navigateTo({
+ // url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${_date}`,
+ // });
+ // }
+ // } else {
+ // if (
+ // Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
+ // Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed
+ // ) {
+ // Taro.navigateTo({
+ // url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+ // });
+ // }
+ // }
}
</script>
--
Gitblit v1.9.1