diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue index ac03f76..8c4c637 100644 --- a/src/layouts/footer/index.vue +++ b/src/layouts/footer/index.vue @@ -553,8 +553,20 @@ export default { .float { position: relative; - &:hover .popup { - display: block; + // &:first-child .popup { + // display: block; + // } + + &:hover { + // &~.float { + // .popup { + // display: none; + // } + // } + + .popup { + display: block; + } } } } diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index f2b2a44..ab8a0ce 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -146,8 +146,10 @@ export default { }, // 跳转 jump (id) { - this.getPath(this.otherMenus, id || this.otherMenus[0].id) - this.getPath(this.menus, id || this.menus[0].id) + id = id || this.otherMenus[0].id + this.active = id + this.getPath(this.otherMenus, id) + this.getPath(this.menus, id) this.columnTo(this.toItem) this.$parent.showSearch = false this.$emit('updateModelType', false) diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index ca6ddc8..a5198d4 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -662,7 +662,7 @@ export default { } } else if (typeId === 3) { // 长页栏目直接获取path - this.$router.push(`/${to.path}?id=${to.id}&siteId=${this.site}`).catch(() => { }) + this.$router.replace(`/${to.path}?id=${to.id}&siteId=${this.site}`).catch(() => { }) } else if (left && (typeId === 1 || (typeId === 4 && !to.children.length))) { // 常规栏目,或者没有子级的子级优先栏目,跳转到column页 this.$router.push(`/column?id=${to.id + (to.level !== 1 || !this.sameStyle ? '&column=1' : '')}&siteId=${this.site}`).catch((err) => { }); diff --git a/src/pages/exp/index.vue b/src/pages/exp/index.vue index ea4ac9e..53ec124 100644 --- a/src/pages/exp/index.vue +++ b/src/pages/exp/index.vue @@ -1,15 +1,12 @@