Skip to content

G
gs1
Commit 5286e90b by Jianli Ou
Options

Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

parents 980cb66e a90c6063
Showing with 236 additions and 230 deletions
src/components/layout/header/index.vue
......@@ -125,21 +125,27 @@ export default {
window.removeEventListener("click", this.handleWindowClick);
},
methods: {
comparePath(nav, path) {
let result = null;
nav.forEach((item) => {
if (item.link === path) {
result = item;
comparePath(arr, activePath) {
let current = [];
const deep = (arr, activePath) => {
for (let i = 0; i < arr.length; i += 1) {
if (
arr[i].link !== activePath &&
arr[i].children &&
arr[i].children.length > 0
) {
deep(arr[i].children, activePath);
} else if (arr[i].link === activePath) {
current = arr[i];
break;
}
if (current.length > 0) {
break;
}
if (item.children && item.children.length > 0) {
item.children.forEach((item_) => {
if (item_.link === path) {
result = item_;
}
});
}
});
return result;
};
deep(arr, activePath);
return current;
},
handleWindowClick() {
// console.log('handleWindowClick', this.fromNav, this.preActive);
......
src/utils/utils.js
......@@ -58,3 +58,32 @@ export const getUUID = () => {
return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16)
})
}
/**
* 获取面包屑
*/
export const deepFindBreadcrumb = (menuList, activePath) => {
let current = [];
const deep = (arr, activePath) => {
for (let i = 0; i < arr.length; i += 1) {
if (
arr[i].link !== activePath &&
arr[i].children &&
arr[i].children.length > 0
) {
deep(arr[i].children, activePath);
} else if (arr[i].link === activePath) {
current = arr[i];
break;
}
if (current.length > 0) {
break;
}
}
};
if (activePath) {
deep(menuList, activePath);
}
return current;
};
\ No newline at end of file
src/views/Business/Code1.vue
......@@ -249,11 +249,11 @@ export default {
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-bottom: 20px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -267,6 +267,9 @@ export default {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
}
}
......
src/views/Business/Code2.vue
......@@ -169,11 +169,11 @@ export default {
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-bottom: 20px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -187,6 +187,9 @@ export default {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
}
}
......
src/views/Business/Code3.vue
......@@ -115,7 +115,7 @@ export default {
data() {
return {
flsspCate: {
name: "非零售商品",
name: "物流单元",
ico: "",
},
};
......@@ -147,11 +147,11 @@ export default {
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-bottom: 20px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -165,6 +165,9 @@ export default {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px;
}
}
}
......
src/views/Business/GLN.vue
......@@ -111,7 +111,11 @@ export default {
};
},
methods: {
ckxqJump() {}
ckxqJump() {
this.$router.push({
path: '/Knowledge/xts'
})
}
},
};
</script>
......
src/views/Business/Guide.vue
......@@ -50,16 +50,20 @@ export default {
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: rgba(0, 121, 158, 1);
margin-bottom: 20px;
margin: 15px 0;
}
.msg-cont {
line-height: 23px;
color: rgba(102, 102, 102, 1);
p{
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
}
}
}
......
src/views/Business/Guide1.vue
......@@ -18,7 +18,7 @@
<div class="msg-title" ref="1-2">条码注册方式：</div>
<p>
线上办理：登录中国物品编码中心官网，点击“我要申请商品条码”，手机号绑定成功后，按流程操作即可。<a
href="/manage/down/2021zcbl.pdf"
href="http://www.gs1cn.org/manage/down/2021zcbl.pdf"
target="_blank"
style="color: Red"
>查看操作指南</a
......@@ -184,12 +184,11 @@ p {
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-top: 15px;
margin-bottom: 10px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -200,6 +199,9 @@ p {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
img {
max-width: 100%;
......
src/views/Business/Guide2.vue
......@@ -81,7 +81,7 @@
"
>
线上办理：登录中国商品信息服务平台，从“应用市场—条码商桥”处下单，即时支付即时下载。<a
href="/manage/down/2021jpdz.pdf"
href="http://www.gs1cn.org/manage/down/2021jpdz.pdf"
target="_blank"
style="color: Red"
>查看操作指南</a
......@@ -144,18 +144,14 @@ export default {
};
</script>
<style lang="scss" scoped>
p {
line-height: 28px;
}
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-top: 15px;
margin-bottom: 10px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -166,6 +162,9 @@ p {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
img {
max-width: 100%;
......
src/views/Business/Guide3.vue
......@@ -123,9 +123,6 @@ export default {
};
</script>
<style lang="scss" scoped>
p {
line-height: 28px;
}
.guide {
@include module-box;
.ljtb-btn {
......@@ -136,12 +133,11 @@ p {
border-radius: 5px;
}
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-top: 15px;
margin-bottom: 10px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -155,6 +151,9 @@ p {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
}
.text-right {
......
src/views/Business/Guide4.vue
......@@ -106,18 +106,14 @@ export default {
};
</script>
<style lang="scss" scoped>
p {
line-height: 28px;
}
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-top: 15px;
margin-bottom: 10px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -128,6 +124,9 @@ p {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
img {
max-width: 100%;
......
src/views/Business/Guide5.vue
......@@ -93,7 +93,7 @@
/>
</div>
<p>
查看<a href="/Service/Training.aspx" target="_blank"
查看<a href="/Service/Training" target="_blank"
>全国分支机构培训计划</a
>，选择适合方式、场次参加培训。
</p>
......@@ -155,9 +155,6 @@ export default {
};
</script>
<style lang="scss" scoped>
p {
line-height: 28px;
}
.guide {
@include module-box;
.ljtb-btn {
......@@ -167,12 +164,11 @@ p {
padding: 10px;
}
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-top: 15px;
margin-bottom: 10px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -186,6 +182,9 @@ p {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
a {
color: #008dbd;
......
src/views/Business/Guide6.vue
......@@ -123,9 +123,6 @@ export default {
};
</script>
<style lang="scss" scoped>
p {
line-height: 28px;
}
.guide {
@include module-box;
.ljtb-btn {
......@@ -135,12 +132,11 @@ p {
padding: 10px;
}
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-top: 15px;
margin-bottom: 10px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -154,6 +150,9 @@ p {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
a {
color: #008dbd;
......
src/views/Business/Guide7.vue
......@@ -126,9 +126,6 @@ export default {
};
</script>
<style lang="scss" scoped>
p {
line-height: 28px;
}
.guide {
@include module-box;
.ljtb-btn {
......@@ -138,12 +135,11 @@ p {
padding: 10px;
}
.guide-msg {
margin: 30px 0;
margin: 20px 0;
font-size: 14px;
.msg-title {
color: #008dbd;
margin-top: 15px;
margin-bottom: 10px;
margin: 15px 0;
&.actived {
color: #04408d;
}
......@@ -157,6 +153,9 @@ p {
p {
text-indent: 25px;
font-size: 14px;
color: #454545;
font-weight: 300;
line-height: 24px
}
a {
color: #008dbd;
......
src/views/Business/Notice.vue
......@@ -49,6 +49,7 @@ import cate from "../comps/cate.vue";
import pages from "../comps/pages.vue";
import list from "./copms/list.vue";
import { nav } from "@/components/layout/header/mock";
import { deepFindBreadcrumb } from "@/utils/utils";
export default {
components: {
......@@ -154,31 +155,9 @@ export default {
code: obj.code,
},
});
const result = this.deepFindBreadcrumb(nav, '/Business/Msg');
const result = deepFindBreadcrumb(nav, '/Business/Msg');
this.$store.commit("system/SET_BREADCRUMB", result.breadcrumb);
},
deepFindBreadcrumb(menuList, activePath) {
let current = [];
const deep = (arr, activePath) => {
for (let i = 0; i < arr.length; i += 1) {
if (
arr[i].link !== activePath &&
arr[i].children &&
arr[i].children.length > 0
) {
deep(arr[i].children, activePath);
} else if (arr[i].link === activePath) {
current = arr[i];
break;
}
if (current.length > 0) {
break;
}
}
};
deep(menuList, activePath);
return current;
},
jump(i) {
// console.log(i);
this.setLogoutFlag(this.list[i].active);
......
src/views/Business/Register.vue
......@@ -12,14 +12,8 @@
/>
</div>
</div>
<div class="register-bottom register-cont" v-if="false">
<cate :father="zxcxgjCate"></cate>
<div class="row zxcxgj-ul">
<div class="col-lg-4" v-for="(tmp, i) in zxcxgjList" :key="i">
<img :src="tmp.ico" alt="" class="zxcxgj-img" />
<div class="zxcxgj-bt">{{ tmp.name }}</div>
</div>
</div>
<div class="register-bottom register-cont" v-if="true">
<zxcxgj :middle="true"/>
</div>
</div>
</div>
......@@ -36,15 +30,15 @@ import tmgg from "./copms/tmgg.vue";
import bgxz from "./copms/bgxz.vue";
import dffzjg from "./copms/dffzjg.vue";
import zcfg from "./copms/zcfg.vue";
import cate from "../comps/cate.vue";
import zxcxgj from "./copms/zxcxgj.vue";
export default {
components: {
cate,
tmgg,
dffzjg,
bgxz,
zcfg,
zxcxgj,
},
data() {
return {
......@@ -103,20 +97,6 @@ export default {
.register-bottom {
margin-top: 20px;
.zxcxgj-ul {
padding: 12.5px 0;
> div {
margin: 12.5px 0;
text-align: center;
.zxcxgj-img {
margin-bottom: 13px;
}
.zxcxgj-bt {
color: #0e2c6b;
font-size: 14px;
}
}
}
}
}
</style>
\ No newline at end of file
src/views/Business/Training.vue
......@@ -96,6 +96,8 @@
<script>
import cate from "../comps/cate.vue";
import fzzx from "./copms/fzzx.vue";
import { nav } from "@/components/layout/header/mock";
import { deepFindBreadcrumb } from "@/utils/utils";
export default {
components: {
......@@ -288,9 +290,12 @@ export default {
this.updateKey = new Date().getTime();
},
jump() {
this.$router.push({
path: "/Org/Branch",
});
// this.$router.push({
// path: "/Org/Branch",
// });
window.open('/Org/Branch', '_self');
const result = deepFindBreadcrumb(nav, '/Org/Branch');
this.$store.commit("system/SET_BREADCRUMB", result.breadcrumb);
},
},
};
......
src/views/Business/copms/zxcxgj.vue
<template>
<div class="zxcxgj">
<cate :father="zxcxgjCate"></cate>
<ul class="zxcxgj-ul">
<div class="container" v-if="middle">
<div class="row zxcxgj-middle">
<div class="col-lg-4" v-for="(tmp, i) in zxcxgjList" :key="i">
<img :src="tmp.ico" alt="" class="zxcxgj-img" />
<div class="zxcxgj-bt">{{ tmp.name }}</div>
</div>
</div>
</div>
<ul class="zxcxgj-bottom" v-else>
<li v-for="(tmp, i) in zxcxgjList" :key="i">
<img :src="tmp.ico" alt="" class="zxcxgj-img" />
<div class="zxcxgj-bt">{{ tmp.name }}</div>
......@@ -13,6 +21,7 @@
import cate from "../../comps/cate.vue";
export default {
props: ["middle"],
components: {
cate,
},
......@@ -51,7 +60,7 @@ export default {
<style lang="scss">
.zxcxgj {
@include module-box;
.zxcxgj-ul {
.zxcxgj-bottom {
padding: 15px 0;
margin: 0;
display: flex;
......@@ -74,7 +83,27 @@ export default {
}
li:hover {
transform: translate(-5px, -5px);
box-shadow: 5px 5px 12px rgba(0,0,0,.2);
box-shadow: 5px 5px 12px rgba(0, 0, 0, 0.2);
}
}
.zxcxgj-middle {
padding: 12.5px 0;
> div {
margin: 12.5px 0;
text-align: center;
transition: all 0.25s;
cursor: pointer;
.zxcxgj-img {
margin-bottom: 13px;
}
.zxcxgj-bt {
color: #0e2c6b;
font-size: 14px;
}
&:hover {
transform: translate(-5px, -5px);
box-shadow: 5px 5px 12px rgba(0, 0, 0, 0.2);
}
}
}
}
......
src/views/Business/index.vue
......@@ -9,7 +9,7 @@
<router-view class="marginTopLg20"></router-view>
</div>
</div>
<div class="marginTop20">
<div class="marginTop20" v-if="$route.path !=='/Business/Register'">
<zxcxgj />
</div>
</div>
......@@ -46,8 +46,9 @@ export default {
children: [
{
name: "我要申请商品条码",
path: "",
path: "/Business/Guide1",
active: "",
id: "",
children: [
{
name: "1.企业申请商品条码资格",
......@@ -297,62 +298,62 @@ export default {
},
],
},
// {
// name: "常见问题",
// path: "",
// active: "",
// children: [
// {
// name: "1.业务办理",
// path: "/Business/Guide8",
// active: "",
// id: "ywbl",
// noneChild: true,
// },
// {
// name: "2.产品信息通报",
// path: "/Business/Guide8",
// active: "",
// id: "cpxxtb",
// noneChild: true,
// },
// {
// name: "3.编码技术",
// path: "/Business/Guide8",
// active: "",
// id: "bmjs",
// noneChild: true,
// },
// {
// name: "4.法规与标准",
// path: "/Business/Guide8",
// active: "",
// id: "fgybz",
// noneChild: true,
// },
// {
// name: "5.条码质量",
// path: "/Business/Guide8",
// active: "",
// id: "tmzl",
// noneChild: true,
// },
// {
// name: "6.条码技术应用",
// path: "/Business/Guide8",
// active: "",
// id: "tmjsyy",
// noneChild: true,
// },
// {
// name: "7.其他",
// path: "/Business/Guide8",
// active: "",
// id: "other",
// noneChild: true,
// },
// ],
// },
{
name: "常见问题",
path: "",
active: "",
children: [
{
name: "1.业务办理",
path: "/Business/Guide8",
active: "",
id: "ywbl",
noneChild: true,
},
{
name: "2.产品信息通报",
path: "/Business/Guide8",
active: "",
id: "cpxxtb",
noneChild: true,
},
{
name: "3.编码技术",
path: "/Business/Guide8",
active: "",
id: "bmjs",
noneChild: true,
},
{
name: "4.法规与标准",
path: "/Business/Guide8",
active: "",
id: "fgybz",
noneChild: true,
},
{
name: "5.条码质量",
path: "/Business/Guide8",
active: "",
id: "tmzl",
noneChild: true,
},
{
name: "6.条码技术应用",
path: "/Business/Guide8",
active: "",
id: "tmjsyy",
noneChild: true,
},
{
name: "7.其他",
path: "/Business/Guide8",
active: "",
id: "other",
noneChild: true,
},
],
},
],
},
{
......@@ -447,8 +448,9 @@ export default {
{
name: "我要编码",
path: "/Business/Code",
redirectUrl: '/Business/Code1',
active: "",
id: "1-1",
id: "",
children: [
{
name: "零售商品",
......
src/views/Business/ypzs.vue
......@@ -35,7 +35,7 @@
</p>
<p>
--<a
href="http://www.gs1cn.org/service/notice/article.aspx?id=603&amp;codeid=7"
href="/News/NoticeArticle?id=603"
target="_blank"
>编码中心分支机构药品追溯联系人</a
>
......
src/views/comps/left.vue
......@@ -19,6 +19,7 @@
</template>
<script>
import { nav } from "@/components/layout/header/mock";
import { deepFindBreadcrumb } from "@/utils/utils";
export default {
props: ["list", "currentRoute"],
......@@ -37,7 +38,7 @@ export default {
if (type === "link") {
window.open(el.path, "_blank");
} else {
const result = this.deepFindBreadcrumb(nav, el.path);
const result = deepFindBreadcrumb(nav, el.path);
console.log(result, "result");
if (result && result.breadcrumb) {
this.$store.commit("system/SET_BREADCRUMB", result.breadcrumb);
......@@ -47,28 +48,6 @@ export default {
});
}
},
deepFindBreadcrumb(menuList, activePath) {
let current = [];
const deep = (arr, activePath) => {
for (let i = 0; i < arr.length; i += 1) {
if (
arr[i].link !== activePath &&
arr[i].children &&
arr[i].children.length > 0
) {
deep(arr[i].children, activePath);
} else if (arr[i].link === activePath) {
current = arr[i];
break;
}
if (current.length > 0) {
break;
}
}
};
deep(menuList, activePath);
return current;
},
},
};
</script>
......
src/views/comps/left2.vue
......@@ -43,6 +43,7 @@
</template>
<script>
import { nav } from "@/components/layout/header/mock";
import { deepFindBreadcrumb } from "@/utils/utils";
export default {
props: ["list"],
......@@ -69,7 +70,9 @@ export default {
},
},
created() {
// console.log(this.$route.query.id, "获取当前路由地址");
console.log(this.list, "获取当前路由地址");
let result = deepFindBreadcrumb(nav, '');
console.log(result, 'resultresultresult2');
},
methods: {
// 路由跳转
......@@ -79,9 +82,12 @@ export default {
if (type === "link") {
window.open(el.path, "_blank");
} else {
const result = this.deepFindBreadcrumb(nav, el.path);
let result = deepFindBreadcrumb(nav, el.path);
console.log(result, "result");
if (result && result.breadcrumb) {
if (result) {
if (result.length === 0) {
result = deepFindBreadcrumb(nav, el.redirectUrl);
}
this.$store.commit("system/SET_BREADCRUMB", result.breadcrumb);
}
if (el.id) {
......@@ -105,28 +111,6 @@ export default {
}
}
},
deepFindBreadcrumb(menuList, activePath) {
let current = [];
const deep = (arr, activePath) => {
for (let i = 0; i < arr.length; i += 1) {
if (
arr[i].link !== activePath &&
arr[i].children &&
arr[i].children.length > 0
) {
deep(arr[i].children, activePath);
} else if (arr[i].link === activePath) {
current = arr[i];
break;
}
if (current.length > 0) {
break;
}
}
};
deep(menuList, activePath);
return current;
},
handleOpen(key, keyPath) {
console.log(key, keyPath);
},
......
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