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

src/components/Enterprise/hotPromoted.vue

@@ -5,7 +5,7 @@
         <!-- 公司信息 -->
         <div class="company-info-top align-center" :class="{'elevation-5': item.active}" @click.stop="jumpToEnterpriseDetail(item.enterprise.id, false)" @mouseenter="item.active = true" @mouseleave="item.active = false">
           <div class="float-left">
-            <v-img :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" alt="" width="77" height="77" style="border-radius: 4px;"/>
+            <v-img class="entLogoImg" :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" alt="" width="77" height="77" />
           </div>
           <div class="company-info cursor-pointer">
             <h3 v-ellipse-tooltip class="MiSans-Semibold">{{ formatName(item.enterprise.anotherName || item.enterprise.name) }}</h3>

src/components/Enterprise/info.vue

@@ -2,7 +2,7 @@
   <div class="info-box">
     <h4 class="mb-3">{{ $t('enterprise.companyInfo') }}</h4>
     <div style="height: 50px; line-height: 50px;">
-      <v-img class="float-left" :src="props.info.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" rounded contain :width="45" height="45"></v-img>
+      <v-img class="float-left entLogoImg" :src="props.info.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" rounded contain :width="45" height="45"></v-img>
       <div class="ml-3 float-left">
         <p class="enterprise-name cursor-pointer" v-ellipse-tooltip @click.stop="jumpToEnterpriseDetail(props.info.enterprise.id, true)">{{ formatName(props.info.enterprise.anotherName || props.info.enterprise.name) }}</p>
       </div>

src/components/Position/item.vue

@@ -49,8 +49,8 @@
         <div class="sub-li-bottom">
           <div class="user-info">
             <div class="d-flex align-center">
-              <v-avatar size="35">
-                <v-img :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" />
+              <v-avatar tile size="35">
+                <v-img class="entLogoImg" :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" />
               </v-avatar>
               <span v-ellipse-tooltip class="names ml-2 font-size-14 ellipsis" style="max-width: 88%;">
                 {{ formatName(item.anotherName || item.enterpriseName) }}
@@ -114,7 +114,7 @@ const handlePosition = (item) => {
   min-width: calc((100% - 24px) / 3);
   max-width: calc((100% - 24px) / 3);
   margin: 0 12px 12px 0;
-  border-radius: 12px;
+  // border-radius: 12px;
   padding: 0;
   overflow: hidden;
   cursor: pointer;

src/components/Position/longCompany.vue

@@ -4,7 +4,7 @@
       <div class="company-info-top">
         <div class="company-info">
           <div class="float-left mr-5">
-            <v-img :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.anotherName" :width="40" style="height: 40px;border-radius: 4px;"/>
+            <v-img class="entLogoImg" :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.anotherName" :width="40" style="height: 40px;"/>
           </div>
           <h3 :class="{'default-active': item.active }" class="cursor-pointer" @click.stop="jumpToEnterpriseDetail(item.id, true)">
             {{ formatName(item.anotherName || item.name) }}

src/components/Position/longStrip.vue

@@ -36,7 +36,7 @@
         </div>
         <div class="company-info ml-3" style="flex: 1;">
           <div style="height: 50px; width: 50px;">
-            <v-img width="50" height="50" :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/7.png'" rounded contain></v-img>
+            <v-img class="entLogoImg" width="50" height="50" :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" ></v-img>
           </div>
           <div class="ml-3">
             <div class="cursor-pointer info-name" v-ellipse-tooltip @click.stop="jumpToEnterpriseDetail(val.enterprise.id)">{{ formatName(val.enterprise.anotherName || val.enterprise.name) }}</div>

src/components/Position/similarPositions.vue

@@ -6,7 +6,7 @@
       <span v-if="!item.payFrom && !item.payTo" class="recruit-salary">面议</span>
       <span v-else class="recruit-salary">{{ item.payFrom ? item.payFrom + '-' : '' }}{{ item.payTo }}{{ item.payName ? '/' + item.payName :'' }}</span>
       <div :class="['enterprise', {'border-bottom-dashed': index !== list.length - 1}]">
-        <v-img class="float-left" :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :width="30" :height="30"></v-img>
+        <v-img class="float-left entLogoImg" :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :width="30" :height="30"></v-img>
         <span class="float-left enterprise-name" v-ellipse-tooltip>{{ formatName(item.anotherName || item.enterpriseName) }}</span>
         <span class="float-right enterprise-address">{{ !item.areaId ? '全国' : item.area?.str }}</span>
       </div>

src/components/PositionLongStrip/item.vue

@@ -44,7 +44,7 @@
         class="company rounded-lg pa-4 cursor-pointer mr-3" :class="item.companyActive ? 'elevation-5' : ''"
         @click.stop="jumpToEnterpriseDetail(item.enterprise.id, true)" @mouseenter="item.companyActive = true" @mouseleave="item.companyActive = false">
         <div class="float-left">
-          <v-img :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.enterprise.anotherName" :width="40" style="height: 40px;border-radius: 4px;"/>
+          <v-img class="entLogoImg" :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.enterprise.anotherName" :width="40" style="height: 40px;border-radius: 4px;"/>
         </div>
         <div class="company-info">
           <v-hover>

src/styles/index.scss

@@ -261,6 +261,11 @@
   position: relative;
 }
 
+.entLogoImg {
+  border-radius: 4px;
+  border: 1px solid #E1E4E9;
+}
+
 .home-title-line {
   width: 223px;
   // background: linear-gradient(to right, #12ebb0, #427daa);

src/views/mall1/exchange.vue

@@ -3,7 +3,7 @@
   <div class="listBox">
     <div v-for="(item, index) in dataList" :key="'exchange' + index">
       <div class="cursor-pointer mx-5 mb-4" style="width: 180px;" @click="handleShowDetail(item)">
-        <v-img width="180" height="180" :src="item.url || 'https://minio.citupro.com/dev/menduner/7.png'"></v-img>
+        <v-img width="180" height="180" :src="item.url"></v-img>
         <div class="ellipsis mt-2" style="font-size: 14px;">{{ item.name }}</div>
         <div class="ellipsis mt-1" style="font-size: 13px;">消耗积分<span class="ml-1" style="color: var(--v-primary-base)">{{ item.point }}</span></div>
       </div>

src/views/recruit/components/jobFairEntShare/index.vue

@@ -72,10 +72,27 @@ const drawCanvas = () => {
         const x = (canvas.width - secondImgWidth) / 2
         const y = canvas.height - secondImgHeight - 460
         
+        // 设置边框样式
+        ctx.strokeStyle = '#E1E4E9'
+        ctx.lineWidth = 1
+
+        // 绘制圆角矩形路径
         ctx.beginPath()
-        ctx.arc(x + secondImgWidth / 2, y + secondImgHeight / 2, secondImgWidth / 2, 0, Math.PI * 2, true)
+        const logoRadius = 4
+        ctx.moveTo(x + logoRadius, y)
+        ctx.lineTo(x + secondImgWidth - logoRadius, y)
+        ctx.quadraticCurveTo(x + secondImgWidth, y, x + secondImgWidth, y + logoRadius)
+        ctx.lineTo(x + secondImgWidth, y + secondImgHeight - logoRadius)
+        ctx.quadraticCurveTo(x + secondImgWidth, y + secondImgHeight, x + secondImgWidth - logoRadius, y + secondImgHeight)
+        ctx.lineTo(x + logoRadius, y + secondImgHeight)
+        ctx.quadraticCurveTo(x, y + secondImgHeight, x, y + secondImgHeight - logoRadius)
+        ctx.lineTo(x, y + logoRadius)
+        ctx.quadraticCurveTo(x, y, x + logoRadius, y)
+        ctx.closePath()
         ctx.clip()
         ctx.drawImage(thirdImg, x, y, secondImgWidth, secondImgHeight)
+        // 绘制边框
+        ctx.stroke()
         ctx.restore()
 
         // 企业名称

src/views/recruit/personal/PersonalCenter/jobFeedback/components/interview/item.vue

@@ -34,7 +34,7 @@
           </div>
           <div class="job-other d-flex align-center">
             <div style="width: 30px;height: 30px;">
-              <v-img width="30" height="30" rounded contain :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></v-img>
+              <v-img class="entLogoImg" width="30" height="30" rounded contain :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></v-img>
             </div>
             <div class="ellipsis" style="max-width: 400px;">
               <span class="mx-2 enterprise-name" @click.stop="jumpToEnterpriseDetail(val.enterprise.id, true)">{{ formatName(val.enterprise.anotherName || val.enterprise.name) }}</span>

src/views/recruit/personal/PersonalCenter/jobFeedback/components/seenMe.vue

@@ -12,7 +12,7 @@
           <div class="position-and-company">
             <div class="position">
               <div class="float-left">
-                <v-img :src="getUserAvatar(item?.contact.avatar, item?.contact.sex)" :width="40" style="height: 40px;border-radius: 4px;"/>
+                <v-img :src="getUserAvatar(item?.contact.avatar, item?.contact.sex)" :width="40" style="height: 40px;border-radius: 50%;"/>
               </div>
               <div class="company-info">
                 <h3 v-ellipse-tooltip class="title1">{{ item.contact.name }}</h3>
@@ -21,7 +21,7 @@
             </div>
             <div class="company" @click.stop="jumpToEnterpriseDetail(item.enterprise.id, false)">
               <div class="float-left">
-                <v-img :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.enterprise.anotherName" :width="40" style="height: 40px;border-radius: 4px;"/>
+                <v-img class="entLogoImg" :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.enterprise.anotherName" :width="40" style="height: 40px;"/>
               </div>
               <div class="company-info">
                 <h3 v-ellipse-tooltip :class="{'default-active': item.active }" class="title1 cursor-pointer" style="max-width: 455px;">{{ formatName(item.enterprise.anotherName || item.enterprise.name) }}</h3>

src/views/recruit/personal/PersonalCenter/student/intershipCompany/item.vue

@@ -22,7 +22,7 @@
         </div>
         <div class="company-info ml-3" style="flex: 1;">
           <div style="height: 50px; width: 50px;">
-            <v-img width="50" height="50" :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/7.png'" rounded contain></v-img>
+            <v-img class="entLogoImg" width="50" height="50" :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" contain></v-img>
           </div>
           <div class="ml-3">
             <div class="cursor-pointer info-name" v-ellipse-tooltip @click.stop="jumpToEnterpriseDetail(val.enterprise.id)">{{ formatName(val.enterprise.anotherName || val.enterprise.name) }}</div>

src/views/recruit/personal/company/components/companyItem.vue

@@ -5,7 +5,7 @@
         class="company-info-top ma-3 rounded-lg px-3 cursor-pointer" :class="item.active ? 'elevation-5' : ''"
         @click.stop="jumpToEnterpriseDetail(item.enterprise.id, true)" @mouseenter="item.active = true" @mouseleave="item.active = false">
         <div class="float-left">
-          <v-img :src="item.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" contain rounded :alt="item.enterprise.anotherName" :width="50" :height="50" />
+          <v-img class="entLogoImg" :src="item.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" contain rounded :alt="item.enterprise.anotherName" :width="50" :height="50" />
         </div>
         <div class="company-info">
           <h3 v-ellipse-tooltip :class="{'default-active': item.active }">{{ formatName(item.enterprise.anotherName || item.enterprise.name) }}</h3>

src/views/recruit/personal/companyDetail/index.vue

@@ -4,7 +4,7 @@
       <div class="sticky">
         <div class="banner-title pt-3" v-if="Object.keys(info).length">
           <div class="float-left d-flex align-center">
-            <v-img width="60" height="60" :src="info.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" contain rounded></v-img>
+            <v-img class="entLogoImg" width="60" height="60" :src="info.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" contain rounded></v-img>
             <div class="ml-4">
               <div class="contact-name">{{ formatName(info.enterprise.anotherName || info.enterprise.name) }}</div>
               <div class="contact-info">

src/views/recruit/personal/jobFair/details/components/entCard1.vue

@@ -3,7 +3,7 @@
 		<v-hover v-slot="{ isHovering, props }" v-for="val in list" :key="val.id">
 			<v-card v-bind="props" :elevation="isHovering ? 10 : 5" class="cursor-pointer" @click="handleClickEnterprise(val.id)">
 				<div class="d-flex pa-4 pb-2">
-					<img :src="val.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" style="width: 100px; height: 100px; border-radius: 4px;border: 1px solid #ccc;" />
+					<img class="entLogoImg" :src="val.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" style="width: 100px; height: 100px;" />
 					<div style="max-width: 445px;">
 						<h3 v-ellipse-tooltip class="enterprise-name ml-3 font-weight-medium">{{ formatName(val.anotherName || val.name) }}</h3>
 						<p class="font-size-15 color-999 mt-1 mb-2 ml-3" style="height: 30px;">

src/views/recruit/personal/jobFair/details/components/jobCard1.vue

@@ -26,8 +26,8 @@
 				</div>
 				<v-divider class="mt-3" />
 				<!-- 企业信息 -->
-				<div class="d-flex align-center pt-4" @click="handleClickEnterprise(val.enterprise.id)">
-					<img :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" style="width: 60px; height: 60px; border-radius: 4px;border: 1px solid #ccc;" />
+				<div class="d-flex align-center pt-4" @click="handleClickEnterprise(val.enterprise.id)" style="cursor: text;">
+					<img class="entLogoImg" :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" style="width: 60px; height: 60px;" />
 					<div class="ml-3" style="flex: 1;">
 						<h3 v-ellipse-tooltip class="font-weight-medium enterprise-name" style="max-width: 480px;">{{ formatName(val.enterprise.anotherName || val.enterprise.name) }}</h3>
 						<p class="font-size-15 color-999 mt-1">
@@ -68,7 +68,7 @@ const handleClick = (id) => {
 
 const handleClickEnterprise = (id) => {
 	if (props.isMobile) return Snackbar.warning('请复制链接后在电脑端查看企业招聘职位')
-	window.open(`/recruit/personal/jobFair/entPosition/${props.jobFairId}?enterpriseId=${id}`)
+	// window.open(`/recruit/personal/jobFair/entPosition/${props.jobFairId}?enterpriseId=${id}`)
 }
 </script>
 
@@ -91,9 +91,9 @@ const handleClickEnterprise = (id) => {
 }
 .enterprise-name {
 	color: #0E100F;
-	&:hover {
-	color: var(--v-primary-base)
-}
+	// &:hover {
+	// 	color: var(--v-primary-base)
+	// }
 }
 .loading {
   margin-top: 8px;

src/views/recruit/personal/position/components/poster.vue

@@ -25,7 +25,7 @@
         </div>
         <!-- 企业信息 -->
         <div class="radius pa-3 mx-5 mt-5 d-flex align-center" style="background-color: #5baea6;">
-          <v-avatar style="border: 2px solid #fff;" size="68">
+          <v-avatar class="entLogoImg" tile size="68">
             <img crossOrigin="anonymous" :src="info.enterprise.logoUrl" alt="" style="width: 68px; height: 68px;">
           </v-avatar>
           <div class="enterprise-name ml-5">{{ formatName(info.enterprise?.anotherName || info.enterprise?.name) }}</div>

src/views/recruit/personal/position/components/rightRecommend.vue

@@ -7,7 +7,7 @@
         <span v-if="!item.payFrom && !item.payTo" class="recruit-salary">面议</span>
         <span v-else class="recruit-salary">{{ item.payFrom ? item.payFrom + '-' : '' }}{{ item.payTo }}{{ item.payName ? '/' + item.payName : '' }}</span>
         <div :class="['enterprise', {'border-bottom-dashed': index !== items.length - 1}]" @click="handleEnterprise(item)">
-          <v-img class="float-left" :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :width="30" :height="30"></v-img>
+          <v-img class="float-left entLogoImg" :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :width="30" :height="30"></v-img>
           <span class="float-left enterprise-name">{{ formatName(item.anotherName) }}</span>
           <span class="float-right enterprise-address">{{ item.areaName }}</span>
         </div>

src/views/recruit/personal/recommend/components/positionList.vue

@@ -36,8 +36,8 @@
         <div class="sub-li-bottom">
           <div class="user-info">
             <div class="d-flex align-center">
-              <v-avatar size="35">
-                <v-img :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" />
+              <v-avatar tile size="35">
+                <v-img class="entLogoImg" :src="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" />
               </v-avatar>
               <span v-ellipse-tooltip class="names ml-2 font-size-14 ellipsis" style="max-width: 88%;">
                 {{ formatName(item.anotherName || item.name) }}

src/views/recruit/teacher/internshipCompany/index.vue

@@ -14,7 +14,7 @@
     >
       <template #enterpriseName="{ item }">
         <div class="d-flex align-center">
-          <v-avatar size="40" :image="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></v-avatar>
+          <v-avatar class="entLogoImg" tile size="40" :image="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></v-avatar>
           <span class="ml-3 color-primary cursor-pointer" @click="handleDetail(item.id)">{{ formatName(item.anotherName || item.name) }}</span>
         </div>
       </template>

src/views/recruit/teacher/internshipSituation/index.vue

@@ -28,7 +28,7 @@
     >
 			<template #enterpriseName="{ item }">
 				<div class="d-flex align-center">
-					<v-avatar size="40" :image="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></v-avatar>
+					<v-avatar class="entLogoImg" tile size="40" :image="item.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></v-avatar>
 					<span class="ml-3 color-primary cursor-pointer" @click="handleEnterprise(item.id)">{{ formatName(item.anotherName || item.name) }}</span>
 				</div>
 			</template>

src/views/recruit/teacher/studentList/studentDetails.vue

@@ -26,7 +26,7 @@
       >
         <template #enterpriseName="{ item }">
           <div class="d-flex align-center defaultLink" @click="handleEnterprise(item.enterpriseId)">
-            <v-avatar size="40" :image="item.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></v-avatar>
+            <v-avatar class="entLogoImg" tile size="40" :image="item.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></v-avatar>
             <span class="ml-3">{{ formatName(item.enterprise.anotherName || item.enterprise.name) }}</span>
           </div>
         </template>