From 2a4b768f52d9556a18a3190c5e6390b86abb37d8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 13 八月 2025 10:16:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 69 +++++++++++++++++++++++++---------
apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue | 3 +
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue | 4 +-
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 7 +--
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue | 2
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue | 2
6 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue
index 83dc2d5..557ab87 100644
--- a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue
+++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue
@@ -5,7 +5,7 @@
:name="item.name"
:age="item.age"
:gender="item.gender"
- :avatar="item.avatar"
+ :avatar="setOSSLink(item.avatar)"
:isReal="item.isReal"
:personalIdentityContent="item.personalIdentityContent"
:educationalBackgroundContent="item.educationalBackgroundContent"
@@ -35,6 +35,7 @@
import { useTaskUserList } from '@12333/hooks';
import { FlexJobCard } from '@12333/components';
import Taro from '@tarojs/taro';
+import { setOSSLink } from '@12333/utils';
defineOptions({
name: 'SignList',
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index aa46eef..3b108ca 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -28,10 +28,12 @@
:createdTime="item.createdTime"
:serviceFee="item.serviceFee"
:unit="BillingMethodEnumUnit[item.billingMethod]"
- @click="goSubmitTaskDetail(item)"
mode="taskManage"
>
<template #footer-actions>
+ <nut-button type="primary" @click.stop="goBatchTaskList(item, 'arrange')"
+ >浜哄憳瀹夋帓</nut-button
+ >
<nut-button
v-if="item.status === EnumTaskStatus.Complete"
type="primary"
@@ -39,9 +41,6 @@
class="dark-btn"
@click.stop="goBatchTaskList(item, 'detail')"
>璇︽儏</nut-button
- >
- <nut-button type="primary" v-else @click.stop="goBatchTaskList(item, 'arrange')"
- >浜哄憳瀹夋帓</nut-button
>
</template>
</JobApplicationCard>
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
index 87a0c9d..46deb43 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
@@ -117,8 +117,8 @@
onSuccess(data) {
form.typeCode = data.typeCode;
form.code = data.code;
- form.startDate = dayjs(data.startDate).format('YYYY-MM-DD');
- form.endDate = dayjs(data.endDate).format('YYYY-MM-DD');
+ form.startDate = data.startDate ? dayjs(data.startDate).format('YYYY-MM-DD') : '';
+ form.endDate = data.startDate ? dayjs(data.endDate).format('YYYY-MM-DD') : '';
form.issueUnit = data.issueUnit;
form.isForever = data.isForever;
form.img = convertApi2FormUrlOnlyOne(setOSSLink(data.img));
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
index 69b284a..6404b11 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -91,7 +91,7 @@
function goTaskDetail(item: API.GetPersonalHireTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}`,
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=mine`,
});
}
</script>
diff --git a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
index 0e86abd..f0a47a1 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
@@ -94,7 +94,7 @@
function goTaskDetail(item: API.GetPersonalApplyTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}`,
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=mine`,
});
}
</script>
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index d8fba8a..0efdd59 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -107,19 +107,47 @@
:isFlex="false"
@click="handleCall"
></PageFooterAction>
- <PageFooterBtn
- v-if="detail.releaseStatus === EnumTaskReleaseStatus.InProcess"
- type="primary"
- @click="handleApply"
- :disabled="detail?.hireStatus === EnumTaskUserHireStatus.Wait"
- >{{ `鎶ュ悕锛�${detail?.applyCount ?? 0}浜哄凡鎶ュ悕锛塦 }}</PageFooterBtn
- >
- <PageFooterBtn v-if="detail.hireStatus === EnumTaskUserHireStatus.Wait" color="#999999"
- >宸插仠姝�</PageFooterBtn
- >
- <PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
- >宸插仠姝�</PageFooterBtn
- >
+ <template v-if="from === 'mine'">
+ <PageFooterBtn
+ v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitHire"
+ color="#999999"
+ disabled
+ >寰呯‘璁�</PageFooterBtn
+ >
+ <!-- <PageFooterBtn
+ v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitSignContract"
+ >鍘荤绾�</PageFooterBtn
+ > -->
+ <PageFooterBtn
+ v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.InProcess"
+ color="#999999"
+ disabled
+ >杩涜涓�</PageFooterBtn
+ >
+ <!-- <PageFooterBtn
+ v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
+ >鐢宠楠屾敹</PageFooterBtn
+ > -->
+ <PageFooterBtn
+ v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.Completed"
+ color="#999999"
+ disabled
+ >宸插畬鎴�</PageFooterBtn
+ >
+ </template>
+ <template v-else>
+ <PageFooterBtn
+ v-if="detail?.releaseStatus === EnumTaskReleaseStatus.InProcess"
+ type="primary"
+ @click="handleApply"
+ :disabled="detail?.hireStatus"
+ >{{ `鎶ュ悕锛�${detail?.applyCount ?? 0}浜哄凡鎶ュ悕锛塦 }}</PageFooterBtn
+ >
+
+ <PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
+ >宸插仠姝�</PageFooterBtn
+ >
+ </template>
</PageFooter>
</LoadingLayout>
</template>
@@ -147,6 +175,8 @@
BillingMethodEnumUnit,
EnumTaskReleaseStatus,
EnumTaskUserHireStatus,
+ GetTaskInfoQueryResultApplyButton,
+ GetTaskInfoQueryResultHireButton,
} from '@12333/constants';
import { useAccessLogin } from '@/hooks';
@@ -159,7 +189,8 @@
*/
const router = Taro.useRouter();
-const taskId = router.params?.id ?? '';
+const id = router.params?.id ?? '';
+const from = router.params?.from ?? '';
const {
isLoading,
@@ -167,10 +198,10 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['taskServices/getTaskInfo', taskId],
+ queryKey: ['taskServices/getTaskInfo', id],
queryFn: async () => {
return await taskServices.getTaskInfo(
- { id: taskId },
+ { id: id },
{
showLoading: false,
}
@@ -186,7 +217,7 @@
const goComplaint = useAccessLogin(() => {
Taro.navigateTo({
- url: `${RouterPath.complaint}?id=${taskId}`,
+ url: `${RouterPath.complaint}?id=${id}`,
});
});
@@ -201,7 +232,7 @@
const handleApply = useAccessLogin(async () => {
try {
let params: API.ApplyTaskCommand = {
- ids: [taskId],
+ ids: [id],
};
let res = await taskUserServices.applyTask(params);
if (res) {
@@ -220,7 +251,7 @@
message: `纭畾${detail.value?.isCollected ? '鍙栨秷鏀惰棌' : '鏀惰棌'}鍚楋紵`,
});
let params: API.CollectTaskCommand = {
- ids: [taskId],
+ ids: [id],
isCollect: !detail.value?.isCollected,
};
let res = await taskUserServices.collectTask(params);
--
Gitblit v1.9.1