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

src/utils/position.js

@@ -120,10 +120,10 @@ export const jumpToEnterpriseDetail = async (id, isOpenWindow = false, tabKey =
 
   // 不在优选集团中跳转企业详情
   const key = tabKey ? 'recruitmentPositions' : 'briefIntroduction'
+  const url = `/recruit/personal/company/details/${id}?key=${key}`
   if (isOpenWindow) {
-    window.open(`/recruit/personal/company/details/${id}?key=${key}`)
+    window.open(url)
   } else {
-    await router.push(`/recruit/personal/company/details/${id}?key=${key}`)
-    await nextTick()
+    router.push({ path: url})
   }
 }

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

@@ -92,7 +92,9 @@ const handleTabClick = () => {
 
 // 返回上一页
 const handleReturn = () => {
-  router.history?.length ? router.go(-1) : router.push('/recruitHome')
+  if (window.history.state.back) {
+    router.back()
+  } else router.push('/recruitHome')
 }
 
 // 企业埋点

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

@@ -13,11 +13,11 @@
     </v-tabs>
     <v-window v-model="tab" class="mt-5">
       <v-window-item v-for="v in 3" :value="v" :key="v">
-        <PositionCard v-if="items.filter(Boolean) && items.length" :isOpenWindow="false" :items="items" :tab="tab" @position="handlePosition" @enterprise="handleEnterprise"></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="1">
-        <PositionCard v-if="items.filter(Boolean) && items.length" :items="items" :tab="tab" @position="handlePosition" @enterprise="handleEnterprise"></PositionCard>
+        <PositionCard v-if="items.filter(Boolean) && items.length" :items="items" :tab="tab" @position="handlePosition"></PositionCard>
         <Empty v-else class="mb-3" :elevation="false"></Empty>
       </v-window-item>
       <v-window-item :value="2">

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

@@ -4,9 +4,9 @@
       <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 class="ml-5" name="pin" size="50"></svg-icon>
+          <svg-icon v-if="info?.hire" 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>
+        <v-btn v-if="showContentRight" 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>
@@ -266,7 +266,9 @@ const loginClose = () => {
 
 // 返回上一页
 const handleReturn = () => {
-  router.history?.length ? router.go(-1) : router.push('/recruitHome')
+  if (window.history.state.back) {
+    router.back()
+  } else router.push('/recruitHome')
 }
 
 // 富文本内容处理，去除多余的换行空格等