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

src/components/Enterprise/hotPromoted.vue

@@ -3,7 +3,7 @@
     <div class="sub-li" v-for="(item, index) in list" :key="index">
       <div v-if="item">
         <!-- 公司信息 -->
-        <div class="company-info-top align-center" @click.stop="jumpToEnterpriseDetail(item.enterprise.id, true)">
+        <div class="company-info-top align-center" @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="" width="77" height="77" style="border-radius: 4px;"/>
           </div>

src/components/Position/longCompany.vue

@@ -6,7 +6,9 @@
           <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;"/>
           </div>
-          <h3 :class="{'default-active': item.active }" class="cursor-pointer" @click.stop="jumpToEnterpriseDetail(item.id, true)">{{ formatName(item.anotherName || item.name) }}</h3>
+          <h3 :class="{'default-active': item.active }" class="cursor-pointer" @click.stop="jumpToEnterpriseDetail(item.id, true)">
+            {{ formatName(item.anotherName || item.name) }}
+          </h3>
           <p>{{ item.industryName }}<span v-if="item.industryName && item.scaleName" class="mx-2">|</span>{{ item.scaleName }}</p>
         </div>
         <div v-if="item.active">
@@ -71,9 +73,7 @@ const handleCancel = async (item) => {
   }
 }
 .company-info {
-  float: left;
-  margin-left: 16px;
-  width: 282px;
+  width: 100%;
 }
 .company-info-top {
   display: flex;

src/layout/personal/navBar.vue

@@ -25,7 +25,12 @@
                 <defineListPage v-bind="$attrs" :title="val.title" :list="val.children" @emitClick="handleClick" :closeOnContentClick="true"></defineListPage>
               </template>
               <template v-else>
-                <span class="cursor-pointer menuList-first-title" :class="{'active-route' : route.path === val.path || route.path.includes(val.path)}" @click="handleClick(val, true)">{{ val.title }}</span>
+                <span 
+                  class="cursor-pointer menuList-first-title"
+                  :class="{'active-route' : route.path === val.path || route.path.includes(val.path)}" 
+                  @click.stop="handleClick(val, true)">
+                  {{ val.title }}
+                </span>
               </template>
             </div>
           </div>
@@ -169,7 +174,7 @@ const paths = [ // 有选中样式-路由列表
 ]
 
 const navList = ref([
-  { title: '门墩儿招聘', path: '/recruit/personal/recommend' },
+  { title: '门墩儿招聘', path: '/recruit/personal' },
   { title: '门墩儿猎头', path: '/headhunting' },
   // { title: '门墩儿商城', path: '/pointsExchange' },
   { title: '门墩儿商城', path: '/pointsExchange', isEdit: true },

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

@@ -110,7 +110,6 @@ const goBuy = () => {
 .company {
   flex: 1;
   display: flex;
-  justify-content: end;
 }
 .company-info {
   float: left;

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

@@ -1,13 +1,11 @@
 <template>
   <div class="default-width banner px-6">
     <div v-if="Object.keys(info).length">
-      <div class="banner-title" v-if="Object.keys(info).length">
+      <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'"></v-img>
           <div class="ml-4">
-            <div class="contact-name">
-              {{ formatName(info.enterprise.anotherName || info.enterprise.name) }}
-            </div>
+            <div class="contact-name">{{ formatName(info.enterprise.anotherName || info.enterprise.name) }}</div>
             <div class="contact-info">
               {{ info.scaleName }}
               <span v-if="info.industryName && info.scaleName">·</span> 
@@ -16,24 +14,22 @@
           </div>
         </div>
         <div class="float-right d-flex">
-          <div class="tools-box text-center" v-if="info.jobAdvertisedCount">
-            <div class="tools-box-number">{{ info.jobAdvertisedCount }}</div>
-            <div class="tools-box-text">职位在招</div>
-          </div>
-          <!-- 是否关注该企业 -->
-          <v-tooltip location="bottom">
-            <template v-slot:activator="{ props }">
-              <v-icon v-bind="props" class="ml-5 mr-2" size="25" :color="isCollection ? 'error' : ''" @click.stop="handleFollow">{{ isCollection ? 'mdi-heart' : 'mdi-heart-outline' }}</v-icon>
-            </template>
-            <span>关注该企业</span>
-          </v-tooltip>
+          <v-btn color="primary" variant="text" size="large" @click.stop="handleReturn" prepend-icon="mdi-chevron-triple-left">返回上一页</v-btn>
         </div>
       </div>
+      <div class="text-end mb-3">
+        <v-tooltip location="bottom">
+          <template v-slot:activator="{ props }">
+            <v-icon v-bind="props" class="ml-5 mr-2" size="25" :color="isCollection ? 'error' : ''" @click.stop="handleFollow">{{ isCollection ? 'mdi-heart' : 'mdi-heart-outline' }}</v-icon>
+          </template>
+          <span>关注该企业</span>
+        </v-tooltip>
+      </div>
       <v-divider></v-divider>
       <div class="mt-3">
         <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#f3f3f3" @update:model-value="handleTabClick">
           <v-tab :value="1">公司简介</v-tab>
-          <v-tab :value="2">在招职位{{ info.jobAdvertisedCount ? `(${info.jobAdvertisedCount})` : '' }}</v-tab>
+          <v-tab :value="2">在招职位</v-tab>
         </v-tabs>
         <div class="d-flex" v-if="Object.keys(info).length">
           <div class="content-left">
@@ -94,6 +90,11 @@ const handleTabClick = () => {
   router.push(`${route.path}?key=${tab.value === 1 ? 'briefIntroduction' : 'recruitmentPositions'}`)
 }
 
+// 返回上一页
+const handleReturn = () => {
+  router.history?.length ? router.go(-1) : router.push('/recruitHome')
+}
+
 // 企业埋点
 const handleEnterpriseClick = async () => {
   if (id) return

src/views/recruit/personal/home/components/hotPromotedPositions.vue

@@ -13,15 +13,15 @@
     </v-tabs>
     <v-window v-model="tab" class="mt-5">
       <v-window-item :value="1">
-        <PositionCard v-if="items.filter(Boolean) && items.length" :isOpenWindow="true" :items="items" :tab="tab" @position="handlePosition"></PositionCard>
+        <PositionCard v-if="items.filter(Boolean) && items.length" :isOpenWindow="false" :items="items" :tab="tab" @position="handlePosition"></PositionCard>
         <Empty v-else class="mb-3" :elevation="false"></Empty>
       </v-window-item>
       <v-window-item :value="2">
-        <PositionCard v-if="items.filter(Boolean) && items.length" :isOpenWindow="true" :items="items" :tab="tab" @position="handlePosition"></PositionCard>
+        <PositionCard v-if="items.filter(Boolean) && items.length" :isOpenWindow="false" :items="items" :tab="tab" @position="handlePosition"></PositionCard>
         <Empty v-else class="mb-3" :elevation="false"></Empty>
       </v-window-item>
       <v-window-item :value="3">
-        <PositionCard v-if="items.filter(Boolean) && items.length" :isOpenWindow="true" :items="items" :tab="tab" @position="handlePosition"></PositionCard>
+        <PositionCard v-if="items.filter(Boolean) && items.length" :isOpenWindow="false" :items="items" :tab="tab" @position="handlePosition"></PositionCard>
         <Empty v-else class="mb-3" :elevation="false"></Empty>
       </v-window-item>
     </v-window>

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

@@ -1,11 +1,12 @@
 <template>
   <div style="position: relative;">
     <div class="banner px-6" id="share" :class="{'default-width': defaultWidth}">
-      <div class="banner-title d-flex justify-space-between">
-        <div class="d-flex align-center">
+      <div class="banner-title d-flex justify-space-between align-center">
+        <div class="d-flex align-center justify-between">
           <h1>{{ formatName(info.name) }}</h1>
-          <svg-icon v-if="info.hire" class="ml-5" name="pin" size="50"></svg-icon>
+          <svg-icon class="ml-5" name="pin" size="50"></svg-icon>
         </div>
+        <v-btn color="primary" variant="text" size="large" @click.stop="handleReturn" prepend-icon="mdi-chevron-triple-left">返回上一页</v-btn>
       </div>
       <div class="text-end">
         <span v-if="!info.payFrom && !info.payTo" class="salary font-size-20">面议</span>
@@ -259,6 +260,11 @@ const loginClose = () => {
   Snackbar.warning(loginCloseWarningWord)
 }
 
+// 返回上一页
+const handleReturn = () => {
+  router.history?.length ? router.go(-1) : router.push('/recruitHome')
+}
+
 // 富文本内容处理，去除多余的换行空格等
 const cleanedHtml = (text) => {
   let cleaned = text.replace(/\n/g, '</br>')