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

---
 apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue b/apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue
index 7946288..cc5a2dc 100644
--- a/apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue
+++ b/apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue
@@ -23,15 +23,8 @@
           </CurriculumViewItem>
         </div>
       </CellChunk>
-      <CellChunk title="璧勬牸璇佷功">
-        <nut-grid
-          square
-          :column-num="3"
-          :border="false"
-          :gutter="20"
-          v-if="_userCredentials.length > 0"
-          class="pro-img-grid"
-        >
+      <CellChunk title="璧勬牸璇佷功" v-if="_userCredentials.length > 0">
+        <nut-grid square :column-num="3" :border="false" :gutter="20" class="pro-img-grid">
           <nut-grid-item
             v-for="(item, index) in _userCredentials"
             :key="item"
@@ -44,19 +37,18 @@
         </nut-grid>
       </CellChunk>
       <CellChunk title="宸ヤ綔缁忛獙">
-        <CurriculumViewItem label="宸ヤ綔骞撮檺锛�" :text="workSeniority ? `${workSeniority}骞碻 : ''">
-        </CurriculumViewItem>
+        <CurriculumViewItem label="宸ヤ綔骞撮檺锛�" :text="workSeniority"> </CurriculumViewItem>
         <CurriculumViewItem label="宸ヤ綔缁忛獙锛�" :text="workExperience"> </CurriculumViewItem>
       </CellChunk>
       <CellChunk title="璇︾粏淇℃伅">
         <CurriculumViewItem
           label="韬珮锛�"
-          :text="`${height} cm`"
+          :text="height && `${height} cm`"
           :label-width="labelWidth"
         ></CurriculumViewItem>
         <CurriculumViewItem
           label="浣撻噸锛�"
-          :text="`${weight} kg`"
+          :text="weight && `${weight} kg`"
           :label-width="labelWidth"
         ></CurriculumViewItem>
         <CurriculumViewItem label="涓汉鐓х墖锛�">
@@ -75,6 +67,22 @@
             </nut-grid-item>
           </nut-grid>
         </CurriculumViewItem>
+        <CurriculumViewItem label="涓汉瑙嗛锛�">
+          <nut-grid
+            square
+            :column-num="2"
+            :border="false"
+            :gutter="20"
+            v-if="_photos.length > 0"
+            class="pro-img-grid"
+          >
+            <nut-grid-item v-for="(item, index) in _videos" :key="item" class="pro-img-grid-item">
+              <div class="pro-img-grid-img-item">
+                <video class="pro-img-grid-img" :src="item" />
+              </div>
+            </nut-grid-item>
+          </nut-grid>
+        </CurriculumViewItem>
       </CellChunk>
     </Cell>
   </ContentScrollView>
@@ -86,6 +94,7 @@
 import Taro from '@tarojs/taro';
 import { EnumPersonalFreeTimeText, EnumPersonalJobSeekingStatusText } from '@12333/constants';
 import { setOSSLink } from '@12333/utils';
+import { Video } from '@tarojs/components';
 
 defineOptions({
   name: 'curriculumView',
@@ -99,6 +108,7 @@
   workSeniority?: string;
   workExperience?: string;
   photos?: string[];
+  videos?: string[];
   /** 韬珮 */
   height?: number;
   /** 浣撻噸 */
@@ -109,10 +119,12 @@
   userExpectJobs: () => [],
   userCredentials: () => [],
   photos: () => [],
+  videos: () => [],
 });
 
 const _userCredentials = computed(() => props.userCredentials.map((x) => setOSSLink(x.img)));
 const _photos = computed(() => props.photos.map((x) => setOSSLink(x)));
+const _videos = computed(() => props.videos.map((x) => setOSSLink(x)));
 
 const labelWidth = Taro.pxTransform(120);
 </script>

--
Gitblit v1.9.1