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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
index b4a33b2..0d5db2f 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
@@ -1,49 +1,82 @@
<template>
<div class="my-collect-task">
<div class="my-collect-task-title">鏀惰棌浠诲姟鍒楄〃</div>
- <div class="my-collect-task-btn">娓呯┖宸插け鏁堜换鍔�</div>
+ <div class="my-collect-task-btn" @click="clearExpiredTask">娓呯┖宸插け鏁堜换鍔�</div>
</div>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
>
<template #renderItem="{ item }">
- <TaskCard> </TaskCard>
+ <TaskCard
+ :id="item.id"
+ :name="item.name"
+ :address-name="item.addressName"
+ :begin-time="item.beginTime"
+ :end-time="item.endTime"
+ :gender-limit="item.genderLimit"
+ :service-fee="item.serviceFee"
+ :billing-method="item.billingMethod"
+ :settlement-cycle="item.settlementCycle"
+ :benefits="item.benefits"
+ :show-actions="true"
+ :release-status="item.releaseStatus"
+ @apply="goTaskDetail"
+ >
+ </TaskCard>
</template>
</InfiniteLoading>
</template>
<script setup lang="ts">
import { TaskCard } from '@12333/components';
-import { useUserStore } from '@/stores/modules/user';
-import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+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 userStore = useUserStore();
-
-const { infiniteLoadingProps } = useInfiniteLoading(
+const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.GetFlexTaskListInput = {
+ let params: API.GetTaskInfosQuery = {
pageModel: {
rows: 20,
page: pageParam,
- orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
},
+ isCollected: true,
};
- return flexWorkerServices.getFlexTaskByArrange(params, {
+ return taskServices.getTaskInfos(params, {
showLoading: false,
});
},
{
- queryKey: ['flexWorkerServices/getFlexTaskByArrange'],
+ queryKey: ['taskServices/getTaskInfos'],
}
);
+
+function goTaskDetail(id: string) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskDetail}?id=${id}&from=apply`,
+ });
+}
+
+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