Browse Source

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

lifanagju_citu 7 months ago
parent
commit
ef93cadc73

+ 3 - 2
src/config/axios/service.js

@@ -245,6 +245,7 @@ service.interceptors.response.use(
 const handleAuthorized = () => {
   const { t } = useI18n()
   const user = useUserStore()
+  user.handleClearStorage() // 清除缓存
   if (!isReLogin.show) {
     // 如果已经到重新登录页面则不进行弹窗提示
     if (window.location.href.includes('login?redirect=')) {
@@ -256,7 +257,7 @@ const handleAuthorized = () => {
     }).then(() => {
       // resetRouter() // 重置静态路由表
       // deleteUserCache() // 删除用户缓存
-      user.handleClearStorage()
+      // user.handleClearStorage()
       isReLogin.show = false
       // 干掉token后再走一次路由让它过router.beforeEach的校验
       // location.reload()
@@ -265,7 +266,7 @@ const handleAuthorized = () => {
       isReLogin.show = false
     })
   }
-  return Promise.reject(t('sys.api.timeoutMessage'))
+  // return Promise.reject(t('sys.api.timeoutMessage'))
 }
 
 // 触发获取积分

+ 5 - 5
src/views/headhunting/components/content.vue

@@ -3,9 +3,9 @@
     <!-- 背景图 -->
     <div class="carousel-box">
       <div class="carousel-desc common-width">
-        <h1>我们的服务</h1>
+        <h1>门墩儿猎头</h1>
         <hr class="carousel-desc-line" />
-        <div class="carousel-desc-text">优秀领导者能够带动业绩增长。我们致力于提供企业所需的见解,协助其做出有关人才寻聘、培养及晋升的正确决策,提升高管团队与董事会的绩效。</div>
+        <div class="carousel-desc-text">门墩儿猎头深知卓越的领导力是企业业绩增长的关键。我们专注于为企业提供精准的人才洞见,助力企业在人才招聘、培养和晋升方面做出明智选择,从而优化高管团队的整体表现,推动企业持续发展。</div>
       </div>
     </div>
     <!-- 数值示例 -->
@@ -118,9 +118,9 @@ const router = useRouter()
 
 // 数值示例
 const list = [
-  { title: '70家', desc: '全球分支机构' },
-  { title: '67年', desc: '领导力咨询经验' },
-  { title: '450+位', desc: '经验丰富的顾问' }
+  { title: '1500+', desc: '服务企业' },
+  { title: '236000+', desc: '人才数据库' },
+  { title: '12种', desc: '涉及行业' }
 ]
 // 服务
 const service = [

+ 1 - 1
src/views/recruit/enterprise/hirePosition/components/add.vue

@@ -11,7 +11,7 @@
           <div>
             <h2 class="mt-n1 headline font-weight-regular">{{ val.title }}</h2>
             <div class="mb-4 desc">{{ val.desc }}</div>
-            <component class="mt-10" :is="val.path" :ref="val.ref" :itemData="itemData"></component>
+            <component :is="val.path" :ref="val.ref" :itemData="itemData"></component>
           </div>
         </v-timeline-item>
       </v-timeline>

+ 1 - 1
src/views/recruit/enterprise/hirePosition/components/baseInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="mt-10">
     <CtForm ref="formPageRef" :items="items" style="width: 650px;">
       <template #numericalValue>
         <div class="font-size-14 color-error my-1">

+ 1 - 1
src/views/recruit/enterprise/hirePosition/components/jobRequirements.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%;">
+  <div class="mt-10" style="width: 100%;">
     <CtForm ref="formPageRef" :items="items" style="width: 600px;">
       <template #tagList>
         <div>

+ 5 - 4
src/views/recruit/enterprise/hirePosition/index.vue

@@ -57,11 +57,12 @@ const query = ref({
 })
 const exportLoading = ref(false)
 
-const tab = ref(1)
+const tab = ref(0)
 
 const tabList = [
-  { label: t('position.recruitmentInProgress'), value: 1 },
-  { label: t('position.closed'), value: 2 },
+  { label: '待支付', value: 0, status: 99 },
+  { label: t('position.recruitmentInProgress'), value: 1, status: 0 },
+  { label: t('position.closed'), value: 2, status: 1 },
   { label: t('position.expiredPosition'), value: 3 }
 ]
 
@@ -94,7 +95,7 @@ const handleExport = async () => {
 // 获取职位列表
 const getPositionList = async () => {
   if (tab.value !== 3) {
-    query.value.status = tab.value === 1 ? 0 : (tab.value === 2 ? 1 : null)
+    query.value.status = tabList[tab.value].status
     query.value.hasExpiredData = false
   } else {
     query.value.hasExpiredData = true

+ 1 - 1
src/views/recruit/enterprise/positionManagement/components/add.vue

@@ -11,7 +11,7 @@
           <div>
             <h2 class="mt-n1 headline font-weight-regular">{{ val.title }}</h2>
             <div class="mb-4 desc">{{ val.desc }}</div>
-            <component class="mt-10" :is="val.path" :ref="val.ref" :itemData="itemData"></component>
+            <component :is="val.path" :ref="val.ref" :itemData="itemData"></component>
           </div>
         </v-timeline-item>
       </v-timeline>

+ 3 - 6
src/views/recruit/personal/home/components/advertisement/index.vue

@@ -20,12 +20,9 @@
 defineOptions({ name: 'advertisementPage'})
 
 const list = [
-  { url: 'https://dfws-file.veimg.cn/plutus/img/finish/2021/01/1611813992000.webp' },
-  { url: 'https://admin.61hr.com/admin/uploads/images/ad/202407/e684374c0ff349b4945bc0c7a4a2713f.gif' },
-  { url: 'https://dfws-file.veimg.cn/plutus/img/finish/2021/01/1611813992000.webp' },
-  { url: 'https://dfws-file.veimg.cn/plutus/img/finish/2021/01/1611813992000.webp' },
-  { url: 'https://admin.61hr.com/admin/uploads/images/ad/202407/e684374c0ff349b4945bc0c7a4a2713f.gif' },
-  { url: 'https://dfws-file.veimg.cn/plutus/img/finish/2024/08/1722492376000.webp' }
+  { url: 'https://minio.citupro.com/dev/menduner/preferredGroup/MARRIOTT.jpg' },
+  { url: 'https://minio.citupro.com/dev/menduner/preferredGroup/IHG.jpg' },
+  { url: 'https://minio.citupro.com/dev/menduner/preferredGroup/Yifei.jpg' }
 ]
 
 const handleOpen = () => {

+ 4 - 2
src/views/recruit/personal/home/components/homeJobTypeCard/index.vue

@@ -126,8 +126,10 @@ const handleMouseLeave = () => { // 鼠标移出
 }
 // 轮播图片
 const carouselList = ref([
+  { src: 'https://minio.citupro.com/dev/menduner/preferredGroup/IHG-banner-new.gif' },
   { src: 'https://minio.citupro.com/dev/menduner/home/%E6%82%A6%E6%A6%95.jpg' },
-  { src: 'https://minio.citupro.com/dev/menduner/home/%E6%B4%B2%E9%99%85%E5%81%87%E6%97%A5.jpg' }
+  { src: 'https://minio.citupro.com/dev/menduner/home/%E6%B4%B2%E9%99%85%E5%81%87%E6%97%A5.jpg' },
+  { src: 'https://minio.citupro.com/dev/menduner/preferredGroup/Hong-Kong-Polytechnic-University-banner.jpg' }
 ])
 </script>
 
@@ -151,7 +153,7 @@ const carouselList = ref([
   justify-content: center; // 后面的flex会继承
   .leftCard {
     height: 384px;
-    width: 300px;
+    width: 380px;
     margin: 4px 0;
     overflow-x: hidden;
     overflow-y: auto;