From 201ca4f20ce2dd1b2e4c5ec0a7f09f377e923195 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 15 八月 2025 16:32:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/components/src/Card/TaskCard.vue | 3 +++
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue | 2 +-
apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue | 3 +++
packages/constants/task.ts | 3 +++
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 6 +++---
apps/cMiniApp/src/pages/task/InnerPage.vue | 5 ++++-
packages/components/src/Calendar/Calendar.vue | 14 +++++++++++++-
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue | 1 +
apps/cMiniApp/src/pages/mine/index.vue | 4 +++-
packages/hooks/task.ts | 2 +-
10 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
index 1967585..c9a1d61 100644
--- a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
@@ -15,6 +15,9 @@
:age="item.age"
:avatar="item.avatar"
:educationalBackgroundContent="item.educationalBackgroundContent"
+ :personalIdentityContent="item.personalIdentityContent"
+ :workExperience="item.workExperience"
+ :workSeniority="item.workSeniority"
:taskCount="item.taskCount"
:showFooterLeft="false"
>
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 6019fdc..010a8a2 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -182,7 +182,7 @@
const { userDetail } = useUser();
const { findAreaNameFromCode } = useAllAreaList();
const router = Taro.useRouter();
-const taskId = router.params?.taskId ?? '';
+const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
const isCopy = router.params?.isCopy === 'true';
console.log('isCopy: ', router.params?.isCopy);
@@ -272,7 +272,7 @@
message: '璇烽�夋嫨缁撴潫鏃ユ湡',
validator(value) {
if (!value) return Promise.reject('璇烽�夋嫨缁撴潫鏃ユ湡');
- if (!dayjs(value).isAfter(dayjs(form.beginTime)))
+ if (dayjs(value).isBefore(dayjs(form.beginTime)))
return Promise.reject('缁撴潫鏃ユ湡闇�澶т簬寮�濮嬫棩鏈�');
return Promise.resolve(true);
},
@@ -361,7 +361,7 @@
}
let res = await taskServices.saveTaskInfo(params);
if (res) {
- Message.success(isEdit ? '缂栬緫鎴愬姛' : '鍙戝竷鎴愬姛', {
+ Message.success(isEdit && !isCopy ? '缂栬緫鎴愬姛' : '鍙戝竷鎴愬姛', {
onClosed() {
goBack();
},
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index 7bddbbd..37cfe96 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -132,7 +132,9 @@
const bgHeight = computed(() => 133 + systemStore.navHeight);
Taro.useDidShow(() => {
- updateUserInfo();
+ if (isLogin.value) {
+ updateUserInfo();
+ }
});
function goLogin() {
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 842cac1..3f5639d 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -51,7 +51,10 @@
url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
});
}
- if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed) {
+ if (
+ Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
+ Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed
+ ) {
Taro.navigateTo({
url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
});
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
index 4b22776..45e67c9 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
@@ -9,7 +9,7 @@
/>
</nut-form-item>
<nut-form-item label="璇佷功缂栧彿:" class="bole-form-item" prop="code">
- <nut-input v-model="form.code" type="text" placeholder="璇疯緭鍏�"> </nut-input>
+ <nut-input v-model="form.code" type="number" placeholder="璇疯緭鍏�"> </nut-input>
</nut-form-item>
<nut-form-item
label="姘镐箙璇佷功:"
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
index d8bd3f9..95d9666 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -9,6 +9,7 @@
title-scroll
>
<ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
+ <ProTabPane :title="`寰呭紑濮媊" :pane-key="GetPersonalHireTaskInfosQueryStatus.Wait"></ProTabPane>
<ProTabPane
:title="`杩涜涓璥"
:pane-key="GetPersonalHireTaskInfosQueryStatus.InProcess"
diff --git a/packages/components/src/Calendar/Calendar.vue b/packages/components/src/Calendar/Calendar.vue
index c973d70..acb8468 100644
--- a/packages/components/src/Calendar/Calendar.vue
+++ b/packages/components/src/Calendar/Calendar.vue
@@ -1,7 +1,12 @@
<template>
<div class="bole-calendar-wrapper">
<div :class="['bole-calendar-inner', { isCollapse }]">
- <nut-calendar-card v-model="model" class="bole-calendar"></nut-calendar-card>
+ <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">
<DownArrow :size="12" :class="['bole-calendar-arrow-icon']" />
@@ -12,6 +17,7 @@
<script setup lang="ts">
import { DownArrow } from '@nutui/icons-vue-taro';
import { useToggle } from 'senin-mini/hooks';
+import { ref, watch } from 'vue';
defineOptions({
name: 'Calendar',
@@ -23,6 +29,12 @@
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/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue
index e45fad3..edbd5fb 100644
--- a/packages/components/src/Card/TaskCard.vue
+++ b/packages/components/src/Card/TaskCard.vue
@@ -41,6 +41,7 @@
v-if="releaseStatus === EnumTaskReleaseStatus.InProcess"
type="primary"
@click="emit('apply', props.id)"
+ :disabled="!!hireStatus"
>鎶ュ悕</nut-button
>
</slot>
@@ -63,6 +64,7 @@
EnumUserGenderText,
EnumSettlementCycleText,
BillingMethodEnumUnit,
+ EnumTaskUserHireStatus,
} from '@12333/constants';
import TaskPrice from './TaskPrice.vue';
import { CommonTaskCardProps } from './card';
@@ -119,6 +121,7 @@
recommendStatus?: EnumTaskRecommendStatus;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
+ hireStatus?: EnumTaskUserHireStatus;
};
const props = withDefaults(defineProps<Props>(), {
diff --git a/packages/constants/task.ts b/packages/constants/task.ts
index ab19a55..4a5dd65 100644
--- a/packages/constants/task.ts
+++ b/packages/constants/task.ts
@@ -81,17 +81,20 @@
};
export const GetPersonalHireTaskInfosQueryStatusText = {
+ [GetPersonalHireTaskInfosQueryStatus.Wait]: '寰呭紑濮�',
[GetPersonalHireTaskInfosQueryStatus.InProcess]: '杩涜涓�',
[GetPersonalHireTaskInfosQueryStatus.Completed]: '宸插畬鎴�',
};
export const GetPersonalHireTaskInfosQueryStatusColor = {
+ [GetPersonalHireTaskInfosQueryStatus.Wait]: '#9FA4AC',
[GetPersonalHireTaskInfosQueryStatus.InProcess]: '#2A9E1B',
[GetPersonalHireTaskInfosQueryStatus.Completed]: '#9FA4AC',
};
export const GetTaskInfoQueryResultHireButtonText = {
[GetTaskInfoQueryResultHireButton.ApplyCheckReceive]: '鐢宠楠屾敹',
+ [GetTaskInfoQueryResultHireButton.Wait]: '寰呭紑濮�',
[GetTaskInfoQueryResultHireButton.InProcess]: '杩涜涓�',
[GetTaskInfoQueryResultHireButton.Completed]: '宸插畬鎴�',
};
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index a29fbb1..474681a 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -161,7 +161,7 @@
rows: 20,
page: pageParam,
},
- id: id,
+ taskInfoId: id,
};
return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {
--
Gitblit v1.9.1