From 58e6c22b584ba40169753ec5038dec7d780c0bd3 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 17 十月 2025 19:47:30 +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 | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue b/apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue
index 3b301d6..bd4882c 100644
--- a/apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue
+++ b/apps/bMiniApp/src/components/JobDetailContent/JobDetailContent.vue
@@ -27,32 +27,36 @@
</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
- :userExpectJobs="userExpectJobs"
- :freeTime="freeTime"
- :jobSeekingStatus="jobSeekingStatus"
- :userCredentials="userCredentials"
- :workSeniority="workSeniority"
- :workExperience="workExperience"
- :photos="photos"
- :height="height"
- :weight="weight"
- />
- </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>
@@ -90,6 +94,7 @@
workSeniority?: string;
workExperience?: string;
photos?: string[];
+ videos?: string[];
/** 韬珮 */
height?: number;
/** 浣撻噸 */
--
Gitblit v1.9.1