diff --git a/packageB/notice/index.vue b/packageB/notice/index.vue index 41f8273..b361e2a 100644 --- a/packageB/notice/index.vue +++ b/packageB/notice/index.vue @@ -81,7 +81,8 @@ function getPolicyData(type = 'add',currentTab='train') { params={ pageSize:pageSize.value, pageNum:pageNum.value, - type:current.value + type:current.value, + shenhe: '1', } $api.myRequest('/train/public/announcement/list', params).then((resData) => { if(resData.code==200){ @@ -99,7 +100,8 @@ function getPolicyData(type = 'add',currentTab='train') { params={ pageSize:pageSize.value, pageNum:pageNum.value, - type:current.value + type:current.value, + shenhe: '1', } $api.myRequest('/train/public/announcement/list', params).then((resData) => { if(resData.code==200){ diff --git a/stores/useCareerPathStore.js b/stores/useCareerPathStore.js index fb3b97b..e7478ef 100644 --- a/stores/useCareerPathStore.js +++ b/stores/useCareerPathStore.js @@ -71,7 +71,10 @@ export const useCareerPathStore = defineStore('career-path', () => { try { const { code, msg, data } = await getCurrentPosition(); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (!data) { @@ -92,7 +95,10 @@ export const useCareerPathStore = defineStore('career-path', () => { try { const { code, msg, data } = await getPath(); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (!data) { @@ -122,7 +128,10 @@ export const useCareerPathStore = defineStore('career-path', () => { try { const { code, msg, data } = await getPathDetail(params); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (!data) { @@ -143,23 +152,23 @@ export const useCareerPathStore = defineStore('career-path', () => { const eventSearch = () => { if (pathsRef.value.length === 0) { - ElMessage.warning({ - message: '当前职业暂无发展路径,敬请期待!', - duration: 5000 + uni.showToast({ + title: '当前职业暂无发展路径,敬请期待!', + icon: 'none' }); return; } if (!profession.value) { - ElMessage.warning({ - message: '请选择当前职位!', - duration: 5000 + uni.showToast({ + title: '请选择当前职位!', + icon: 'none' }); return; } if (!targetCareer.value) { - ElMessage.warning({ - message: '请选择目标职业!', - duration: 5000 + uni.showToast({ + title: '请选择目标职业!', + icon: 'none' }); return; } diff --git a/stores/useCareerRecommendationStore.js b/stores/useCareerRecommendationStore.js index 30639fb..a3779d6 100644 --- a/stores/useCareerRecommendationStore.js +++ b/stores/useCareerRecommendationStore.js @@ -69,7 +69,10 @@ export const useCareerRecommendationStore = defineStore('career-recommendation', try { const { code, msg, data } = await getProfessions(); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (!data) { @@ -93,7 +96,10 @@ export const useCareerRecommendationStore = defineStore('career-recommendation', try { const { code, msg, data } = await getSkillTags(params); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (typeof data !== 'undefined' && Array.isArray(data) && data.length > 0 && data[ 0 ]) { @@ -111,7 +117,10 @@ export const useCareerRecommendationStore = defineStore('career-recommendation', try { const { code, msg, data } = await getRecommend(params); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (!data) { diff --git a/stores/useSkillDevelopmentStore.js b/stores/useSkillDevelopmentStore.js index 8ec23dc..d0064b3 100644 --- a/stores/useSkillDevelopmentStore.js +++ b/stores/useSkillDevelopmentStore.js @@ -72,7 +72,10 @@ export const useSkillDevelopmentStore = defineStore('skill-development', () => { try { const { code, msg, data } = await getCurrentPosition(); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (!data) { @@ -93,7 +96,10 @@ export const useSkillDevelopmentStore = defineStore('skill-development', () => { try { const { code, msg, data } = await getPath(); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (!data) { @@ -127,7 +133,10 @@ export const useSkillDevelopmentStore = defineStore('skill-development', () => { try { const { code, msg, data } = await getSkill(params); if (code !== 0) { - $emitter.emit('error-message', msg); + uni.showToast({ + title: msg, + icon: 'none' + }); return; } if (typeof data !== 'undefined' && Array.isArray(data) && data.length > 0 && data[ 0 ]) { @@ -151,23 +160,23 @@ export const useSkillDevelopmentStore = defineStore('skill-development', () => { const eventSearch = () => { if (pathsRef.value.length === 0) { - ElMessage.warning({ - message: '当前职业暂无发展路径,敬请期待!', - duration: 5000 + uni.showToast({ + title: '当前职业暂无发展路径,敬请期待!', + icon: 'none' }); return; } if (!profession.value) { - ElMessage.warning({ - message: '请选择当前职位!', - duration: 5000 + uni.showToast({ + title: '请选择当前职位!', + icon: 'none' }); return; } if (!targetCareer.value) { - ElMessage.warning({ - message: '请选择目标职业!', - duration: 5000 + uni.showToast({ + title: '请选择目标职业!', + icon: 'none' }); return; }