From 0cd05cf1adc6574a25810ffab748c8defe283e1e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 12 八月 2025 17:43:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue | 4 ++--
packages/components/src/Card/FlexJobTopView.vue | 20 +++++++++++++++-----
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 10 +++++++++-
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue
index 81ac002..f1ba77d 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue
@@ -1,10 +1,10 @@
<template>
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
<JobDetailContent :isCollapse="true">
- <template #footer>
+ <!-- <template #footer>
<PageFooterBtn type="primary" plain>瑙ｇ害</PageFooterBtn>
<PageFooterBtn type="primary">绛剧害</PageFooterBtn>
- </template>
+ </template> -->
</JobDetailContent>
</LoadingLayout>
</template>
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 7460bc6..3f72bab 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
@@ -18,7 +18,15 @@
:key="queryState.userSignContractStatus"
>
<template #renderItem="{ item }">
- <FlexJobCard :show-done-detail="false" :show-footer-left="false" @click="goDetail(item)">
+ <FlexJobCard
+ :show-done-detail="false"
+ :show-footer-left="false"
+ :name="item.name"
+ :gender="item.gender"
+ :age="item.age"
+ :isReal="item.userIsReal"
+ @click="goDetail(item)"
+ >
<template #footerRight>
<span></span>
<!-- <template
diff --git a/packages/components/src/Card/FlexJobTopView.vue b/packages/components/src/Card/FlexJobTopView.vue
index 754b80d..af58bf0 100644
--- a/packages/components/src/Card/FlexJobTopView.vue
+++ b/packages/components/src/Card/FlexJobTopView.vue
@@ -18,11 +18,7 @@
</div>
<slot name="detail">
<div class="flexJob-card-top-info-detail">
- {{
- `${age ? '' : `${age}宀亅`}${personalIdentityContent ?? ''} | ${
- educationalBackgroundContent ?? ''
- } | 涓婂矖${taskCount ?? 0}娆
- }}
+ {{ infoDetail }}
</div>
</slot>
</div>
@@ -34,6 +30,7 @@
import IconFemale from '@/assets/mine/icon-female.png';
import { AvatarImage, EnumUserGender } from '@12333/constants';
import { Avatar } from '@12333/components';
+import { computed } from 'vue';
defineOptions({
name: 'FlexJobTopView',
@@ -55,7 +52,20 @@
const props = withDefaults(defineProps<Props>(), {
size: 'normal',
avatar: AvatarImage,
+ personalIdentityContent: '',
+ educationalBackgroundContent: '',
});
+
+const infoDetail = computed(() =>
+ [
+ props.age > 0 ? `${props.age}宀乣 : '',
+ props.personalIdentityContent,
+ props.educationalBackgroundContent,
+ props.taskCount > 0 ? `涓婂矖${props.taskCount ?? 0}娆 : '',
+ ]
+ .filter(Boolean)
+ .join('|')
+);
</script>
<style lang="scss">
--
Gitblit v1.9.1