From e742287f530e6ed57b18581aa04651db259a0ab7 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 17 九月 2025 13:02:36 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-v1.1
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 8 +++++++-
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 1 +
apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue | 1 +
packages/components/src/Card/JobApplicationCard.vue | 14 ++++++++++----
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
index 170b4a4..b3f3e83 100644
--- a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
@@ -31,6 +31,7 @@
:addressName="item.addressName"
:serviceFee="item.serviceFee"
:userCount="item.userCount"
+ :status="item.status"
:unit="BillingMethodEnumUnit[item.billingMethod]"
:releaseStatus="item.releaseStatus"
@edit="goEdit(item)"
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 1bcacfc..8ece015 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -117,7 +117,13 @@
placeholder="璇烽�夋嫨璧勬牸璇佷功"
/>
</nut-form-item>
- <nut-form-item label="浠诲姟鍦扮偣" class="bole-form-item" prop="weMapInfo" required>
+ <nut-form-item
+ label="浠诲姟鍦扮偣"
+ label-width="90px"
+ class="bole-form-item"
+ prop="weMapInfo"
+ required
+ >
<ChooseLocationInput placeholder="璇烽�夋嫨浠诲姟鍦扮偣" v-model="form.weMapInfo" />
</nut-form-item>
<nut-form-item
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index a06d11c..befd943 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -27,6 +27,7 @@
:addressName="item.addressName"
:createdTime="item.createdTime"
:serviceFee="item.serviceFee"
+ :status="item.status"
:unit="BillingMethodEnumUnit[item.billingMethod]"
mode="taskManage"
>
diff --git a/packages/components/src/Card/JobApplicationCard.vue b/packages/components/src/Card/JobApplicationCard.vue
index 4c75837..62e7449 100644
--- a/packages/components/src/Card/JobApplicationCard.vue
+++ b/packages/components/src/Card/JobApplicationCard.vue
@@ -96,15 +96,21 @@
const menuList = computed(() => {
let _menuList = [];
_menuList.push(
- {
- name: '缂栬緫',
- value: ManageActions.Edit,
- },
+ // {
+ // name: '缂栬緫',
+ // value: ManageActions.Edit,
+ // },
{
name: '鏌ョ湅璇︽儏',
value: ManageActions.Detail,
}
);
+ if (props.status === EnumTaskStatus.Wait) {
+ _menuList.push({
+ name: '缂栬緫',
+ value: ManageActions.Edit,
+ });
+ }
if (props.releaseStatus === EnumTaskReleaseStatus.Stopped) {
_menuList.push({
name: '鍙戝竷',
--
Gitblit v1.9.1