From bbf6053159d566a096dfa26627dda19657d928af Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 三月 2025 13:24:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue
index fe9a163..89b65b9 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue
@@ -8,10 +8,10 @@
title-gutter="12"
title-scroll
>
- <ProTabPane :title="`鍏ㄩ儴`" :pane-key="MineAgreementSignType.All"></ProTabPane>
- <ProTabPane :title="`寰呯绾" :pane-key="MineAgreementSignType.WaitSign"></ProTabPane>
- <ProTabPane :title="`鐢熸晥涓璥" :pane-key="MineAgreementSignType.Effect"></ProTabPane>
- <ProTabPane :title="`宸茬粓姝" :pane-key="MineAgreementSignType.Terminated"></ProTabPane>
+ <ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
+ <ProTabPane :title="`寰呯绾" :pane-key="10"></ProTabPane>
+ <ProTabPane :title="`鐢熸晥涓璥" :pane-key="20"></ProTabPane>
+ <ProTabPane :title="`宸茬粓姝" :pane-key="30"></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
@@ -21,8 +21,8 @@
<template #renderItem="{ item }">
<MineAgreementSignCard @click="goDetail">
<template #actions>
- <div class="task-card-actions-text" :style="{ color: MineAgreementSignTypeColor[10] }">
- {{ MineAgreementSignTypeText[10] }}
+ <div class="task-card-actions-text" :style="{ color: TaskStatusColor[10] }">
+ {{ TaskStatusText[10] }}
</div>
</template>
</MineAgreementSignCard>
@@ -33,14 +33,10 @@
<script setup lang="ts">
import { MineAgreementSignCard, ProTabs, ProTabPane } from '@12333/components';
import { useUserStore } from '@/stores/modules/user';
-import {
- MineAgreementSignType,
- MineAgreementSignTypeColor,
- MineAgreementSignTypeText,
-} from './constants';
+import { TaskStatusText, TaskStatusColor, TaskStatus } from '@/constants';
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
-import * as orderServices from '@12333/services/api/Order';
+import * as flexWorkerServices from '@12333/services/api/FlexWorker';
import Taro from '@tarojs/taro';
defineOptions({
@@ -48,31 +44,31 @@
});
const queryState = reactive({
- mineAgreementSignType: MineAgreementSignType.All,
+ mineAgreementSignType: TaskStatus.All,
});
const userStore = useUserStore();
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.FrontOrderListInput = {
+ let params: API.GetFlexTaskListInput = {
pageModel: {
rows: 20,
page: pageParam,
orderInput: [
- queryState.mineAgreementSignType === MineAgreementSignType.All
+ queryState.mineAgreementSignType === TaskStatus.All
? { property: 'isRecommend', order: OrderInputType.Desc }
: { property: 'lastShelfTime', order: OrderInputType.Desc },
],
},
};
- return orderServices.getFrontOrderList(params, {
+ return flexWorkerServices.getFlexTaskByArrange(params, {
showLoading: false,
});
},
{
- queryKey: ['orderServices/getFrontOrderList', queryState],
+ queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState],
}
);
@@ -86,8 +82,10 @@
<style lang="scss">
@import '@/styles/common.scss';
-.task-card-actions-text {
- font-size: 24px;
- line-height: 42px;
+.mineAgreementSign-page-wrapper {
+ .task-card-actions-text {
+ font-size: 24px;
+ line-height: 42px;
+ }
}
</style>
--
Gitblit v1.9.1