From eb01fa3052576eb05faa83bb6b094aa5f85a4408 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 17:29:38 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1

---
 apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue |   90 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue b/apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue
index 6552419..bd4882c 100644
--- a/apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue
+++ b/apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue
@@ -1,37 +1,62 @@
 <template>
   <ContentView style="background-color: transparent" class="job-detail-content">
-    <FlexJobTopView size="small" class="job-detail-content-top" />
+    <FlexJobTopView
+      :avatar="avatar"
+      :name="name"
+      :age="age"
+      :isReal="isReal"
+      :gender="gender"
+      :personalIdentityContent="personalIdentityContent"
+      :educationalBackgroundContent="educationalBackgroundContent"
+      :taskCount="taskCount"
+      size="small"
+      class="job-detail-content-top"
+    />
     <div class="job-detail-content-contact-info">
       <div class="job-detail-content-contact-info-item">
         <div class="job-detail-content-contact-info-item-label">鎵嬫満鍙凤細</div>
         <div class="job-detail-content-contact-info-item-text">
-          {{ isCollapse ? '13333333333' : '绔嬪嵆鑱旂郴鍚庡彲鏌ョ湅' }}
+          {{ isCollapse ? contactPhoneNumber : '绔嬪嵆鑱旂郴鍚庡彲鏌ョ湅' }}
         </div>
       </div>
       <div class="job-detail-content-contact-info-item">
         <div class="job-detail-content-contact-info-item-label">韬唤璇佸彿锛�</div>
         <div class="job-detail-content-contact-info-item-text">
-          {{ isCollapse ? hiddenIDNumberForEnd6('330902199909123456') : '绔嬪嵆鑱旂郴鍚庡彲鏌ョ湅' }}
+          {{ isCollapse ? hiddenIDNumberForEnd6(identity) : '绔嬪嵆鑱旂郴鍚庡彲鏌ョ湅' }}
         </div>
       </div>
     </div>
   </ContentView>
-  <ProTabs
-    v-model="tab"
-    name="job-detail-content-tab"
-    :showSmile="false"
-    class="job-detail-content-tabs"
-    isTransparent
-    title-gutter="8"
-    fullHeight
-  >
-    <ProTabPane :title="`绠�鍘哷" pane-key="1">
-      <curriculumView />
-    </ProTabPane>
-    <ProTabPane :title="`缁忓巻`" pane-key="2">
-      <experienceView />
-    </ProTabPane>
-  </ProTabs>
+  <div style="flex: 1; min-height: 0">
+    <ProTabs
+      v-model="tab"
+      name="job-detail-content-tab"
+      :showSmile="false"
+      class="job-detail-content-tabs"
+      isTransparent
+      title-gutter="8"
+      fullHeight
+    >
+      <ProTabPane :title="`绠�鍘哷" pane-key="1">
+        <curriculumView
+          :userExpectJobs="userExpectJobs"
+          :freeTime="freeTime"
+          :jobSeekingStatus="jobSeekingStatus"
+          :userCredentials="userCredentials"
+          :workSeniority="workSeniority"
+          :workExperience="workExperience"
+          :photos="photos"
+          :height="height"
+          :weight="weight"
+          :videos="videos"
+        />
+      </ProTabPane>
+      <ProTabPane :title="`缁忓巻`" pane-key="2">
+        <experienceView :taskInfoUsers="taskInfoUsers" />
+      </ProTabPane>
+    </ProTabs>
+  </div>
+
   <PageFooter>
     <slot name="footer"></slot>
   </PageFooter>
@@ -42,6 +67,7 @@
 import { hiddenIDNumberForEnd6 } from '@12333/utils';
 import curriculumView from './components/curriculumView.vue';
 import experienceView from './components/experienceView.vue';
+import { EnumUserGender } from '@12333/constants';
 
 defineOptions({
   name: 'JobDetailContent',
@@ -49,6 +75,32 @@
 
 type Props = {
   isCollapse: boolean;
+
+  avatar?: string;
+  name?: string;
+  gender?: EnumUserGender;
+  age?: number;
+  isReal?: boolean;
+  personalIdentityContent?: string;
+  educationalBackgroundContent?: string;
+  taskCount?: number;
+  contactPhoneNumber?: string;
+  identity?: string;
+
+  userExpectJobs?: API.GetUserResumeQueryResultExpectJob[];
+  freeTime?: API.EnumPersonalFreeTime;
+  jobSeekingStatus?: API.EnumPersonalJobSeekingStatus;
+  userCredentials?: API.GetUserResumeQueryResultCredential[];
+  workSeniority?: string;
+  workExperience?: string;
+  photos?: string[];
+  videos?: string[];
+  /** 韬珮 */
+  height?: number;
+  /** 浣撻噸 */
+  weight?: number;
+
+  taskInfoUsers?: API.GetUserResumeQueryResultExperience[];
 };
 
 const tab = ref('1');

--
Gitblit v1.9.1