浏览代码

necessaryInfo改为necessaryInfoDialog

lifanagju_citu 5 月之前
父节点
当前提交
19550bf304

+ 2 - 2
src/components/Enterprise/components/positions.vue

@@ -93,7 +93,7 @@ import loginPage from '@/views/common/loginDialog.vue'
 import { getToken } from '@/utils/auth'
 import Snackbar from '@/plugins/snackbar'
 import { checkPersonBaseInfo } from '@/utils/check'
-import necessaryInfo from '@/plugins/necessaryInfo'
+import dialogExtend from '@/plugins/dialogExtend'
 
 const props = defineProps({
   info: {
@@ -262,7 +262,7 @@ const toDetails = async (info) => {
     return
   }
   if (!checkPersonBaseInfo()) { // 强制填写个人信息
-    necessaryInfo('necessaryInfoDialog').then(() => {
+    dialogExtend('necessaryInfoDialog').then(() => {
       toDetails(toDetailsInfo)
     })
     return

+ 2 - 2
src/components/Position/longStrip.vue

@@ -64,7 +64,7 @@ import { prologue, defaultText } from '@/hooks/web/useIM'
 import loginPage from '@/views/common/loginDialog.vue'
 import { getToken } from '@/utils/auth'
 import { checkPersonBaseInfo } from '@/utils/check'
-import necessaryInfo from '@/plugins/necessaryInfo'
+import dialogExtend from '@/plugins/dialogExtend'
 
 const emits = defineEmits(['refresh'])
 const { t } = useI18n()
@@ -115,7 +115,7 @@ const toDetails = async (info) => {
     return
   }
   if (!checkPersonBaseInfo()) { // 强制填写个人信息
-    necessaryInfo('necessaryInfoDialog').then(() => {
+    dialogExtend('necessaryInfoDialog').then(() => {
       toDetails(toDetailsInfo)
     })
     return

+ 14 - 12
src/permission.js

@@ -5,7 +5,7 @@ import { getToken, getIsEnterprise } from '@/utils/auth'
 import { useDictStore } from '@/store/dict'
 import { useUserStore } from '@/store/user'
 import Confirm from '@/plugins/confirm'
-import necessaryInfo from '@/plugins/necessaryInfo'
+import dialogExtend from '@/plugins/dialogExtend'
 
 const { start, done } = useNProgress()
 // loginType:1.enterprise: 企业路由
@@ -27,23 +27,25 @@ router.beforeEach(async (to, from, next) => {
     // 强制修改密码
     if (localStorage.getItem('entUpdatePassword') === 'needChange') fullScreen('entUpdatePassword')
     // 强制填写个人信息
-    else if (localStorage.getItem('necessaryInfoReady') === 'fddeaddc47868b' && tokenIndex === 2) necessaryInfo('necessaryInfoDialog')
+    else if (localStorage.getItem('necessaryInfoReady') === 'fddeaddc47868b' && tokenIndex === 2) dialogExtend('necessaryInfoDialog')
     // 企业登录免费职位广告提示
     // else if (localStorage.getItem('positionAd')) {
     //   localStorage.setItem('positionAd', '')
-    //   necessaryInfo('positionAd')
+    //   dialogExtend('positionAd')
     // }
     // 企业信息完成度提示
     else if (localStorage.getItem('checkEnterpriseBaseInfoFalseHref')) {
-      const href = localStorage.getItem('checkEnterpriseBaseInfoFalseHref')
-      localStorage.setItem('checkEnterpriseBaseInfoFalseHref', '')
-      localStorage.setItem('entUpdatePassword', '')
-      if (to.path !== href) {
-        setTimeout(() => {
-          Confirm('系统提示', '企业信息设置未完善,是否前往完善?').then(() => {
-            window.location.href = href
-          })
-        }, 4000)
+      if (to.path !== '/recruit/enterprise/position/add') { // 除了点击企业登录免费职位广告提示跳转路由不提示
+        const href = localStorage.getItem('checkEnterpriseBaseInfoFalseHref')
+        localStorage.setItem('checkEnterpriseBaseInfoFalseHref', '')
+        localStorage.setItem('entUpdatePassword', '')
+        if (to.path !== href) {
+          setTimeout(() => {
+            Confirm('系统提示', '企业信息设置未完善,是否前往完善?').then(() => {
+              window.location.href = href
+            })
+          }, 4000)
+        }
       }
     }
     if (to.path === '/login') {

+ 1 - 1
src/plugins/necessaryInfo/components/infoForm.vue → src/plugins/dialogExtend/components/infoForm.vue

@@ -29,7 +29,7 @@
 
 <script setup>
 import { getDict } from '@/hooks/web/useDictionaries'
-defineOptions({name: 'necessaryInfo-InfoForm'})
+defineOptions({name: 'dialogExtend-InfoForm'})
 import { reactive, ref } from 'vue'
 import { checkEmail } from '@/utils/validate'
 import { enterpriseSearchByName } from '@/api/recruit/personal/resume'

+ 1 - 1
src/plugins/necessaryInfo/components/necessaryInfoDialog.vue → src/plugins/dialogExtend/components/necessaryInfoDialog.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script setup>
-defineOptions({name: 'necessaryInfo-dialog'})
+defineOptions({name: 'dialogExtend-dialog'})
 import infoForm from './infoForm'
 import { savePersonSimpleInfo } from '@/api/recruit/personal/shareJob'
 import CtDialog from '@/components/CtDialog'

+ 1 - 2
src/plugins/necessaryInfo/components/positionAd.vue → src/plugins/dialogExtend/components/positionAd.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script setup>
-defineOptions({name: 'necessaryInfo-positionAd'})
+defineOptions({name: 'dialogExtend-positionAd'})
 import { onMounted, ref } from 'vue'
 
 const props = defineProps({
@@ -42,7 +42,6 @@ const adClick =  () => {
 }
 
 const handleChange = (val) => {
-  debugger
   props.cancel()
 }
 </script>

+ 0 - 0
src/plugins/necessaryInfo/index.js → src/plugins/dialogExtend/index.js


+ 2 - 2
src/views/common/loginDialog.vue

@@ -60,7 +60,7 @@ import { nextTick, ref } from 'vue'
 import Verify from '@/components/Verifition'
 import Snackbar from '@/plugins/snackbar'
 import { checkPersonBaseInfo } from '@/utils/check'
-import necessaryInfo from '@/plugins/necessaryInfo'
+import dialogExtend from '@/plugins/dialogExtend'
 
 const emit = defineEmits(['loginSuccess', 'close'])
 
@@ -106,7 +106,7 @@ const handleLogin = async () => {
     await userStore[api](params)
     if (checkPersonBaseInfo()) emit('loginSuccess')
     else {
-      necessaryInfo('necessaryInfoDialog').then(() => {  // 强制填写个人信息
+      dialogExtend('necessaryInfoDialog').then(() => {  // 强制填写个人信息
         emit('loginSuccess')
       })
     }

+ 2 - 2
src/views/mall/exchange.vue

@@ -37,7 +37,7 @@ import { redeemSubmit } from '@/api/mall'
 import { useUserStore } from '@/store/user'
 import { getDict } from '@/hooks/web/useDictionaries'
 import { checkPersonBaseInfo } from '@/utils/check'
-import necessaryInfo from '@/plugins/necessaryInfo'
+import dialogExtend from '@/plugins/dialogExtend'
 
 const emit = defineEmits(['login', 'toTaskCenter'])
 defineProps({
@@ -114,7 +114,7 @@ const handleShowDetail = (item) =>{
     return
   }
   if (!checkPersonBaseInfo()) { // 强制填写个人信息
-    necessaryInfo('necessaryInfoDialog').then(() => {
+    dialogExtend('necessaryInfoDialog').then(() => {
       handleShowDetail()
     })
     return

+ 4 - 5
src/views/recruit/enterprise/systemManagement/groupAccount/inviteConfirm.vue

@@ -56,11 +56,10 @@ import Snackbar from '@/plugins/snackbar'
 import { getToken } from '@/utils/auth'
 import { logout } from '@/api/common'
 import { useUserStore } from '@/store/user'
-import { savePersonSimpleInfo } from '@/api/recruit/personal/shareJob'
-// import infoForm from '@/plugins/necessaryInfo/components/infoForm.vue'
+// import { savePersonSimpleInfo } from '@/api/recruit/personal/shareJob'
 // import simplePageForm from './components/simplePageForm.vue'
 import { checkPersonBaseInfo } from '@/utils/check'
-import necessaryInfo from '@/plugins/necessaryInfo'
+import dialogExtend from '@/plugins/dialogExtend'
 
 
 const joinSuccess = ref(false)
@@ -92,7 +91,7 @@ const handleLogin = async () => {
       // getUserBaseInfos(userId)
       // return
       if (!checkPersonBaseInfo()) { // 强制填写个人信息
-        necessaryInfo('necessaryInfoDialog', { setInfo }).then(() => {
+        dialogExtend('necessaryInfoDialog', { setInfo }).then(() => {
           join()
         })
         return
@@ -109,7 +108,7 @@ const handleLogin = async () => {
     userId = data.userId
     // getUserBaseInfos(data.userId)
     if (!checkPersonBaseInfo()) { // 强制填写个人信息
-      necessaryInfo('necessaryInfoDialog', { setInfo }).then(() => {
+      dialogExtend('necessaryInfoDialog', { setInfo }).then(() => {
         join()
       })
       return

+ 4 - 4
src/views/recruit/personal/position/components/details.vue

@@ -187,7 +187,7 @@ import { dealDictObjData, dealDictArrayData, commissionCalculation } from '@/uti
 import { getToken } from '@/utils/auth'
 import { getUserAvatar } from '@/utils/avatar'
 import { checkPersonBaseInfo } from '@/utils/check'
-import necessaryInfo from '@/plugins/necessaryInfo'
+import dialogExtend from '@/plugins/dialogExtend'
 
 const props = defineProps({
   defaultWidth: {
@@ -349,7 +349,7 @@ const handleShare = async () => {
     return
   }
   if (!checkPersonBaseInfo()) { // 强制填写个人信息
-    necessaryInfo('necessaryInfoDialog').then(() => {
+    dialogExtend('necessaryInfoDialog').then(() => {
       if (nextFunc.value) nextFunc.value()
     })
     return
@@ -368,7 +368,7 @@ const handleCollection = async () => {
     return
   }
   if (!checkPersonBaseInfo()) { // 强制填写个人信息
-    necessaryInfo('necessaryInfoDialog').then(() => {
+    dialogExtend('necessaryInfoDialog').then(() => {
       if (nextFunc.value) nextFunc.value()
     })
     return
@@ -427,7 +427,7 @@ const handleDelivery = async () => {
   }
   if (delivery.value) return Snackbar.warning(t('resume.alreadyResume'))
   if (!checkPersonBaseInfo()) { // 强制填写个人信息
-    necessaryInfo('necessaryInfoDialog').then(() => {
+    dialogExtend('necessaryInfoDialog').then(() => {
       if (nextFunc.value) nextFunc.value()
     })
     return