From ef6fb5968914c3396d1e448c193459f0cc468618 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 08 八月 2025 16:50:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 34e4490..29401b3 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
@@ -8,18 +8,19 @@
title-gutter="12"
title-scroll
>
- <ProTabPane :title="`宸茬绾" :pane-key="TaskStatus.All"></ProTabPane>
- <ProTabPane :title="`寰呯绾" :pane-key="TaskStatus.WaitSign"></ProTabPane>
- <ProTabPane :title="`宸茶В绾" :pane-key="TaskStatus.Effect"></ProTabPane>
+ <ProTabPane :title="`宸茬绾" :pane-key="FlexWorkerEleSignEnum.HasSign"></ProTabPane>
+ <ProTabPane :title="`寰呯绾" :pane-key="FlexWorkerEleSignEnum.WaitSign"></ProTabPane>
+ <ProTabPane :title="`宸茶В绾" :pane-key="FlexWorkerEleSignEnum.CancelSign"></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
+ :key="queryState.mineHireType"
>
<template #renderItem="{ item }">
<FlexJobCard :show-done-detail="false" :show-footer-left="false" @click="goDetail(item)">
<template #footerRight>
- <template v-if="Number(queryState.mineHireType) === TaskStatus.All">
+ <template v-if="queryState.mineHireType === FlexWorkerEleSignEnum.HasSign">
<nut-button
class="flexJobManage-card-plain-button"
type="default"
@@ -29,7 +30,7 @@
>
<nut-button type="primary" @click.stop="checkContract">鏌ョ湅鍚堢害</nut-button>
</template>
- <nut-button v-else type="primary" @click.stop="goSignContract">绛剧害</nut-button>
+ <nut-button v-else type="primary" @click.stop="goSignContract(item)">绛剧害</nut-button>
</template>
</FlexJobCard>
</template>
@@ -41,8 +42,8 @@
import { RouterPath } from '@/constants';
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
-import * as orderServices from '@12333/services/api/Order';
-import { TaskStatus } from '@/constants/task';
+import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import { FlexWorkerEleSignEnum } from '@12333/constants/task';
import Taro from '@tarojs/taro';
defineOptions({
@@ -50,37 +51,42 @@
});
const queryState = reactive({
- mineHireType: TaskStatus.All,
+ mineHireType: FlexWorkerEleSignEnum.HasSign,
});
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.FrontOrderListInput = {
+ let params: API.GetFlexSignWorkerListInput = {
+ signStatus: queryState.mineHireType,
pageModel: {
rows: 20,
page: pageParam,
- orderInput: [{ property: 'isRecommend', order: OrderInputType.Desc }],
+ orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
},
};
- return orderServices.getFrontOrderList(params, {
+ return flexWorkerServices.getFlexSignWorkerList(params, {
showLoading: false,
});
},
{
- queryKey: ['orderServices/getFrontOrderList'],
+ queryKey: ['flexWorkerServices/getFlexSignWorkerList', queryState],
}
);
-function goDetail(item: API.FrontOrderList) {
+function goDetail(item: API.GetNewestWorkerListOutput) {
Taro.navigateTo({
- url: `${RouterPath.flexJobDetailFromManage}?id=${item.id}`,
+ url: `${RouterPath.flexJobDetailFromManage}?userId=${item.userId}`,
});
}
function checkContract() {}
function handleUnContract() {}
-function goSignContract() {}
+function goSignContract(item: API.GetNewestWorkerListOutput) {
+ Taro.navigateTo({
+ url: `${RouterPath.flexJobSign}`,
+ });
+}
</script>
<style lang="scss">
--
Gitblit v1.9.1