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 | 77 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 842cac1..375515e 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -1,5 +1,5 @@
<template>
- <Calendar v-model="queryState.date"></Calendar>
+ <Calendar key="calendar" v-model="queryState.date"></Calendar>
<ProTabs
v-model="queryState.checkReceiveStatus"
name="task-tab"
@@ -16,28 +16,36 @@
></ProTabPane>
<ProTabPane :title="`宸查獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Completed"></ProTabPane>
</ProTabs>
- <InfiniteLoading
- scrollViewClassName="common-infinite-scroll-list task-list"
- v-bind="infiniteLoadingProps"
- :key="queryState.checkReceiveStatus"
- >
- <template #renderItem="{ item }">
- <MyTaskCard
- :name="item.name"
- :addressName="item.addressName"
- :begin-time="item.beginTime"
- :end-time="item.endTime"
- @click="goSubmitTaskDetail(item)"
- />
- </template>
- </InfiniteLoading>
+ <div class="task-list-container">
+ <InfiniteLoading
+ scrollViewClassName="common-infinite-scroll-list task-list"
+ v-bind="infiniteLoadingProps"
+ :key="queryState.checkReceiveStatus"
+ >
+ <template #renderItem="{ item }">
+ <MyTaskCard
+ :name="item.name"
+ :addressName="item.addressName"
+ :begin-time="item.beginTime"
+ :end-time="item.endTime"
+ :showActions="
+ OrderUtils.isContainCheckIn(item.checkReceiveMethods) &&
+ queryState.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
+ "
+ @click="goSubmitTaskDetail(item)"
+ />
+ </template>
+ </InfiniteLoading>
+ </div>
</template>
<script setup lang="ts">
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';
+import { OrderUtils } from '@12333/utils';
+import dayjs from 'dayjs';
defineOptions({
name: 'InnerPage',
@@ -46,23 +54,48 @@
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}`,
});
- }
- if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed) {
+ } 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=${_date}`,
+ // });
+ // }
+ // } else {
+ // if (
+ // Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
+ // Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed
+ // ) {
+ // Taro.navigateTo({
+ // url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+ // });
+ // }
+ // }
}
</script>
<style lang="scss">
@import '@/styles/common.scss';
-.task-list {
- @include infiniteLoadingInTabBarPage;
+.task-page-wrapper {
+ .task-list-container {
+ flex: 1;
+ min-height: 0;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .task-list {
+ @include infiniteLoadingInTabBarPage;
+ }
}
</style>
--
Gitblit v1.9.1