From 092fd03a7a4eaf855b1816c38e3f6be552818cc2 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 14 八月 2025 17:31:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
index c912d41..0d5db2f 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
@@ -9,6 +9,7 @@
>
<template #renderItem="{ item }">
<TaskCard
+ :id="item.id"
:name="item.name"
:address-name="item.addressName"
:begin-time="item.beginTime"
@@ -18,10 +19,10 @@
:billing-method="item.billingMethod"
:settlement-cycle="item.settlementCycle"
:benefits="item.benefits"
+ :show-actions="true"
+ :release-status="item.releaseStatus"
+ @apply="goTaskDetail"
>
- <template #actions>
- <nut-button @click="goTaskDetail(item)" type="primary">鎶ュ悕</nut-button>
- </template>
</TaskCard>
</template>
</InfiniteLoading>
@@ -29,25 +30,53 @@
<script setup lang="ts">
import { TaskCard } from '@12333/components';
-import { useUserStore } from '@/stores/modules/user';
-import { useTaskList } from '@12333/hooks';
+import * as taskServices from '@12333/services/apiV2/task';
+import * as taskUserServices from '@12333/services/apiV2/taskUser';
+import { useInfiniteLoading, useTaskList } from '@12333/hooks';
import Taro from '@tarojs/taro';
+import { Message } from '@12333/utils';
defineOptions({
name: 'InnerPage',
});
-const { infiniteLoadingProps } = useTaskList({
- defaultQueryMenuState: {},
-});
+const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
+ ({ pageParam }) => {
+ let params: API.GetTaskInfosQuery = {
+ pageModel: {
+ rows: 20,
+ page: pageParam,
+ },
+ isCollected: true,
+ };
-function goTaskDetail(item: API.GetTaskInfosQueryResultItem) {
+ return taskServices.getTaskInfos(params, {
+ showLoading: false,
+ });
+ },
+ {
+ queryKey: ['taskServices/getTaskInfos'],
+ }
+);
+
+function goTaskDetail(id: string) {
Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+ url: `${RouterPath.taskDetail}?id=${id}&from=apply`,
});
}
-function clearExpiredTask() {}
+async function clearExpiredTask() {
+ try {
+ await Message.confirm({
+ message: '纭畾瑕佹竻绌哄凡澶辨晥浠诲姟鍚楋紵',
+ });
+ let res = await taskUserServices.clearTaskCollect({});
+ if (res) {
+ Message.success('娓呯┖鎴愬姛');
+ invalidateQueries();
+ }
+ } catch (error) {}
+}
</script>
<style lang="scss">
--
Gitblit v1.9.1