Merge branch 'jobFair' of https://git.citupro.com/zhengnaiwen_citu/menduner into jobFair

src/utils/avatar.js

@@ -1,5 +1,5 @@
-const male = 'https://minio.citupro.com/dev/menduner/11.png'
-const female = 'https://minio.citupro.com/dev/menduner/7.png'
+const male = 'https://minio.menduner.com/dev/d1b0976e90f26a65ac3e953fbb7f111726061e1e1bee490c1d4857c8bc62b157.png'
+const female = 'https://minio.menduner.com/dev/b579246470f8a29b3fcef757f996dac7b7d434fd9271c6c8ecd188216b8d8758.png'
 
 // 根据性别返回默认头像
 // isChatSystem: 系统消息

src/views/recruit/enterprise/search/retrieval/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="d-flex justify-center mt-4 mb-6">
-      <TextInput v-model="queryParams.content" :item="textItem" @enter="handleConfirm" @appendInnerClick="handleConfirm"></TextInput>
+      <TextInput v-model="queryParams.content" :item="textItem" @enter="handleConfirm" @appendInnerClick="handleConfirm(false)"></TextInput>
     </div>
     <div>
       <div class="font-size-15 d-flex align-center color-666">
@@ -59,37 +59,35 @@
         <template #subtitle>
           <div class="d-flex">
             <div class="mr-10">{{ item.subTitle }}</div>
-            <div class="mr-10">首次工作时间： {{ timesTampChange(item.firstWorkTime, 'Y-M-D') }}</div>
-            <div v-if="item.interestedList?.length" class="mr-10 d-flex flex-wrap">
-              <div>求职意向：</div>
-              <div
-                v-for="(interested, index) in item.interestedList"
-                :key="interested.id"
-              >
-                <span :class="{'mx-3': index}">{{ (index ? '|' : '') }}</span>
-                <span>{{ positionData.find(e => e.id === interested.positionId)?.nameCn ?? '暂无' }}</span>
-              </div>
-            </div>
+            <div class="mr-10">首次工作时间： {{ item.firstWorkTime ? timesTampChange(item.firstWorkTime, 'Y-M-D') : '未填写' }}</div>
+          </div>
+          <div v-if="item.interestedList?.length" v-ellipse-tooltip>
+            <span>求职意向：</span>
+            <span
+              v-for="(interested, index) in item.interestedList"
+              :key="interested.id"
+            >
+              <span :class="{'mx-3': index}">{{ (index ? '|' : '') }}</span>
+              <span>{{ positionData.find(e => e.id === interested.positionId)?.nameCn ?? '暂无' }}</span>
+            </span>
           </div>
         </template>
         
-        <div class="px-5 pb-8">
-          <div v-if="item?.workList?.length">
-            <div class="second-title">工作经验</div>
-            <v-timeline density="compact" align="start" side="end" truncate-line="both">
-              <v-timeline-item v-for="(j, i) in item.workList" :key="i" dot-color="primary" size="small">
-                <div v-if="j.show" class="timeline-item mt-1">
-                  <div v-ellipse-tooltip style="width: 20%;">
-                    <span>{{ j.startTimeStr }}</span>
-                    <span v-if="j.endTimeStr"> - {{ j.endTimeStr }}</span>
-                    <span v-if="j.year"> ({{ j.year }})</span>
-                  </div>
-                  <div v-ellipse-tooltip class="timeline-item-name mx-3">{{ formatName(j.enterpriseName) || '' }}</div>
-                  <div v-ellipse-tooltip class="timeline-item-name">{{ formatName(j.positionName) || '' }}</div>
+        <div class="px-5 pb-5" v-if="item?.workList?.length">
+          <div class="second-title">工作经验</div>
+          <v-timeline density="compact" align="start" side="end" truncate-line="both">
+            <v-timeline-item v-for="(j, i) in item.workList" :key="i" dot-color="primary" size="small">
+              <div v-if="j.show" class="timeline-item mt-1">
+                <div v-ellipse-tooltip style="width: 20%;">
+                  <span>{{ j.startTimeStr }}</span>
+                  <span v-if="j.endTimeStr"> - {{ j.endTimeStr }}</span>
+                  <span v-if="j.year"> ({{ j.year }})</span>
                 </div>
-              </v-timeline-item>
-            </v-timeline>
-          </div>
+                <div v-ellipse-tooltip class="timeline-item-name mx-3">{{ formatName(j.enterpriseName) || '' }}</div>
+                <div v-ellipse-tooltip class="timeline-item-name">{{ formatName(j.positionName) || '' }}</div>
+              </div>
+            </v-timeline-item>
+          </v-timeline>
         </div>
       </v-card>
     </div>