From eabc398d45d13a3c94034ca461f488d7b9e525eb Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期一, 25 八月 2025 09:39:15 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue | 54 +++++++++++++++++++++++------------------------------- 1 files changed, 23 insertions(+), 31 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue index 16c946e..6009d62 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue @@ -1,6 +1,6 @@ <template> <ProTabs - v-model="queryState.mineAgreementSignType" + v-model="queryState.userSignContractStatus" name="home-tab" :showPaneContent="false" class="home-tabs" @@ -9,22 +9,21 @@ title-scroll > <ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane> - <ProTabPane :title="`寰呯绾" :pane-key="10"></ProTabPane> - <ProTabPane :title="`鐢熸晥涓璥" :pane-key="20"></ProTabPane> - <ProTabPane :title="`宸茬粓姝" :pane-key="30"></ProTabPane> + <ProTabPane :title="`寰呯绾" :pane-key="EnumTaskUserSignContractStatus.Wait"></ProTabPane> + <ProTabPane :title="`鐢熸晥涓璥" :pane-key="EnumTaskUserSignContractStatus.Effect"></ProTabPane> + <ProTabPane :title="`宸茬粓姝" :pane-key="EnumTaskUserSignContractStatus.Stop"></ProTabPane> </ProTabs> <InfiniteLoading scrollViewClassName="common-infinite-scroll-list home-list" v-bind="infiniteLoadingProps" - :key="queryState.mineAgreementSignType" + :key="queryState.userSignContractStatus" > <template #renderItem="{ item }"> - <MineAgreementSignCard @click="goDetail"> - <template #actions> - <div class="task-card-actions-text" :style="{ color: TaskStatusColor[10] }"> - {{ TaskStatusText[10] }} - </div> - </template> + <MineAgreementSignCard + :enterpriseName="item.enterpriseName" + :userSignContractStatus="item.userSignContractStatus" + @click="goDetail(item)" + > </MineAgreementSignCard> </template> </InfiniteLoading> @@ -33,10 +32,9 @@ <script setup lang="ts"> import { MineAgreementSignCard, ProTabs, ProTabPane } from '@12333/components'; import { useUserStore } from '@/stores/modules/user'; -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 { EnumPagedListOrder, EnumTaskUserSignContractStatus } from '@12333/constants'; +import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee'; import Taro from '@tarojs/taro'; defineOptions({ @@ -44,37 +42,34 @@ }); const queryState = reactive({ - mineAgreementSignType: TaskStatus.All, + userSignContractStatus: 0 as any as EnumTaskUserSignContractStatus, }); const userStore = useUserStore(); const { infiniteLoadingProps } = useInfiniteLoading( ({ pageParam }) => { - let params: API.FrontOrderListInput = { + let params: API.GetPersonalUserElectronSignsQuery = { pageModel: { rows: 20, page: pageParam, - orderInput: [ - queryState.mineAgreementSignType === TaskStatus.All - ? { property: 'isRecommend', order: OrderInputType.Desc } - : { property: 'lastShelfTime', order: OrderInputType.Desc }, - ], + orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }], }, + userSignContractStatus: queryState.userSignContractStatus, }; - return orderServices.getFrontOrderList(params, { + return enterpriseEmployeeServices.getPersonalUserElectronSigns(params, { showLoading: false, }); }, { - queryKey: ['orderServices/getFrontOrderList', queryState], + queryKey: ['enterpriseEmployeeServices/getPersonalUserElectronSigns', queryState], } ); -function goDetail() { +function goDetail(row: API.GetPersonalUserElectronSignsQueryResultItem) { Taro.navigateTo({ - url: RouterPath.mineAgreementSignDetail, + url: `${RouterPath.mineAgreementSignDetail}?id=${row.id}`, }); } </script> @@ -82,10 +77,7 @@ <style lang="scss"> @import '@/styles/common.scss'; -.mineAgreementSign-page-wrapper { - .task-card-actions-text { - font-size: 24px; - line-height: 42px; - } -} +// .mineAgreementSign-page-wrapper { +// +// } </style> -- Gitblit v1.9.1