From fb243f3345c6f3ed7e7c8c2d98c39b5afc782b9a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 20 十月 2025 10:24:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/components/src/Card/FlexJobCard.vue | 128 +++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 77 deletions(-)
diff --git a/packages/components/src/Card/FlexJobCard.vue b/packages/components/src/Card/FlexJobCard.vue
index 6218572..006a2d1 100644
--- a/packages/components/src/Card/FlexJobCard.vue
+++ b/packages/components/src/Card/FlexJobCard.vue
@@ -1,36 +1,33 @@
<template>
<div class="flexJob-card-wrapper">
- <div class="flexJob-card-top-wrapper">
- <UserAvatar :size="60" class="flexJob-card-top-avatar" />
- <div class="flexJob-card-top-info">
- <div class="flexJob-card-top-info-item">
- <div class="flexJob-card-top-info-name">{{ '娲嬫磱' }}</div>
- <div class="flexJob-card-top-info-gender">
- <img v-if="1" :src="IconMale" class="flexJob-card-top-info-gender-icon" />
- <img v-else :src="IconFemale" class="flexJob-card-top-info-gender-icon" />
- </div>
- <div class="flexJob-card-top-info-auth">{{ '宸插疄鍚�' }}</div>
- </div>
- <div class="flexJob-card-top-info-detail">{{ '26宀� | 闈炲鐢� | 鏈 | 涓婂矖121娆�' }}</div>
- </div>
- </div>
+ <FlexJobTopView
+ :name="name"
+ :age="age"
+ :avatar="avatar"
+ :gender="gender"
+ :isReal="isReal"
+ :personalIdentityContent="personalIdentityContent"
+ :educationalBackgroundContent="educationalBackgroundContent"
+ :taskCount="taskCount"
+ />
<div class="flexJob-card-done-list">
- {{
- '鍋氳繃锛氬鎴挎湇鍔″憳銆佸鎴挎湇鍔″憳銆佸鎴垮鎴挎湇鍔″憳銆佸鎴垮仛杩囷細瀹㈡埧鏈嶅姟鍛樸�佸鎴挎湇鍔″憳銆佸鎴垮鎴挎湇鍔″憳銆佸鎴�'
- }}
+ {{ workExperience }}
</div>
- <div class="flexJob-card-done-detail">
- <div class="flexJob-card-done-detail-item">
- {{ '鍦ㄣ�屽畞娉㈤浄杩．閰掑簵銆嶏紝鍋氳繃瀹㈡埧鏈嶅姟鍛樺湪銆屽畞娉㈤浄杩．閰掑簵銆嶏紝鍋氳繃瀹㈡埧鏈嶅姟鍛�' }}
- </div>
- <div class="flexJob-card-done-detail-item">{{ '鍦ㄣ�屽畞娉㈤浄杩．閰掑簵銆嶏紝鍋氳繃瀹㈡埧鏈嶅姟鍛�' }}</div>
+ <div class="flexJob-card-done-detail" v-if="showDoneDetail">
+ <div class="flexJob-card-done-detail-item">{{ workSeniority }}</div>
+ <!-- <div class="flexJob-card-done-detail-item">{{ '鍦ㄣ�屽畞娉㈤浄杩．閰掑簵銆嶏紝鍋氳繃瀹㈡埧鏈嶅姟鍛�' }}</div> -->
</div>
<div class="flexJob-card-footer">
- <div class="flexJob-card-footer-left" v-if="showFooterLeft">
- <slot name="footerLeft">
- <div class="flexJob-card-footer-text">鍙栨秷鏀惰棌</div>
- </slot>
+ <div class="flexJob-card-footer-left-wrapper">
+ <div class="flexJob-card-footer-left" v-if="showFooterLeft">
+ <slot name="footerLeft">
+ <div class="flexJob-card-footer-text" @click.stop="emit('cancelCollection')">
+ 鍙栨秷鏀惰棌
+ </div>
+ </slot>
+ </div>
</div>
+
<div class="flexJob-card-footer-right" v-if="showFooterRight">
<slot name="footerRight">
<nut-button type="primary">绔嬪嵆鑱旂郴</nut-button>
@@ -41,9 +38,9 @@
</template>
<script setup lang="ts">
-import IconMale from '@/assets/mine/icon-male.png';
-import IconFemale from '@/assets/mine/icon-female.png';
import { CommonTaskCardProps } from './card';
+import FlexJobTopView from './FlexJobTopView.vue';
+import { EnumUserGender } from '@12333/constants';
defineOptions({
name: 'FlexJobCard',
@@ -52,12 +49,29 @@
type Props = CommonTaskCardProps & {
showFooterLeft?: boolean;
showFooterRight?: boolean;
+ showDoneDetail?: boolean;
+
+ name?: string;
+ avatar?: string;
+ gender?: EnumUserGender;
+ age?: number;
+ isReal?: boolean;
+ personalIdentityContent?: string;
+ educationalBackgroundContent?: string;
+ taskCount?: number;
+ workExperience?: string;
+ workSeniority?: string;
};
const props = withDefaults(defineProps<Props>(), {
showFooterLeft: true,
showFooterRight: true,
+ showDoneDetail: true,
});
+
+const emit = defineEmits<{
+ (e: 'cancelCollection'): void;
+}>();
</script>
<style lang="scss">
@@ -74,55 +88,7 @@
}
.flexJob-card-top-wrapper {
- display: flex;
- align-items: center;
margin-bottom: 38px;
-
- .flexJob-card-top-avatar {
- margin-right: 30px;
- }
-
- .flexJob-card-top-info {
- display: flex;
- flex-direction: column;
-
- .flexJob-card-top-info-item {
- display: flex;
- align-items: center;
-
- .flexJob-card-top-info-name {
- font-size: 34px;
- line-height: 34px;
- font-weight: bold;
- color: boleGetCssVar('text-color', 'primary');
- }
-
- .flexJob-card-top-info-gender {
- display: inline-flex;
- align-items: center;
- height: 34px;
- margin: 0 10px;
-
- .flexJob-card-top-info-gender-icon {
- width: 24px;
- height: 24px;
- }
- }
-
- .flexJob-card-top-info-auth {
- font-size: 28px;
- line-height: 34px;
- }
- }
-
- .flexJob-card-top-info-detail {
- font-size: 24px;
- font-weight: 400;
- line-height: 28px;
- margin-top: 12px;
- color: boleGetCssVar('text-color', 'secondary');
- }
- }
}
.flexJob-card-done-list {
@@ -153,10 +119,14 @@
.flexJob-card-footer {
display: flex;
align-items: center;
- justify-content: space-between;
border-top: #d9d9d9 1px solid;
padding-top: 24px;
margin-top: 18px;
+
+ .flexJob-card-footer-left-wrapper {
+ flex: 1;
+ min-width: 0;
+ }
.flexJob-card-footer-left {
.flexJob-card-footer-text {
@@ -170,6 +140,10 @@
--nut-button-default-font-size: 24px;
--nut-button-default-height: 52px;
--nut-button-default-line-height: 49px;
+
+ .nut-button {
+ min-width: 144rpx;
+ }
}
}
}
--
Gitblit v1.9.1