From 5583271e6f5bb7a0dcc8e4876513f23a21a7b25f Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 13 八月 2025 13:22:22 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue | 81 ++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 37 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue index b5801b3..7c1f311 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue @@ -1,14 +1,29 @@ <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> @@ -16,55 +31,47 @@ <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 orderServices from '@12333/services/api/Order'; +import { useTaskList } from '@12333/hooks'; +import Taro from '@tarojs/taro'; defineOptions({ name: 'InnerPage', }); -const userStore = useUserStore(); +const { infiniteLoadingProps } = useTaskList({ + defaultQueryMenuState: {}, +}); -const { infiniteLoadingProps } = useInfiniteLoading( - ({ pageParam }) => { - let params: API.FrontOrderListInput = { - pageModel: { - rows: 20, - page: pageParam, - orderInput: [{ property: 'isRecommend', order: OrderInputType.Desc }], - }, - }; +function goTaskDetail(id: string) { + Taro.navigateTo({ + url: `${RouterPath.taskDetail}?id=${id}&from=apply`, + }); +} - return orderServices.getFrontOrderList(params, { - showLoading: false, - }); - }, - { - queryKey: ['orderServices/getFrontOrderList'], - } -); +function clearExpiredTask() {} </script> <style lang="scss"> @import '@/styles/common.scss'; -.my-collect-task { - display: flex; - align-items: center; - justify-content: space-between; - padding: 30px 40px; +.mineCollectTask-page-wrapper { + .my-collect-task { + display: flex; + align-items: center; + justify-content: space-between; + padding: 30px 40px; - .my-collect-task-title { - font-size: 28px; - line-height: 40px; - color: boleGetCssVar('text-color', 'primary'); - } + .my-collect-task-title { + font-size: 28px; + line-height: 40px; + color: boleGetCssVar('text-color', 'primary'); + } - .my-collect-task-btn { - font-size: 24px; - line-height: 34px; - color: boleGetCssVar('text-color', 'regular'); + .my-collect-task-btn { + font-size: 24px; + line-height: 34px; + color: boleGetCssVar('text-color', 'regular'); + } } } </style> -- Gitblit v1.9.1