Skip to content

G
gs1
Commit 9bca8256 by 林家欣
Options

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

parent 81afcb1c
Showing with 193 additions and 146 deletions
src/components/layout/header/HeaderDropdown.vue
......@@ -95,6 +95,8 @@ export default {
return (
<div class={classNames.join(" ").trim()} style={items[0].style}>
{items.map((item) => {
console.log(item.isHiddenMenu, 'item.isHiddenMenu');
if (item.isHiddenMenu) return
return (
<div class="gs-dropdown-item">
<span
......
src/components/layout/header/index.vue
......@@ -23,7 +23,7 @@
class="gs-nav-item nav-item"
:key="nav.id"
:class="{ active: currentNav === nav.id }"
@click="handleNavClick(nav,$event)"
@click="handleNavClick(nav, $event)"
>
<a
:id="`gs-nav-item-${nav.id}`"
......@@ -44,12 +44,12 @@
<li
v-else
:key="nav.id"
@click="handleNavClick(nav,$event)"
@click="handleNavClick(nav, $event)"
class="gs-nav-item nav-item"
:class="{ active: currentNav === nav.id }"
>
<a class="nav-link" href="javascript:void(0)">{{
nav.name
nav.name
}}</a>
</li>
</template>
......@@ -71,14 +71,12 @@
<script>
import HeaderBtn from "./HeaderBtn.vue";
import HeaderDropdown from "./HeaderDropdown.vue";
import {nav} from "./mock";
import Qs from "qs"
import {
cleanObject,
} from "@/axios/parameter"
import { nav } from "./mock";
import Qs from "qs";
import { cleanObject } from "@/axios/parameter";
export default {
components: {HeaderBtn, HeaderDropdown},
components: { HeaderBtn, HeaderDropdown },
data() {
return {
// 点击事件来自头部导航
......@@ -101,7 +99,7 @@ export default {
// console.log(nav_, this.$route, 'this.$route.path');
if (nav_.link === this.$route.path) {
nav_.breadcrumb &&
this.$store.commit("system/SET_BREADCRUMB", nav_.breadcrumb);
this.$store.commit("system/SET_BREADCRUMB", nav_.breadcrumb);
} else {
// TODO 去dropdown里面精确查找当前的路径
let result;
......@@ -112,8 +110,8 @@ export default {
result = this.comparePath(nav_.children, path);
}
result &&
result.breadcrumb &&
this.$store.commit("system/SET_BREADCRUMB", result.breadcrumb);
result.breadcrumb &&
this.$store.commit("system/SET_BREADCRUMB", result.breadcrumb);
}
}
});
......@@ -161,7 +159,7 @@ export default {
if (!nav.children || nav.children.length === 0) {
this.currentNav = nav.id;
this.preActive = "";
this.$router.push({path: nav.link});
this.$router.push({ path: nav.link });
} else {
// 点击事件不来自子代导航item
if (!this.fromDropdown) {
......@@ -169,8 +167,8 @@ export default {
// 重复点击同一个nav
if (this.currentNav === nav.id) {
this.currentNav = this.preActive;
this.preActive = ""
}else{
this.preActive = "";
} else {
// 点击的是有dropdown的nav 需要保存当前激活状态
if (this.preActive === "") {
this.preActive = this.currentNav;
......@@ -190,9 +188,12 @@ export default {
// console.log(item.root)
this.updateCurrent(item.root.id);
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.$router.push({path: item.link});
this.$router.push({
path: item.link,
query: item.query || {},
});
}
},
......@@ -200,7 +201,7 @@ export default {
// console.log('updateCurrent', id);
this.currentNav = id;
this.preActive = "";
}
},
},
};
</script>
......
src/components/layout/header/mock.js
......@@ -22,7 +22,7 @@ export const nav = [
nameInHeaderNav: "机构概况",
index: 0,
link: "/Org",
style: { flex:'1 0 auto' },
style: { flex: '1 0 auto' },
breadcrumb: [{ name: "机构概况", path: "/Org" }, { name: "中心简介" }],
children: [
{
......@@ -30,7 +30,7 @@ export const nav = [
name: "中心简介",
index: 0,
link: "/Org/Intro",
style: { paddingRight:'160px' },
style: { paddingRight: '160px' },
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "中心简介" },
......@@ -56,7 +56,48 @@ export const nav = [
{ name: "内设机构" },
],
},
{
{
id: uuid("gs_nav"),
name: "质检中心/协会/杂志社/标委会/其他",
index: 0,
link: "/Org/Sites",
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "质检中心/协会/杂志社/标委会/其他" },
],
},
{
id: uuid("gs_nav"),
name: "地方编码分支机构",
index: 0,
link: "/Org/Branch",
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "地方编码分支机构" },
],
},
{
id: uuid("gs_nav"),
name: "国际物品编码组织（GS1）",
index: 0,
link: "/Org/BranchMsg",
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "国际物品编码组织" },
],
},
{
id: uuid("gs_nav"),
name: "国际物品编码组织（GS1）成员网站",
index: 0,
link: "/Org/GS1Members",
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "国际物品编码组织（GS1）成员网站" },
],
},
{
id: uuid("gs_nav"),
name: "质量管理体系",
index: 0,
......@@ -124,46 +165,6 @@ export const nav = [
},
],
},
{
id: uuid("gs_nav"),
name: "质检中心/协会/杂志社/标委会/其他",
index: 0,
link: "/Org/Sites",
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "质检中心/协会/杂志社/标委会/其他" },
],
},
{
id: uuid("gs_nav"),
name: "地方编码分支机构",
index: 0,
link: "/Org/Branch",
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "地方编码分支机构" },
],
},
{
id: uuid("gs_nav"),
name: "国际物品编码组织（GS1）",
index: 0,
link: "/Org/BranchMsg",
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "国际物品编码组织" },
],
},
{
id: uuid("gs_nav"),
name: "国际物品编码组织（GS1）成员网站",
index: 0,
link: "/Org/GS1Members",
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "国际物品编码组织（GS1）成员网站" },
],
},
],
},
],
......@@ -182,7 +183,7 @@ export const nav = [
nameInHeaderNav: "我还不是系统成员（企业初次申请）",
index: 2,
link: "",
style: { flex:'0 0 356.24px'},
style: { flex: '0 0 356.24px' },
breadcrumb: [{ name: "业务大厅", path: "/Business" }, { name: "我还不是系统成员（企业初次申请）" }],
children: [
{
......@@ -209,9 +210,43 @@ export const nav = [
},
{
id: uuid("gs_nav"),
name: "收费公示",
index: 2,
link: "/Business/Corppaynew",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
{ name: "收费公示" },
],
},
{
id: uuid("gs_nav"),
name: "条码注册公告",
index: 2,
link: "/Business/Notice?id=zhuce",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
{ name: "条码注册公告" },
],
},
{
id: uuid("gs_nav"),
name: "条码注销公告",
index: 2,
link: "/Business/Notice?id=zhuxiao",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
{ name: "条码注销公告" },
],
},
{
id: uuid("gs_nav"),
name: "我要申请商品条码",
index: 2,
link: "/Business/Guide1",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "操作指南", path: "/Business/Guide" },
......@@ -223,6 +258,7 @@ export const nav = [
name: "我要编码",
index: 2,
link: "/Business/Guide2",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "操作指南", path: "/Business/Guide" },
......@@ -234,6 +270,7 @@ export const nav = [
name: "微信共享",
index: 2,
link: "/Business/Guide4",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "操作指南", path: "/Business/Guide" },
......@@ -245,6 +282,7 @@ export const nav = [
name: "我要咨询",
index: 2,
link: "/Business/Guide7",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "操作指南", path: "/Business/Guide" },
......@@ -256,6 +294,7 @@ export const nav = [
name: "常见问题",
index: 2,
link: "/Business/Guide8",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "操作指南", path: "/Business/Guide" },
......@@ -264,13 +303,14 @@ export const nav = [
},
{
id: uuid("gs_nav"),
name: "收费公示",
name: "我要续展",
index: 2,
link: "/Business/Corppaynew",
link: "/Business/Renewal",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
{ name: "收费公示" },
{ name: "我是系统成员", path: "/Service/Training" },
{ name: "我要续展" },
],
},
{
......@@ -278,6 +318,7 @@ export const nav = [
name: "收费目录清单",
index: 2,
link: "/Business/Corppay",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
......@@ -289,6 +330,7 @@ export const nav = [
name: "其他增值服务费",
index: 2,
link: "/Business/serviceFee",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
......@@ -297,31 +339,10 @@ export const nav = [
},
{
id: uuid("gs_nav"),
name: "条码注册公告",
index: 2,
link: "/Business/Notice?id=zhuce",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
{ name: "条码注册公告" },
],
},
{
id: uuid("gs_nav"),
name: "条码注销公告",
index: 2,
link: "/Business/Notice?id=zhuxiao",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
{ name: "条码注销公告" },
],
},
{
id: uuid("gs_nav"),
name: "条码公告",
index: 2,
link: "/Business/Msg",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我还不是系统成员", path: "/Business/Register" },
......@@ -329,18 +350,6 @@ export const nav = [
{ name: "企业信息" },
],
},
{
id: uuid("gs_nav"),
name: "我要续展",
index: 2,
link: "/Business/Renewal",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Service/Training" },
{ name: "我要续展" },
],
},
],
},
{
......@@ -349,7 +358,7 @@ export const nav = [
nameInHeaderNav: "我是系统成员（成员专区）",
index: 2,
link: "/Business",
class:['service_xtcy_custom'],
class: ['service_xtcy_custom'],
breadcrumb: [{ name: "业务大厅", path: "/Business" }, { name: "我是系统成员（成员专区）" }],
children: [
{
......@@ -376,9 +385,12 @@ export const nav = [
},
{
id: uuid("gs_nav"),
name: "零售商品",
name: "我要编码",
index: 2,
link: "/Business/Code1",
query: {
id: '1-1',
},
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" },
......@@ -388,30 +400,6 @@ export const nav = [
},
{
id: uuid("gs_nav"),
name: "非零售商品",
index: 2,
link: "/Business/Code2",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" },
// { name: "我要编码", path: "/Business/Code1?id=1-1" },
{ name: "非零售商品" },
],
},
{
id: uuid("gs_nav"),
name: "物流单元",
index: 2,
link: "/Business/Code3",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" },
// { name: "我要编码", path: "/Business/Code1?id=1-1" },
{ name: "物流单元" },
],
},
{
id: uuid("gs_nav"),
name: "我要通报编码信息（领取条码卡、激活条码卡、通报编码信息）",
index: 2,
link: "/Business/Guide3",
......@@ -460,6 +448,45 @@ export const nav = [
index: 2,
link: "http://so.anccnet.com/Home/Login",
},
{
id: uuid("gs_nav"),
name: "零售商品",
index: 2,
link: "/Business/Code1",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" },
// { name: "我要编码", path: "/Business/Code1?id=1-1" },
{ name: "零售商品" },
],
},
{
id: uuid("gs_nav"),
name: "非零售商品",
index: 2,
link: "/Business/Code2",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" },
// { name: "我要编码", path: "/Business/Code1?id=1-1" },
{ name: "非零售商品" },
],
},
{
id: uuid("gs_nav"),
name: "物流单元",
index: 2,
link: "/Business/Code3",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" },
// { name: "我要编码", path: "/Business/Code1?id=1-1" },
{ name: "物流单元" },
],
},
],
},
{
......@@ -500,7 +527,7 @@ export const nav = [
nameInHeaderNav: "跨境业务办理专区",
index: 2,
link: "/Business",
style: { flex:'1 0 auto' },
style: { flex: '1 0 auto' },
breadcrumb: [{ name: "业务大厅", path: "/Business" }, { name: "跨境业务办理专区" }],
children: [
{
......@@ -587,14 +614,14 @@ export const nav = [
name: "资讯中心",
index: 5,
link: "/News/index",
style:{flex:'1 0 620px'},
style: { flex: '1 0 620px' },
children: [
{
id: uuid("gs_nav"),
name: "图片资讯",
index: 5,
link: "/News/PicNews",
style:{paddingRight:'160px'},
style: { paddingRight: '160px' },
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "图片资讯" },
......@@ -635,7 +662,7 @@ export const nav = [
name: "国际追踪",
index: 5,
link: "/News/International",
style:{paddingRight:'132px'},
style: { paddingRight: '132px' },
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "国际追踪" },
......@@ -699,14 +726,14 @@ export const nav = [
name: "应用领域",
index: 5,
link: "/News/index",
style:{flex:'1 0 auto'},
style: { flex: '1 0 auto' },
children: [
{
id: uuid("gs_nav"),
name: "零售",
index: 5,
link: "/News/Retail",
style:{paddingRight:'132px'},
style: { paddingRight: '132px' },
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "零售" },
......@@ -799,7 +826,7 @@ export const nav = [
nameInHeaderNav: "技术与标准",
index: 0,
link: "/Knowledge",
style: { flex:'1 0 auto' },
style: { flex: '1 0 auto' },
breadcrumb: [{ name: "技术与标准", path: "/Knowledge" }, { name: "技术与标准" }],
children: [
{
......@@ -830,7 +857,7 @@ export const nav = [
nameInHeaderNav: "技术知识",
index: 6,
link: "/Knowledge",
style: { flex:'1 0 auto' },
style: { flex: '1 0 auto' },
breadcrumb: [{ name: "技术知识", path: "/Knowledge" }, { name: "技术知识" }],
children: [
{
......@@ -907,7 +934,7 @@ export const nav = [
nameInHeaderNav: "政策法规",
index: 1,
link: "/Knowledge/Statute",
style: { flex:'1 0 auto' },
style: { flex: '1 0 auto' },
breadcrumb: [{ name: "知识中心", path: "/Knowledge" }, { name: "政策法规" }],
children: [{}]
},
......
src/router/index.js
import Vue from "vue";
import VueRouter from "vue-router";
import main from "@/components/main.vue";
import {service} from "@/router/service";
import { service } from "@/router/service";
Vue.use(VueRouter);
......@@ -550,7 +550,7 @@ const routes = [
},
component: () => import("@/views/News/Notice.vue"),
},
{
path: "/News/FoodSafety",
name: "FoodSafety",
......
src/utils/links.js 0 → 100644
export const link = {
pxspkc: 'http://v3.gds.org.cn/LoginService.aspx',
}
\ No newline at end of file
src/views/Business/Fap.vue
......@@ -10,7 +10,7 @@
:key="i"
>
<button
:class="['nav-link', { active: $route.query.id === tmp.type }]"
:class="['nav-link', { active: current === tmp.type }]"
:id="tmp.type + '-tab'"
data-bs-toggle="tab"
:data-bs-target="'#' + tmp.type"
......@@ -33,11 +33,7 @@
<div
v-for="(tmp, i) in list"
:key="i"
:class="[
'tab-pane',
'fade',
{ 'show active': $route.query.id === tmp.type },
]"
:class="['tab-pane', 'fade', { 'show active': current === tmp.type }]"
:id="tmp.type"
role="tabpanel"
:aria-labelledby="tmp.type + '-tab'"
......@@ -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: {
jump(i) {
// console.log(i);
......
src/views/Business/Training.vue
......@@ -63,7 +63,7 @@
系统成员可登录中国商品信息服务平台的成员专区选择在线学习服务培训视频教程，即可简单、有效、快速的学习到实用的商品条码知识，了解GS1系统并按标准使用商品条码，如需了解请按下方提示点击进入。
</p>
<p class="pxspkc-btn">
<button>点击进入</button>
<button @click="pxspkcHandelClick">点击进入</button>
</p>
<p>
<img
......@@ -98,6 +98,7 @@ import cate from "../comps/cate.vue";
import fzzx from "./copms/fzzx.vue";
import { nav } from "@/components/layout/header/mock";
import { deepFindBreadcrumb } from "@/utils/utils";
import { link } from "@/utils/links";
export default {
components: {
......@@ -289,6 +290,10 @@ export default {
this.currentList = this.tabs[i].list;
this.updateKey = new Date().getTime();
},
// 培训视频课程点击进入
pxspkcHandelClick() {
window.open(link.pxspkc, '_blank');
},
jump() {
// this.$router.push({
// path: "/Org/Branch",
......
src/views/comps/pages.vue
......@@ -60,10 +60,10 @@ export default {
};
},
mounted(){
console.log(this.currPage)
// console.log(this.currPage)
},
methods:{
changeSize(i){
changeSize(){
this.$emit('getLimit',this.currPage)
},
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