diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue index 5b20b970..a129075a 100644 --- a/front/src/views/mynoticeView/components/NoticeList.vue +++ b/front/src/views/mynoticeView/components/NoticeList.vue @@ -262,35 +262,27 @@ const goPage = (item) => { } } } -let isQingDao = whoShow.itShowQingDao; // 更改消息状态 const read = (item) => { if (selectData.value.length === 0 && !item) { - message.error('未选择消息!') - return + return message.error('未选择消息!') } console.log(selectData.value) if (item) { - // 已读状态 + // 已读状态,跳转页面 if (item.readStatus === 1) { - if(isQingDao) { - goPage(item) - } - // 跳转页面 - return + return goPage(item) } mynoticeRead(item.id).then((res) => { if (res.data.code == 0) { message.success('通知已读!') mybus.emit('getMynotice') init() - if (isQingDao) { - // 页面跳转 - setTimeout(() => { - goPage(item) - }, 1000) - } + // 页面跳转 + setTimeout(() => { + goPage(item) + }, 1500) } else { message.error('操作失败!') } diff --git a/front/src/views/personalCenter/components/asideMenu.vue b/front/src/views/personalCenter/components/asideMenu.vue index 46aef41e..d6a6a822 100644 --- a/front/src/views/personalCenter/components/asideMenu.vue +++ b/front/src/views/personalCenter/components/asideMenu.vue @@ -85,19 +85,15 @@ export default defineComponent({ } onMounted(() => { - if (itShowXiHaiAn) { - handleClick(menuList[0]) + if (type) { + console.log('type---------->', type) + let _obj = menuList.find(v => v.key == type) + handleClick(_obj) } else { - if (type) { - console.log('type---------->', type) - let _obj = menuList.find(v => v.key == type) - handleClick(_obj) + if (menuList[1]) { + handleClick(menuList[1]) } else { - if (menuList[1]) { - handleClick(menuList[1]) - }else { - handleClick(menuList[0]) - } + handleClick(menuList[0]) } } })