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

components.d.ts

@@ -32,7 +32,6 @@ declare module 'vue' {
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
     ElBacktop: typeof import('element-plus/es')['ElBacktop']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElSegmented: typeof import('element-plus/es')['ElSegmented']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
@@ -47,7 +46,7 @@ declare module 'vue' {
     IndustryTypeCard: typeof import('./src/components/industryTypeCard/index.vue')['default']
     Info: typeof import('./src/components/Enterprise/info.vue')['default']
     InitPay: typeof import('./src/components/personalRecharge/initPay.vue')['default']
-    Item: typeof import('./src/components/Position/item.vue')['default']
+    Item: typeof import('./src/components/PositionLongStrip/item.vue')['default']
     JobTypeCard: typeof import('./src/components/jobTypeCard/index.vue')['default']
     Knowledge: typeof import('./src/components/Knowledge/index.vue')['default']
     ListGroup: typeof import('./src/components/FormUI/nestedListGroup/components/listGroup.vue')['default']

src/store/user.js

@@ -53,7 +53,7 @@ export const useUserStore = defineStore('user',
             localStorage.setItem('expiresTime', res.expiresTime) // token过期时间
             updateEventList(true) // 获取规则配置跟踪列表
             await this.getUserInfos()
-            await this.getUserBaseInfos()
+            await this.getUserBaseInfos(null, { register: true })
             resolve()
           }).catch(err => { reject(err) })
         })
@@ -70,7 +70,7 @@ export const useUserStore = defineStore('user',
             localStorage.setItem('expiresTime', res.expiresTime) // token过期时间
             updateEventList(true) // 获取规则配置跟踪列表
             await this.getUserInfos()
-            await this.getUserBaseInfos('', { chooseRole: data.chooseRole })
+            await this.getUserBaseInfos('', { chooseRole: data.chooseRole, login: true })
             if (data?.schoolRegister) await this.getSchoolInfo(true)
             resolve(res)
           }).catch(err => { reject(err) })
@@ -105,7 +105,7 @@ export const useUserStore = defineStore('user',
               localStorage.setItem('expiresTime', res.expiresTime) // token过期时间
               updateEventList(true) // 获取规则配置跟踪列表
               await this.getUserInfos()
-              await this.getUserBaseInfos()
+              await this.getUserBaseInfos(null, { login: true })
             }
             resolve()
           }).catch(err => {
@@ -133,12 +133,12 @@ export const useUserStore = defineStore('user',
           localStorage.setItem('baseInfo', JSON.stringify(this.baseInfo))
           localStorage.setItem('necessaryInfoReady', !option?.chooseRole || checkPersonBaseInfo(this.baseInfo) ? 'ready' : 'fddeaddc47868b')
 
-          if (option?.chooseRole && import.meta.env.VITE_NODE_ENV !== 'production') {
-          //   // 刚注册时让用户选择学生用户还是求职者用户，角色不同填写的基本信息不同。
+          if (option?.chooseRole) {
+            // 刚注册时让用户选择学生用户还是求职者用户，角色不同填写的基本信息不同。
             localStorage.setItem('chooseRole', 'showChooseRole')
           }
           // 当前角色若为学生则获取学生信息
-          if (data?.type && Number(data.type) === 1) this.getStudentInformation()
+          if (data?.type && Number(data.type) === 1) this.getStudentInformation(Boolean(option?.login || option?.register))
         } catch (error) {
           Snackbar.error(error)
         }
@@ -276,11 +276,11 @@ export const useUserStore = defineStore('user',
       },
 
       // 获取学生信息
-      async getStudentInformation () {
+      async getStudentInformation (toStudentCenter = false) {
         const data = await getStudentInfo()
         this.studentInfo = data
         localStorage.setItem('studentInfo', data ? JSON.stringify(data) : '{}')
-        router.push('/recruit/personal/personalCenter/student/information')
+        if (toStudentCenter) router.push('/recruit/personal/personalCenter/student/information')
       },
 
       // 获取学校基本信息

src/version.js

@@ -1,2 +1,2 @@
 // 版本号
-export const vue_version = 'v25.04.14.1759'
+export const vue_version = 'v25.05.06.0939'

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

@@ -577,7 +577,7 @@ const enRequestPositionInfo = ref({}) // 企业求简历时选中的职位信息
 let handleSendResumeItem = null
 async function handleSendResume (item) {
   const jobId = enRequestPositionInfo.value && enRequestPositionInfo.value?.id ? enRequestPositionInfo.value?.id : positionInfo.value.id
-  if (!jobId && !selectJobId.value && import.meta.env.VITE_NODE_ENV !== 'production') {
+  if (!jobId && !selectJobId.value) {
     // 没有基于职位接收到的沟通，弹出职位列表让求职者选择。否则无法投递简历。
     handleSendResumeItem = item
     await getRecruitPositionList()