From ba52f84dac4284c4593c80d77595fd99664a7f7c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 19 八月 2025 13:24:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 10 +++++++++-
apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue | 15 +++++++--------
apps/cMiniApp/src/pages/task/InnerPage.vue | 1 +
packages/components/src/Calendar/Calendar.vue | 8 --------
packages/hooks/enterprise.ts | 8 ++++----
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 3f5639d..d5cbd2e 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -46,6 +46,7 @@
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
+ console.log('queryState.date: ', queryState.date);
if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitSubmit) {
Taro.navigateTo({
url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
index 39fc6a2..dfbebb2 100644
--- a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
+++ b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
@@ -3,33 +3,32 @@
<div v-if="isCertified" class="companyInfo-info-wrapper">
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">浼佷笟鍚嶇О</div>
- <div class="companyInfo-info-item-content">{{ enterpriseDetail.enterpriseName }}</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseName }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">缁熶竴绀句細淇＄敤浠ｇ爜</div>
- <div class="companyInfo-info-item-content">{{ enterpriseDetail.societyCreditCode }}</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.societyCreditCode }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">娉ㄥ唽璧勬湰</div>
- <div class="companyInfo-info-item-content">鎹屼桨涓囧厓鏁�</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.registeredCapital }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">浼佷笟绫诲瀷</div>
- <div class="companyInfo-info-item-content">鏈夐檺璐ｄ换鍏徃锛堣嚜鐒朵汉鎶曡祫鎴栨帶鑲� 鐨勬硶浜虹嫭璧勶級</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseType }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">鎴愮珛鏃ユ湡</div>
- <div class="companyInfo-info-item-content">2024骞�11鏈�11鏃�</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.establishmentDate }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">浼佷笟鍦板潃</div>
- <div class="companyInfo-info-item-content">姹熻タ鐪佷節姹熷競鍏遍潚鍩庡競xx璺痻x鍙穢x xxxx</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.address }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">缁忚惀鑼冨洿</div>
<div class="companyInfo-info-item-content">
- 鎴戞槸钀ヤ笟鎵х収涓婄殑缁忚惀鑼冨洿淇℃伅鎴� 鏄惀涓氭墽鐓т笂鐨勭粡钀ヨ寖鍥翠俊鎭垜鏄�
- 钀ヤ笟鎵х収涓婄殑缁忚惀鑼冨洿淇℃伅鎴戞槸钀� 涓氭墽鐓т笂鐨勭粡钀ヨ寖鍥翠俊鎭垜鏄惀涓� 鎵х収涓婄殑缁忚惀鑼冨洿淇℃伅
+ {{ enterpriseDetail?.mainBusiness }}
</div>
</div>
</div>
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index fc871cd..a10ccc6 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -41,7 +41,7 @@
:unit="BillingMethodEnumUnit[detail.billingMethod]"
/>
</div>
- <div class="taskDetail-address-wrapper">
+ <div class="taskDetail-address-wrapper" @click="goMap">
<div class="taskDetail-address-title-wrapper">
<img :src="IconLocaltion" class="taskDetail-address-title-icon" />
<div class="taskDetail-address-title">{{ detail?.addressName ?? '' }}</div>
@@ -275,4 +275,12 @@
url: `${RouterPath.taskSubmitCheck}?id=${id}`,
});
}
+
+function goMap() {
+ Taro.openLocation({
+ latitude: detail.value?.latitude,
+ longitude: detail.value?.longitude,
+ scale: 18,
+ });
+}
</script>
diff --git a/packages/components/src/Calendar/Calendar.vue b/packages/components/src/Calendar/Calendar.vue
index acb8468..8a6df76 100644
--- a/packages/components/src/Calendar/Calendar.vue
+++ b/packages/components/src/Calendar/Calendar.vue
@@ -4,8 +4,6 @@
<nut-calendar-card
v-model="model"
class="bole-calendar"
- ref="calendar"
- @change="handleChange"
></nut-calendar-card>
</div>
<div :class="['bole-calendar-arrow', { active: !isCollapse }]" @click="toggle">
@@ -29,12 +27,6 @@
const model = defineModel<Date | Date[]>();
const { isCollapse, toggle } = useToggle(true);
-
-const calendar = ref();
-function handleChange(value) {
- console.log('value: ', value);
- console.log('calendar: ', calendar.value);
-}
</script>
<style lang="scss">
diff --git a/packages/hooks/enterprise.ts b/packages/hooks/enterprise.ts
index 3217a6b..308786e 100644
--- a/packages/hooks/enterprise.ts
+++ b/packages/hooks/enterprise.ts
@@ -1,5 +1,5 @@
import { useQuery, useQueryClient } from '@tanstack/vue-query';
-import * as enterpriseServices from '@12333/services/apiV2/enterprise';
+import * as taskServices from '@12333/services/apiV2/task';
import { MaybeRef, unref } from 'vue';
type UseEnterpriseDetailOptions = {
@@ -8,16 +8,16 @@
export function useEnterpriseDetail({ id }: UseEnterpriseDetailOptions) {
const { data, refetch, isLoading, isError } = useQuery({
- queryKey: ['enterpriseServices/getEnterprise', id],
+ queryKey: ['taskServices/getTaskEnterprise', id],
queryFn: async () => {
- return await enterpriseServices.getEnterprise(
+ return await taskServices.getTaskEnterprise(
{ id: unref(id) },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.GetEnterpriseQueryResult),
+ placeholderData: () => ({} as API.GetTaskEnterpriseQueryResult),
});
return {
--
Gitblit v1.9.1