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

src/plugins/dialogExtend/components/necessaryInfoDialog.vue

@@ -25,8 +25,8 @@ import studentInfoForm from './studentInfoForm.vue'
 import { savePersonSimpleInfo, saveStudentSimpleInfo } from '@/api/recruit/personal/shareJob'
 import CtDialog from '@/components/CtDialog'
 import { useUserStore } from '@/store/user'; const userStore = useUserStore()
-import { useRoute } from 'vue-router'; const route = useRoute()
-import { useRouter } from 'vue-router'; const router = useRouter()
+// import { useRoute } from 'vue-router'; const route = useRoute()
+// import { useRouter } from 'vue-router'; const router = useRouter()
 import Confirm from '@/plugins/confirm'
 import { onMounted, ref } from 'vue'
 import { getToken } from '@/utils/auth'
@@ -89,7 +89,7 @@ const simpleInfoSubmit = async () => {
     dialog.value = false
     overlay.value = false
     props.sure()
-    if (isStudent.value) router.push('/recruit/personal/personalCenter/student/information')
+    if (isStudent.value) window.location.href = '/recruit/personal/personalCenter/student/information'
   } catch (error) {
     console.error('error', error)
   }
@@ -100,8 +100,7 @@ const handleLogout = () => {
   Confirm('系统提示', '是否确定退出当前登录账号？').then(async () => {
     await userStore.userLogout(1)
     props.other()
-    if (!route || route.path === '/recruitHome') location.reload()
-    else router.push({ path: '/recruitHome' })
+    window.location.href = '/recruitHome'
   })
 }
 </script>

src/store/user.js

@@ -131,6 +131,7 @@ export const useUserStore = defineStore('user',
           data = data || {}
           this.baseInfo = await this.getFieldText(data)
           localStorage.setItem('baseInfo', JSON.stringify(this.baseInfo))
+          // chooseRole如果是注册进入待选择求职角色，不弹必填信息弹窗
           localStorage.setItem('necessaryInfoReady', !option?.chooseRole || checkPersonBaseInfo(this.baseInfo) ? 'ready' : 'fddeaddc47868b')
 
           if (option?.chooseRole) {