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/mineHire/InnerPage.vue | 82 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
index f9234cc..d8bd3f9 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<ProTabs
- v-model="queryState.mineHireType"
+ v-model="queryState.status"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -8,21 +8,39 @@
title-gutter="12"
title-scroll
>
- <ProTabPane :title="`鍏ㄩ儴`" :pane-key="MineHireType.All"></ProTabPane>
- <ProTabPane :title="`杩涜涓璥" :pane-key="MineHireType.InProgress"></ProTabPane>
- <ProTabPane :title="`寰呴獙鏀禶" :pane-key="MineHireType.WaitCheck"></ProTabPane>
- <ProTabPane :title="`宸插畬鎴恅" :pane-key="MineHireType.Finished"></ProTabPane>
+ <ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
+ <ProTabPane
+ :title="`杩涜涓璥"
+ :pane-key="GetPersonalHireTaskInfosQueryStatus.InProcess"
+ ></ProTabPane>
+ <ProTabPane
+ :title="`宸插畬鎴恅"
+ :pane-key="GetPersonalHireTaskInfosQueryStatus.Completed"
+ ></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
- :key="queryState.mineHireType"
+ :key="queryState.status"
>
<template #renderItem="{ item }">
- <TaskCard>
+ <TaskCard
+ :name="item.name"
+ :begin-time="item.beginTime"
+ :end-time="item.endTime"
+ :billing-method="item.billingMethod"
+ :benefits="item.benefits"
+ :service-fee="item.serviceFee"
+ :settlement-cycle="item.settlementCycle"
+ :address-name="item.addressName"
+ @click="goTaskDetail(item)"
+ >
<template #actions>
- <div class="task-card-actions-text" :style="{ color: MineHireTypeColor[10] }">
- {{ MineHireTypeText[10] }}
+ <div
+ class="task-card-actions-text"
+ :style="{ color: GetPersonalHireTaskInfosQueryStatusColor[item.status] }"
+ >
+ {{ GetPersonalHireTaskInfosQueryStatusText[item.status] }}
</div>
</template>
</TaskCard>
@@ -32,51 +50,59 @@
<script setup lang="ts">
import { TaskCard, ProTabs, ProTabPane } from '@12333/components';
-import { useUserStore } from '@/stores/modules/user';
-import { MineHireType, MineHireTypeColor, MineHireTypeText } from './constants';
import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
-import * as orderServices from '@12333/services/api/Order';
+import {
+ EnumPagedListOrder,
+ GetPersonalHireTaskInfosQueryStatus,
+ GetPersonalHireTaskInfosQueryStatusText,
+ GetPersonalHireTaskInfosQueryStatusColor,
+} from '@12333/constants';
+import * as taskServices from '@12333/services/apiV2/task';
+import Taro from '@tarojs/taro';
defineOptions({
name: 'InnerPage',
});
const queryState = reactive({
- mineHireType: MineHireType.All,
+ status: 0 as any as GetPersonalHireTaskInfosQueryStatus,
});
-
-const userStore = useUserStore();
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.FrontOrderListInput = {
+ let params: API.GetPersonalHireTaskInfosQuery = {
pageModel: {
rows: 20,
page: pageParam,
- orderInput: [
- queryState.mineHireType === MineHireType.All
- ? { property: 'isRecommend', order: OrderInputType.Desc }
- : { property: 'lastShelfTime', order: OrderInputType.Desc },
- ],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
};
-
- return orderServices.getFrontOrderList(params, {
+ if (Number(queryState.status)) {
+ params.status = queryState.status;
+ }
+ return taskServices.getPersonalHireTaskInfos(params, {
showLoading: false,
});
},
{
- queryKey: ['orderServices/getFrontOrderList', queryState],
+ queryKey: ['taskServices/getPersonalHireTaskInfos', queryState],
}
);
+
+function goTaskDetail(item: API.GetPersonalHireTaskInfosQueryResultItem) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=hire`,
+ });
+}
</script>
<style lang="scss">
@import '@/styles/common.scss';
-.task-card-actions-text {
- font-size: 24px;
- line-height: 42px;
+.mineHire-page-wrapper {
+ .task-card-actions-text {
+ font-size: 24px;
+ line-height: 42px;
+ }
}
</style>
--
Gitblit v1.9.1