From 8fafaae3b0fab1411e5bc99c1d73ee5d3f3caca2 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 15 八月 2025 10:58:38 +0800 Subject: [PATCH] fix: bug --- apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue | 68 +++++++++++++-------------------- 1 files changed, 27 insertions(+), 41 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue b/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue index 72eda83..6d21758 100644 --- a/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue +++ b/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue @@ -2,65 +2,51 @@ <PageLayoutWithBg class="companyDetail-page-wrapper" title="鍏徃璇︽儏" :need-auth="false"> <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch"> <ContentView> - <CompanyDesc style="background-color: #fff" :showArrow="false"></CompanyDesc> + <CompanyDesc + style="background-color: #fff" + :showArrow="false" + :enterpriseName="enterpriseDetail?.enterpriseName ?? ''" + :taskCount="enterpriseDetail?.taskCount ?? 0" + ></CompanyDesc> </ContentView> - <ProTabs - v-model="tab" - name="companyDetail-tab" - :showSmile="false" - class="companyDetail-tabs" - isTransparent - title-gutter="8" - fullHeight - > - <ProTabPane :title="`浠诲姟`" pane-key="1"> - <CompanyTaskList /> - </ProTabPane> - <ProTabPane :title="`浼佷笟淇℃伅`" pane-key="2"> - <CompanyInfo /> - </ProTabPane> - </ProTabs> + <div style="flex: 1; min-height: 0"> + <ProTabs + v-model="tab" + name="companyDetail-tab" + :showSmile="false" + class="companyDetail-tabs" + isTransparent + title-gutter="8" + fullHeight + > + <ProTabPane :title="`浠诲姟`" pane-key="1"> + <CompanyTaskList :enterpriseId="enterpriseId" /> + </ProTabPane> + <ProTabPane :title="`浼佷笟淇℃伅`" pane-key="2"> + <CompanyInfo :enterpriseId="enterpriseId" /> + </ProTabPane> + </ProTabs> + </div> </LoadingLayout> </PageLayoutWithBg> </template> <script setup lang="ts"> import Taro from '@tarojs/taro'; -import { useQuery } from '@tanstack/vue-query'; -import * as orderServices from '@12333/services/api/Order'; import CompanyDesc from '../components/CompanyDesc.vue'; import CompanyTaskList from '../components/CompanyTaskList.vue'; import CompanyInfo from '../components/CompanyInfo.vue'; import { ProTabs, ProTabPane } from '@12333/components'; +import { useEnterpriseDetail } from '@12333/hooks'; defineOptions({ name: 'companyDetail', }); const router = Taro.useRouter(); -const companyId = router.params?.id ?? ''; +const enterpriseId = router.params?.id ?? ''; const tab = ref('1'); -const { - isLoading, - isError, - data: detail, - refetch, -} = useQuery({ - queryKey: ['orderServices/getOrdeForDetail', companyId], - queryFn: async () => { - return await orderServices.getOrdeForDetail( - { id: companyId }, - { - showLoading: false, - } - ); - }, - placeholderData: () => ({} as API.OrderInfoDto), -}); +const { isLoading, isError, enterpriseDetail, refetch } = useEnterpriseDetail({ id: enterpriseId }); </script> - -<style lang="scss"> -@import '@/styles/common.scss'; -</style> -- Gitblit v1.9.1