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

src/layout/personal/navBar.vue

@@ -265,6 +265,7 @@ let userAccount = ref(JSON.parse(localStorage.getItem('userAccount')) || {}) //
 
 userStore.$subscribe((mutation, state) => {
   if (Object.keys(state.baseInfo).length) baseInfo.value = state.baseInfo
+  if (Object.keys(state.userInfo).length) userInfo.value = state.userInfo
   if (Object.keys(state.userAccount).length) userAccount.value = state.userAccount
 })
 

src/views/login/index.vue

@@ -94,6 +94,7 @@ const handleLogin = async () => {
     await userStore[api](params)
     // 跳转
     if (params.isEnterprise) return // 企业邮箱登录
+    else localStorage.setItem('simpleCompleteDialogHaveBeenShow', true) // 个人登录简易基本信息填写弹窗open-status
     Snackbar.success(t('login.loginSuccess'))
     router.push({ path: '/recruitHome' })
 

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

@@ -6,7 +6,6 @@
     </div>
     <hotJobs></hotJobs>
     <div class="default-width">
-      <!-- <jobTypeCard class="mb-5" page @handleJobClick="handleJobClick" isSingle></jobTypeCard> -->
       <homeJobTypeCard></homeJobTypeCard>
       <advertisementPage class="my-3"></advertisementPage>
       <hotPromotedPositions></hotPromotedPositions>
@@ -14,7 +13,7 @@
     </div>
   </div>
   <!-- 快速填写简易人才信息-弹窗 -->
-  <simplePage v-if="showSimplePage" :closeable="true" closeText="暂时跳过" @simpleInfoReady="handleUpdateInfo"></simplePage>
+  <simplePage v-if="showSimplePage" :closeable="true" closeText="暂时跳过" @close="handleInfoClose" @simpleInfoReady="handleUpdateInfo"></simplePage>
 </template>
 
 <script setup>
@@ -23,7 +22,6 @@ import simplePage from '@/views/recruit/personal/shareJob/sendResume/simple.vue'
 import headCarousel from './components/headCarousel.vue'
 import headSearch from '@/components/headSearch'
 import hotJobs from './components/hotJobs.vue'
-// import jobTypeCard from '@/components/jobTypeCard'
 import homeJobTypeCard from './components/homeJobTypeCard'
 import hotPromotedPositions from './components/hotPromotedPositions.vue'
 import PopularEnterprises from './components/popularEnterprises.vue'
@@ -34,25 +32,28 @@ import { useUserStore } from '@/store/user'
 import { getToken } from '@/utils/auth'
 
 const store = useUserStore()
-// const updateBaseInfo = async () => {
-//   await store.getUserBaseInfos()
-// }
-// updateBaseInfo()
 
 const router = useRouter()
-const simple = localStorage.getItem('simpleCompleteDialogHaveBeenShow')
+const simple = ref(localStorage.getItem('simpleCompleteDialogHaveBeenShow'))
 const showSimplePage = ref(false) // 只提示一次
-if (!getToken() && !simple) showSimplePage.value = true
+if (!getToken()) showSimplePage.value = false
 nextTick(() => {
-  if (getToken()) localStorage.setItem('simpleCompleteDialogHaveBeenShow', true)
+  if (getToken()) {
+    showSimplePage.value = simple.value && JSON.parse(simple.value) ? true : false
+  }
 })
 
 const handleSearch = (val) => {
   if (val) router.push(`/recruit/personal/position?content=${val}`)
 }
 
+const handleInfoClose = () => {
+  localStorage.setItem('simpleCompleteDialogHaveBeenShow', false)
+}
+
 // 更新用户基本信息
 const handleUpdateInfo = async () => {
+  handleInfoClose()
   await store.getUserBaseInfos(null)
 }
 </script>

src/views/recruit/personal/shareJob/sendResume/simple.vue

@@ -7,7 +7,7 @@
     titleClass="text-h6"
     title="补充基本信息"
     :closeable="props.closeable"
-    @close="openDialog = props.closeable ? false : true"
+    @close="handleClose"
     @submit="simpleInfoSubmit"
   >
     <simpleInfoForm ref="formRef"></simpleInfoForm>
@@ -25,7 +25,7 @@ import { useRouter } from 'vue-router'
 import { ref } from 'vue'
 defineOptions({name: 'shareJob-sendResume-simple'})
 
-const emit = defineEmits(['simpleInfoReady'])
+const emit = defineEmits(['simpleInfoReady', 'close'])
 const props = defineProps({
   closeable: {
     type: Boolean,
@@ -42,6 +42,11 @@ const info = ref(null)
 const store = useUserStore()
 const router = useRouter()
 
+const handleClose = () => {
+  emit('close')
+  openDialog.value = props.closeable ? false : true
+}
+
 // 查询用户基本信息
 const timer = ref(null)
 
@@ -60,7 +65,6 @@ const getUserInfoVerify = () => {
     } else {
       openDialog.value = true // 不存在
       Snackbar.warning('请先完善个人基本信息')
-      localStorage.setItem('simpleCompleteDialogHaveBeenShow', true)
     }
   }
   info.value = JSON.parse(localStorage.getItem('baseInfo'))