diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index c6402e3e..28fe6c47 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -18,8 +18,15 @@
{{$t('Header.NewProject')}}
@@ -402,10 +403,12 @@ export default defineComponent({ homeMainData.openType = Object.keys(query)[0] homeMainData.openTypeChild = query[Object.keys(query)[0]] } - // if((query?.id || query?.history) && !await getIdExistToHistory()){ - // router.push('/home') - // return - // } + console.log('homeMainData.openType',homeMainData.openType,'route.path',route.path) + if (homeMainData.openType == 'history' && route.path !== '/home/history') { + homeMainData.openType = '' + homeMainData.openTypeChild = '' + } + }else{ homeMainData.openType = '' homeMainData.openTypeChild = '' @@ -432,14 +435,8 @@ export default defineComponent({ homeMainData.showHistory = false } }, - { immediate: true } + { immediate: true} ) - - - - // watch(()=>homeMainData.openTypeList,()=>{ - // homeMainData.historyData.page = 1 - // }) let isMurmur = ref() let credits = computed(()=>{ @@ -564,16 +561,13 @@ export default defineComponent({ let imgParent = document.querySelector('.homeMain_max .detail .material_content_list_loding .historyPage_loading') if(Observer?.unobserve)Observer.unobserve(imgParent); }) - const setOpenType = (type, list) => { - - if(homeMainData.openType == type){ - homeMainData.openType = '' - }else { - homeMainData.openType = type - if (type === 'history') { - router.push('/home/history') - } + const setOpenType = (item) => { + const { value, list } = item + if (!list?.length) { + router.push(item.router) + return } + homeMainData.openType = homeMainData.openType === value ? '' : value } let Observer = null let setPorfolioDom = ()=>{