From df7c6af1c1cfd2e9bda249e381aecb5482120d14 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 19 二月 2025 10:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/components/src/Card/TaskCard.vue | 4 +++-
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue | 12 ++++++------
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue | 9 ++++++++-
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue | 9 ++++++++-
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
index ed793cf..ad7242e 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
@@ -11,12 +11,6 @@
<nut-form-item label="璇佷功缂栧彿:" class="bole-form-item" prop="certificateNumber">
<nut-input v-model="form.certificateNumber" type="number" placeholder="璇疯緭鍏�"> </nut-input>
</nut-form-item>
- <nut-form-item label="寮�濮嬫棩鏈�:" class="bole-form-item" prop="startDate">
- <ChooseInputWithDatePicker v-model="form.startDate"></ChooseInputWithDatePicker>
- </nut-form-item>
- <nut-form-item label="缁撴潫鏃ユ湡:" class="bole-form-item" prop="endDate">
- <ChooseInputWithDatePicker v-model="form.endDate"></ChooseInputWithDatePicker>
- </nut-form-item>
<nut-form-item
label="姘镐箙璇佷功:"
class="bole-form-item permanent-certificate"
@@ -24,6 +18,12 @@
>
<nut-switch v-model="form.isPermanentCertificate" />
</nut-form-item>
+ <nut-form-item label="寮�濮嬫棩鏈�:" class="bole-form-item" prop="startDate">
+ <ChooseInputWithDatePicker v-model="form.startDate"></ChooseInputWithDatePicker>
+ </nut-form-item>
+ <nut-form-item label="缁撴潫鏃ユ湡:" class="bole-form-item" prop="endDate">
+ <ChooseInputWithDatePicker v-model="form.endDate"></ChooseInputWithDatePicker>
+ </nut-form-item>
<nut-form-item label="鍙戣瘉鍗曚綅:" class="bole-form-item" prop="certificateNumber">
<nut-input v-model="form.certificateNumber" placeholder="璇疯緭鍏�"> </nut-input>
</nut-form-item>
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
index 95e9cd5..e5e8f1a 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -19,7 +19,7 @@
:key="queryState.mineHireType"
>
<template #renderItem="{ item }">
- <TaskCard>
+ <TaskCard @click="goTaskDetail(item)">
<template #actions>
<div class="task-card-actions-text" :style="{ color: TaskStatusColor[10] }">
{{ TaskStatusText[10] }}
@@ -37,6 +37,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import * as orderServices from '@12333/services/api/Order';
+import Taro from '@tarojs/taro';
defineOptions({
name: 'InnerPage',
@@ -70,6 +71,12 @@
queryKey: ['orderServices/getFrontOrderList', queryState],
}
);
+
+function goTaskDetail(item: API.FrontOrderList) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskDetail}?id=${item.id}`,
+ });
+}
</script>
<style lang="scss">
diff --git a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
index d2f4342..cce64e0 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
@@ -18,7 +18,7 @@
:key="queryState.mineSignType"
>
<template #renderItem="{ item }">
- <TaskCard>
+ <TaskCard @click="goTaskDetail(item)">
<template #actions>
<div class="task-card-actions-text" :style="{ color: TaskStatusColor[10] }">
{{ TaskStatusText[10] }}
@@ -36,6 +36,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import * as orderServices from '@12333/services/api/Order';
+import Taro from '@tarojs/taro';
defineOptions({
name: 'InnerPage',
@@ -69,6 +70,12 @@
queryKey: ['orderServices/getFrontOrderList', queryState],
}
);
+
+function goTaskDetail(item: API.FrontOrderList) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskDetail}?id=${item.id}`,
+ });
+}
</script>
<style lang="scss">
diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue
index ddee2ff..27a75cb 100644
--- a/packages/components/src/Card/TaskCard.vue
+++ b/packages/components/src/Card/TaskCard.vue
@@ -21,7 +21,7 @@
</div>
<div class="task-card-actions" v-if="showActions">
<slot name="actions">
- <nut-button type="primary">鎶ュ悕</nut-button>
+ <nut-button type="primary" @click.stop="handleSign">鎶ュ悕</nut-button>
</slot>
</div>
</div>
@@ -43,6 +43,8 @@
const props = withDefaults(defineProps<Props>(), {
showActions: true,
});
+
+function handleSign() {}
</script>
<style lang="scss">
--
Gitblit v1.9.1