From acd6c55ea7b11e06130c20bcd5ffd98c8e880a1f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 12 八月 2025 16:32:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

---
 packages/components/src/Card/FlexJobCard.vue |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/packages/components/src/Card/FlexJobCard.vue b/packages/components/src/Card/FlexJobCard.vue
index 8039453..36fca70 100644
--- a/packages/components/src/Card/FlexJobCard.vue
+++ b/packages/components/src/Card/FlexJobCard.vue
@@ -1,27 +1,38 @@
 <template>
   <div class="flexJob-card-wrapper">
-    <FlexJobTopView :name="name" :age="age" :genderType="genderType" />
+    <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" v-if="showDoneDetail">
       <div class="flexJob-card-done-detail-item">
-        {{ '鍦ㄣ�屽畞娉㈤浄杩.閰掑簵銆嶏紝鍋氳繃瀹㈡埧鏈嶅姟鍛樺湪銆屽畞娉㈤浄杩.閰掑簵銆嶏紝鍋氳繃瀹㈡埧鏈嶅姟鍛�' }}
+        {{ workSeniority }}
       </div>
-      <div class="flexJob-card-done-detail-item">{{ '鍦ㄣ�屽畞娉㈤浄杩.閰掑簵銆嶏紝鍋氳繃瀹㈡埧鏈嶅姟鍛�' }}</div>
+      <!-- <div class="flexJob-card-done-detail-item">{{ '鍦ㄣ�屽畞娉㈤浄杩.閰掑簵銆嶏紝鍋氳繃瀹㈡埧鏈嶅姟鍛�' }}</div> -->
     </div>
     <div class="flexJob-card-footer">
       <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">鍙栨秷鏀惰棌</div>
+            <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>
+          <nut-button type="primary" @click.stop="emit('contact')">绔嬪嵆鑱旂郴</nut-button>
         </slot>
       </div>
     </div>
@@ -29,11 +40,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 { Gender } from '@12333/constants';
+import { EnumUserGender, Gender } from '@12333/constants';
 
 defineOptions({
   name: 'FlexJobCard',
@@ -45,11 +54,15 @@
   showDoneDetail?: boolean;
 
   name?: string;
-  genderType?: Gender;
+  avatar?: string;
+  gender?: EnumUserGender;
   age?: number;
-  educationalLevel?: string;
+  isReal?: boolean;
+  personalIdentityContent?: string;
+  educationalBackgroundContent?: string;
+  taskCount?: number;
   workExperience?: string;
-  arrangeCount?: number;
+  workSeniority?: string;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -57,6 +70,11 @@
   showFooterRight: true,
   showDoneDetail: true,
 });
+
+const emit = defineEmits<{
+  (e: 'cancelCollection'): void;
+  (e: 'contact'): void;
+}>();
 </script>
 
 <style lang="scss">

--
Gitblit v1.9.1