Commit 9bca8256 by 林家欣

fix: 修改由于mock数据导致导航显示问题

parent 81afcb1c
...@@ -95,6 +95,8 @@ export default { ...@@ -95,6 +95,8 @@ export default {
return ( return (
<div class={classNames.join(" ").trim()} style={items[0].style}> <div class={classNames.join(" ").trim()} style={items[0].style}>
{items.map((item) => { {items.map((item) => {
console.log(item.isHiddenMenu, 'item.isHiddenMenu');
if (item.isHiddenMenu) return
return ( return (
<div class="gs-dropdown-item"> <div class="gs-dropdown-item">
<span <span
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
class="gs-nav-item nav-item" class="gs-nav-item nav-item"
:key="nav.id" :key="nav.id"
:class="{ active: currentNav === nav.id }" :class="{ active: currentNav === nav.id }"
@click="handleNavClick(nav,$event)" @click="handleNavClick(nav, $event)"
> >
<a <a
:id="`gs-nav-item-${nav.id}`" :id="`gs-nav-item-${nav.id}`"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<li <li
v-else v-else
:key="nav.id" :key="nav.id"
@click="handleNavClick(nav,$event)" @click="handleNavClick(nav, $event)"
class="gs-nav-item nav-item" class="gs-nav-item nav-item"
:class="{ active: currentNav === nav.id }" :class="{ active: currentNav === nav.id }"
> >
...@@ -71,14 +71,12 @@ ...@@ -71,14 +71,12 @@
<script> <script>
import HeaderBtn from "./HeaderBtn.vue"; import HeaderBtn from "./HeaderBtn.vue";
import HeaderDropdown from "./HeaderDropdown.vue"; import HeaderDropdown from "./HeaderDropdown.vue";
import {nav} from "./mock"; import { nav } from "./mock";
import Qs from "qs" import Qs from "qs";
import { import { cleanObject } from "@/axios/parameter";
cleanObject,
} from "@/axios/parameter"
export default { export default {
components: {HeaderBtn, HeaderDropdown}, components: { HeaderBtn, HeaderDropdown },
data() { data() {
return { return {
// 点击事件来自头部导航 // 点击事件来自头部导航
...@@ -161,7 +159,7 @@ export default { ...@@ -161,7 +159,7 @@ export default {
if (!nav.children || nav.children.length === 0) { if (!nav.children || nav.children.length === 0) {
this.currentNav = nav.id; this.currentNav = nav.id;
this.preActive = ""; this.preActive = "";
this.$router.push({path: nav.link}); this.$router.push({ path: nav.link });
} else { } else {
// 点击事件不来自子代导航item // 点击事件不来自子代导航item
if (!this.fromDropdown) { if (!this.fromDropdown) {
...@@ -169,8 +167,8 @@ export default { ...@@ -169,8 +167,8 @@ export default {
// 重复点击同一个nav // 重复点击同一个nav
if (this.currentNav === nav.id) { if (this.currentNav === nav.id) {
this.currentNav = this.preActive; this.currentNav = this.preActive;
this.preActive = "" this.preActive = "";
}else{ } else {
// 点击的是有dropdown的nav 需要保存当前激活状态 // 点击的是有dropdown的nav 需要保存当前激活状态
if (this.preActive === "") { if (this.preActive === "") {
this.preActive = this.currentNav; this.preActive = this.currentNav;
...@@ -192,7 +190,10 @@ export default { ...@@ -192,7 +190,10 @@ export default {
item.breadcrumb && item.breadcrumb &&
this.$store.commit("system/SET_BREADCRUMB", item.breadcrumb); this.$store.commit("system/SET_BREADCRUMB", item.breadcrumb);
// this.$store.commit("system/SET_SUB_NAV", item.root.children); // this.$store.commit("system/SET_SUB_NAV", item.root.children);
this.$router.push({path: item.link}); this.$router.push({
path: item.link,
query: item.query || {},
});
} }
}, },
...@@ -200,7 +201,7 @@ export default { ...@@ -200,7 +201,7 @@ export default {
// console.log('updateCurrent', id); // console.log('updateCurrent', id);
this.currentNav = id; this.currentNav = id;
this.preActive = ""; this.preActive = "";
} },
}, },
}; };
</script> </script>
......
import Vue from "vue"; import Vue from "vue";
import VueRouter from "vue-router"; import VueRouter from "vue-router";
import main from "@/components/main.vue"; import main from "@/components/main.vue";
import {service} from "@/router/service"; import { service } from "@/router/service";
Vue.use(VueRouter); Vue.use(VueRouter);
......
export const link = {
pxspkc: 'http://v3.gds.org.cn/LoginService.aspx',
}
\ No newline at end of file
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
:key="i" :key="i"
> >
<button <button
:class="['nav-link', { active: $route.query.id === tmp.type }]" :class="['nav-link', { active: current === tmp.type }]"
:id="tmp.type + '-tab'" :id="tmp.type + '-tab'"
data-bs-toggle="tab" data-bs-toggle="tab"
:data-bs-target="'#' + tmp.type" :data-bs-target="'#' + tmp.type"
...@@ -33,11 +33,7 @@ ...@@ -33,11 +33,7 @@
<div <div
v-for="(tmp, i) in list" v-for="(tmp, i) in list"
:key="i" :key="i"
:class="[ :class="['tab-pane', 'fade', { 'show active': current === tmp.type }]"
'tab-pane',
'fade',
{ 'show active': $route.query.id === tmp.type },
]"
:id="tmp.type" :id="tmp.type"
role="tabpanel" role="tabpanel"
:aria-labelledby="tmp.type + '-tab'" :aria-labelledby="tmp.type + '-tab'"
...@@ -169,6 +165,18 @@ export default { ...@@ -169,6 +165,18 @@ export default {
], ],
}; };
}, },
computed: {
current() {
// console.log(this.$route.query.id, "$route.query.id");
let id;
if (this.$route.query.id) {
id = this.$route.query.id;
} else {
id = "qbwt";
}
return id;
},
},
methods: { methods: {
jump(i) { jump(i) {
// console.log(i); // console.log(i);
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
系统成员可登录中国商品信息服务平台的成员专区选择在线学习服务培训视频教程,即可简单、有效、快速的学习到实用的商品条码知识,了解GS1系统并按标准使用商品条码,如需了解请按下方提示点击进入。 系统成员可登录中国商品信息服务平台的成员专区选择在线学习服务培训视频教程,即可简单、有效、快速的学习到实用的商品条码知识,了解GS1系统并按标准使用商品条码,如需了解请按下方提示点击进入。
</p> </p>
<p class="pxspkc-btn"> <p class="pxspkc-btn">
<button>点击进入</button> <button @click="pxspkcHandelClick">点击进入</button>
</p> </p>
<p> <p>
<img <img
...@@ -98,6 +98,7 @@ import cate from "../comps/cate.vue"; ...@@ -98,6 +98,7 @@ import cate from "../comps/cate.vue";
import fzzx from "./copms/fzzx.vue"; import fzzx from "./copms/fzzx.vue";
import { nav } from "@/components/layout/header/mock"; import { nav } from "@/components/layout/header/mock";
import { deepFindBreadcrumb } from "@/utils/utils"; import { deepFindBreadcrumb } from "@/utils/utils";
import { link } from "@/utils/links";
export default { export default {
components: { components: {
...@@ -289,6 +290,10 @@ export default { ...@@ -289,6 +290,10 @@ export default {
this.currentList = this.tabs[i].list; this.currentList = this.tabs[i].list;
this.updateKey = new Date().getTime(); this.updateKey = new Date().getTime();
}, },
// 培训视频课程点击进入
pxspkcHandelClick() {
window.open(link.pxspkc, '_blank');
},
jump() { jump() {
// this.$router.push({ // this.$router.push({
// path: "/Org/Branch", // path: "/Org/Branch",
......
...@@ -60,10 +60,10 @@ export default { ...@@ -60,10 +60,10 @@ export default {
}; };
}, },
mounted(){ mounted(){
console.log(this.currPage) // console.log(this.currPage)
}, },
methods:{ methods:{
changeSize(i){ changeSize(){
this.$emit('getLimit',this.currPage) this.$emit('getLimit',this.currPage)
}, },
goPage(i){ goPage(i){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment