Skip to content

G
gs1
Commit ce2a88e4 by tang
Options

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

 Conflicts:
	src/views/Home/index.vue
parents ec54b948 c5807c9c
Showing with 383 additions and 262 deletions
src/assets/css/english.scss
...@@ -106,7 +106,7 @@ summary { ...@@ -106,7 +106,7 @@ summary {
.col-md-2, .col-md-2,
.col-lg-2, .col-lg-2,
.col-xs-3, .col-xs-3,
.col-sm-3, .col-lsm-3,
.col-md-3, .col-md-3,
.col-lg-3, .col-lg-3,
.col-xs-4, .col-xs-4,
...@@ -130,7 +130,7 @@ summary { ...@@ -130,7 +130,7 @@ summary {
.col-md-8, .col-md-8,
.col-lg-8, .col-lg-8,
.col-xs-9, .col-xs-9,
.col-sm-9, .col-lsm-9,
.col-md-9, .col-md-9,
.col-lg-9, .col-lg-9,
.col-xs-10, .col-xs-10,
...@@ -492,18 +492,17 @@ small, ...@@ -492,18 +492,17 @@ small,
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.col-sm-1, .col-sm-1,
.col-sm-2, .col-sm-2,
.col-sm-3, .col-lsm-3,
.col-sm-4, .col-sm-4,
.col-sm-5, .col-sm-5,
.col-sm-6, .col-sm-6,
.col-sm-7, .col-sm-7,
.col-sm-8, .col-sm-8,
.col-sm-9, .col-lsm-9,
.col-sm-10, .col-sm-10,
.col-sm-11, .col-sm-11,
.col-sm-12 { .col-sm-12 {
...@@ -522,6 +521,14 @@ small, ...@@ -522,6 +521,14 @@ small,
float: left; float: left;
margin: 0; margin: 0;
} }
.col-lsm-9 {
width: 75%;
}
.col-lsm-3 {
width: 25%;
}
} }
@media (min-width: 992px) { @media (min-width: 992px) {
...@@ -565,10 +572,6 @@ small, ...@@ -565,10 +572,6 @@ small,
width: 970px; width: 970px;
} }
.toolkit .carousel-inner .item .carousel-glyph {
display: none;
}
.banner { .banner {
height: 400px; height: 400px;
...@@ -588,4 +591,10 @@ small, ...@@ -588,4 +591,10 @@ small,
.container { .container {
width: 1170px; width: 1170px;
} }
}
@media (max-width: 996px) {
.englishToolkit .slick-list .item .carousel-glyph {
display: none;
}
} }
\ No newline at end of file
src/assets/css/englishComm.scss
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
height: 42px; height: 42px;
line-height: 42px; line-height: 42px;
bottom: -20px !important; position: absolute;
z-index: 99;
width: 100%;
} }
} }
\ No newline at end of file
src/axios/module/news.js
...@@ -135,6 +135,15 @@ const jcspList = (params = {}) => { ...@@ -135,6 +135,15 @@ const jcspList = (params = {}) => {
const jcspiInfo = (params = {}) => { const jcspiInfo = (params = {}) => {
return GET(`${Prefix}/office/news/api/jcspiInfo/${params.id}`) return GET(`${Prefix}/office/news/api/jcspiInfo/${params.id}`)
} }
// 零售
const retailList = (params = {}) => {
return POST(`${Prefix}/office/news/api/retailList`, params);
}
// 物流
const logostocsList = (params = {}) => {
return POST(`${Prefix}/office/news/api/logostocsList`, params);
}
export default { export default {
...@@ -167,5 +176,7 @@ export default { ...@@ -167,5 +176,7 @@ export default {
bzkydtList, bzkydtList,
sdztList, sdztList,
jcspList, jcspList,
jcspiInfo jcspiInfo,
retailList,
logostocsList
} }
src/components/layout/englishHeader/HeaderBtn.vue
<template> <template>
<div class="header-btn move-btn"> <div class="header-btn move-btn header-btn-english">
<el-button v-if="!user" type="primary" style="padding: 9px 30px;margin-right: 6px" size="small" <a href="http://www.gs1.org/search/gss" target="_blank">
@click="handleToLogin">注册/登录 <el-button type="primary" style="padding: 9px 30px;margin-right: 6px" size="small">Search
</el-button> </el-button>
<el-button v-else type="primary" style="padding: 9px 30px;margin-right: 6px" size="small" @click="handleExit">退出登录 </a>
</el-button>
<!-- Toggler -->
<button class="navbar-toggler collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-default">
<i class="bi-list"></i>
</span>
<span class="navbar-toggler-toggled">
<i class="bi-x"></i>
</span>
</button>
<!-- End Toggler -->
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "HeaderBtn", name: "HeaderBtn",
data() { data () {
return { return {
user: null user: null
} }
}, },
methods: { methods: {
handleToLogin() {
this.$router.push({path: "/login"});
},
handleExit() {
localStorage.removeItem('loginInfo')
localStorage.removeItem('TOKEN')
localStorage.removeItem('gs-user')
// this.$router.push({path: "/"})
location.href = '/'
this.user = null
}
}, },
created() { created () {
this.user = localStorage.getItem('loginInfo') ? JSON.parse(localStorage.getItem('loginInfo')) : null this.user = localStorage.getItem('loginInfo') ? JSON.parse(localStorage.getItem('loginInfo')) : null
}, },
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.header-btn { .header-btn {
button { button {
&:hover { &:hover {
background: #CC3C0F; background: #cc3c0f;
} }
} }
} }
......
src/components/layout/topBanner.vue
<template> <template>
<div class="container d-none d-xl-block d-lg-block"> <div class="container d-none d-xl-block d-lg-block">
<div class="top-banner"> <div class="top-banner">
<!-- <div>全球商业语言</div> <div>全球商业语言</div>
<div class="top-banner-item language"> <div class="top-banner-item language">
<el-dropdown class="language-dropdown"> <el-dropdown class="language-dropdown" @command="handleClick">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
中文<i class="el-icon-arrow-down el-icon--right"></i> {{languageTxt}}<i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown" class="language-dropdown-menu"> <el-dropdown-menu slot="dropdown" class="language-dropdown-menu">
<el-dropdown-item>中文</el-dropdown-item> <el-dropdown-item command="中文">中文</el-dropdown-item>
<el-dropdown-item>英文</el-dropdown-item> <el-dropdown-item command="英文">英文</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> --> </div>
<div class="top-banner-item tb-hover">咨询电话：400-7000-690</div> <div class="top-banner-item tb-hover">咨询电话：400-7000-690</div>
<div class="top-banner-item"> <div class="top-banner-item">
<img src="../../assets/image/head/wx.png" alt=""/> <img src="../../assets/image/head/wx.png" alt="" />
<a <a class="tb-hover" target="_blank" :href="`${urls.ancc}gs1cnweixin.aspx`">官方微信</a>
class="tb-hover"
target="_blank"
:href="`${urls.ancc}gs1cnweixin.aspx`"
>官方微信</a
>
</div> </div>
<div class="top-banner-item"> <div class="top-banner-item">
<img src="../../assets/image/head/xlwb.png" alt=""/> <img src="../../assets/image/head/xlwb.png" alt="" />
<a class="tb-hover" target="_blank" href="https://weibo.com/gs1cn" <a class="tb-hover" target="_blank" href="https://weibo.com/gs1cn">官方微博</a>
>官方微博</a
>
</div> </div>
<div class="top-banner-item tb-hover" @click="handleSearch"> <div class="top-banner-item tb-hover" @click="handleSearch">
<img src="../../assets/image/head/search.png" alt=""/> <img src="../../assets/image/head/search.png" alt="" />
</div> </div>
<!-- <span @click="toAdmin" style="cursor: pointer;margin-left: 4px" v-if="user.username">{{ user.username }}</span>--> <!-- <span @click="toAdmin" style="cursor: pointer;margin-left: 4px" v-if="user.username">{{ user.username }}</span>-->
<img v-if="user.username" @click="toAdmin" style="width:22px;cursor: pointer;margin-left: 20px" <img v-if="user.username" @click="toAdmin" style="width:22px;cursor: pointer;margin-left: 20px"
src="../../assets/image/mymanage/pic_touxiang.png" alt=""> src="../../assets/image/mymanage/pic_touxiang.png" alt="">
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import {mapState} from "vuex"; import { mapState } from "vuex";
export default { export default {
name: "topBanner", name: "topBanner",
computed: { computed: {
...mapState(["urls"]), ...mapState(["urls"]),
}, },
created() { created () {
this.user = localStorage.getItem('loginInfo') ? JSON.parse(localStorage.getItem('loginInfo')) : {} this.user = localStorage.getItem('loginInfo') ? JSON.parse(localStorage.getItem('loginInfo')) : {}
console.log(this.user) console.log(this.user)
}, },
data() { data () {
return { return {
user: {} user: {},
languageTxt: '中文'
} }
}, },
methods: { methods: {
toAdmin() { toAdmin () {
if ((this.user.userType === 1 && this.user.isXT !== 1) || (this.user.userType === 2 && this.user.isXT !== 1) || (this.user.userType === 3 && this.user.levels === null)) { if ((this.user.userType === 1 && this.user.isXT !== 1) || (this.user.userType === 2 && this.user.isXT !== 1) || (this.user.userType === 3 && this.user.levels === null)) {
this.$router.push({path: '/MyManage/UnVerify/index'}) this.$router.push({ path: '/MyManage/UnVerify/index' })
} else if (this.user.isXT === 1) { } else if (this.user.isXT === 1) {
this.$router.push({path: '/MyManage/SystemMember/index'}) this.$router.push({ path: '/MyManage/SystemMember/index' })
} else if (this.user.levels === 0) { } else if (this.user.levels === 0) {
this.$router.push({path: '/MyManage/admin/check'}) this.$router.push({ path: '/MyManage/admin/check' })
} else if (this.user.levels === 1) { } else if (this.user.levels === 1) {
this.$router.push({path: '/MyManage/admin/check'}) this.$router.push({ path: '/MyManage/admin/check' })
} else if (String(this.user.levels).length === 4) { } else if (String(this.user.levels).length === 4) {
this.$router.push({path: '/MyManage/admin/check'}) this.$router.push({ path: '/MyManage/admin/check' })
} }
}, },
handleSearch() { handleSearch () {
this.$router.push({ this.$router.push({
path: "/Home/sousuo", path: "/Home/sousuo",
}); });
}, },
handleClick (val) {
this.languageTxt = val
if (val == '中文') {
this.$router.push({
path: "/Home",
});
} else {
this.$router.push({
path: "/EnglishHome",
});
}
}
}, },
}; };
</script> </script>
......
src/views/Business/GLN.vue
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
}, },
methods: { methods: {
ckxqJump() { ckxqJump() {
window.open('/Knowledge/xts', '_blank'); window.open('/Knowledge/GS1System/goodsPosition', '_blank');
// this.$router.push({ // this.$router.push({
// path: '/Knowledge/xts' // path: '/Knowledge/xts'
// }) // })
......
src/views/Business/Guide1.vue
...@@ -163,6 +163,7 @@ export default { ...@@ -163,6 +163,7 @@ export default {
handler(val) { handler(val) {
this.$nextTick(() => { this.$nextTick(() => {
Object.keys(this.$refs).forEach((key) => { Object.keys(this.$refs).forEach((key) => {
console.log(this.$refs[key], "this.$refs");
this.$refs[key].setAttribute("class", "msg-title"); this.$refs[key].setAttribute("class", "msg-title");
}); });
const top = this.$refs[val.query.id].offsetTop; const top = this.$refs[val.query.id].offsetTop;
......
src/views/Business/index.vue
...@@ -357,76 +357,76 @@ export default { ...@@ -357,76 +357,76 @@ export default {
}, },
], ],
}, },
// { {
// name: "常见问题", name: "常见问题",
// path: "", path: "",
// active: "", active: "",
// children: [ children: [
// { {
// name: "1.业务办理", name: "1.业务办理",
// path: "/Business/Faq", path: "/Business/Faq",
// active: "", active: "",
// query: { query: {
// type: "ywbl", type: "ywbl",
// }, },
// noneChild: true, noneChild: true,
// }, },
// { {
// name: "2.产品信息通报", name: "2.产品信息通报",
// path: "/Business/Faq", path: "/Business/Faq",
// active: "", active: "",
// query: { query: {
// type: "cpxxtb", type: "cpxxtb",
// }, },
// noneChild: true, noneChild: true,
// }, },
// { {
// name: "3.编码技术", name: "3.编码技术",
// path: "/Business/Faq", path: "/Business/Faq",
// active: "", active: "",
// query: { query: {
// type: "bmjs", type: "bmjs",
// }, },
// noneChild: true, noneChild: true,
// }, },
// { {
// name: "4.法规与标准", name: "4.法规与标准",
// path: "/Business/Faq", path: "/Business/Faq",
// active: "", active: "",
// query: { query: {
// type: "fgybz", type: "fgybz",
// }, },
// noneChild: true, noneChild: true,
// }, },
// { {
// name: "5.条码质量", name: "5.条码质量",
// path: "/Business/Faq", path: "/Business/Faq",
// active: "", active: "",
// query: { query: {
// type: "tmzl", type: "tmzl",
// }, },
// noneChild: true, noneChild: true,
// }, },
// { {
// name: "6.条码技术应用", name: "6.条码技术应用",
// path: "/Business/Faq", path: "/Business/Faq",
// active: "", active: "",
// query: { query: {
// type: "tmjsyy", type: "tmjsyy",
// }, },
// noneChild: true, noneChild: true,
// }, },
// { {
// name: "7.其他", name: "7.其他",
// path: "/Business/Faq", path: "/Business/Faq",
// active: "", active: "",
// query: { query: {
// type: "other", type: "other",
// }, },
// noneChild: true, noneChild: true,
// }, },
// ], ],
// }, },
], ],
}, },
{ {
......
src/views/Djwh/index.vue
...@@ -293,8 +293,8 @@ export default { ...@@ -293,8 +293,8 @@ export default {
}else{ }else{
const matche = [ const matche = [
{ {
name: "行业应用", name: "深度专题",
path: "/News/Application", path: "/News/DepthTopics",
} }
]; ];
this.setMatche(matche); this.setMatche(matche);
......
src/views/English/Home/components/trodList.vue
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
<div class="col-xs-12"> <div class="col-xs-12">
<img src="@/assets/image/english/1.jpg" class="img-responsive"></div> <img src="@/assets/image/english/1.jpg" class="img-responsive"></div>
<div class="col-xs-12"> <div class="col-xs-12">
<p style="line-height: 28px; padding: 22px; font-size: 14px"> <p class="pStyle">
In order to address to the domestic demand of healthcare safety, GS1 China strengthened 111In order to address to the domestic demand of healthcare safety, GS1 China strengthened
and broadened the use of barcode technology in the healthcare sector in 2007, and and broadened the use of barcode technology in the healthcare sector in 2007, and
established Healthcare Workgroup in 2008 consists of staff from 20 branches all established Healthcare Workgroup in 2008 consists of staff from 20 branches all
around China. There are several projects including “Implantable medical device traceability around China. There are several projects including “Implantable medical device traceability
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<img src="@/assets/image/english/2.jpg" class="img-responsive"> <img src="@/assets/image/english/2.jpg" class="img-responsive">
<div class="col-xs-12"> <div class="col-xs-12">
</div> </div>
<p style="line-height: 28px; padding: 22px; font-size: 14px"> <p class="pStyle">
Barcode applications have been extended to the food safety area with great efforts Barcode applications have been extended to the food safety area with great efforts
and a number of food safety tracking and tracing system demonstrations have been and a number of food safety tracking and tracing system demonstrations have been
established on a range of products such as Shandong seafood, Xinjiang cantaloupe, established on a range of products such as Shandong seafood, Xinjiang cantaloupe,
...@@ -131,4 +131,9 @@ export default { ...@@ -131,4 +131,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/css/english"; @import "@/assets/css/english";
.pStyle {
line-height: 28px !important;
padding: 22px;
font-size: 14px !important;
}
</style> </style>
src/views/English/SecondaryMenu/Barcode.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<section> <section>
<h1>Commodity Barcode</h1> <h1>Commodity Barcode</h1>
<div class="row"> <div class="row">
<div class="col-sm-9" style="background-color:#FFF;border-top: 7px solid #f16333"> <div class="col-lsm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<h4 style="color: #f16333; border-bottom: none; padding-top:30px"> <h4 style="color: #f16333; border-bottom: none; padding-top:30px">
What are Barcodes</h4> What are Barcodes</h4>
<table align="left" dir="rtl" style="width:200px"> <table align="left" dir="rtl" style="width:200px">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
must contact GS1 China or its branches. We will provide you with a GS1 Company Prefix must contact GS1 China or its branches. We will provide you with a GS1 Company Prefix
and the specifications.</p> and the specifications.</p>
</div> </div>
<div class="col-sm-3"> <div class="col-lsm-3">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c"> <div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
</div> </div>
<div class="content-module content-module-padding"> <div class="content-module content-module-padding">
......
src/views/English/SecondaryMenu/ContactUs.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<section> <section>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<h1 style="margin-bottom: 35px">Contact Us</h1> <h1 style="margin-bottom: 35px">Contact Us</h1>
<div class="content-module-wrapper" style="border-top: 7px solid #f26334"></div> <div class="content-module-wrapper" style="border-top: 7px solid #f26334"></div>
<div class="content-module content-module-padding" style="padding: 0px; background-color: #fff"> <div class="content-module content-module-padding" style="padding: 0px; background-color: #fff">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="col-sm-3" style="padding-top: 59px"> <div class="col-lsm-3" style="padding-top: 59px">
<div class="content-module-container"> <div class="content-module-container">
<h4></h4> <h4></h4>
<div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div> <div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div>
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
return { return {
map: { map: {
label: "GS1 China", label: "GS1 China",
center: { lng: 116.415108, lat: 39.961695 }, center: { lng: 116.415256, lat: 39.961205 },
zoom: 16, zoom: 16,
show: false, show: false,
}, },
......
src/views/English/SecondaryMenu/ECommerce.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<section> <section>
<h1>ECommerce</h1> <h1>ECommerce</h1>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<p class="small" style="padding-top: 20px; line-height:30px"> <p class="small" style="padding-top: 20px; line-height:30px">
The uniform product coding identification is not only an ID card for the products; it also can promote the The uniform product coding identification is not only an ID card for the products; it also can promote the
supply chain be visibility in each logistic point. It can provide the efficiency solutions for the issues supply chain be visibility in each logistic point. It can provide the efficiency solutions for the issues
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
information, share data, monitor and construct trusted e-commerce environment. </p> information, share data, monitor and construct trusted e-commerce environment. </p>
</div> </div>
<div class="col-sm-3" style="padding-top:30px"> <div class="col-lsm-3" style="padding-top:30px">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c"> <div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
</div> </div>
<div class="content-module content-module-padding"> <div class="content-module content-module-padding">
......
src/views/English/SecondaryMenu/EPC.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<section> <section>
<h1>EPC</h1> <h1>EPC</h1>
<div class="row"> <div class="row">
<div class="col-sm-9" style="background-color:#FFF;border-top: 7px solid #f16333"> <div class="col-lsm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<img src="@/assets/image/english/EPC.jpg" alt="" class="img-responsive" <img src="@/assets/image/english/EPC.jpg" alt="" class="img-responsive"
style="padding: 45px; padding-bottom:15px"> style="padding: 45px; padding-bottom:15px">
<p class="small" style="padding:25px; line-height:35px; padding-bottom:5px"> <p class="small" style="padding:25px; line-height:35px; padding-bottom:5px">
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
assigned with EPC Manager Numbers. assigned with EPC Manager Numbers.
</p> </p>
</div> </div>
<div class="col-sm-3"> <div class="col-lsm-3">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c"> <div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
</div> </div>
<div class="content-module content-module-padding"> <div class="content-module content-module-padding">
......
src/views/English/SecondaryMenu/GDSN.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<section> <section>
<h1>Global Data Synchronisation Network(GDSN)</h1> <h1>Global Data Synchronisation Network(GDSN)</h1>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<p class="small" style="padding-top: 20px; line-height:30px"> <p class="small" style="padding-top: 20px; line-height:30px">
GDSN (The Global Data Synchronisation Network) is a network of interoperable data pools and GS1 Global GDSN (The Global Data Synchronisation Network) is a network of interoperable data pools and GS1 Global
Registry that, communicate product master data (Catalogue Item and Party) between trading partners. In Registry that, communicate product master data (Catalogue Item and Party) between trading partners. In
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
China's product information. China's product information.
</p> </p>
</div> </div>
<div class="col-sm-3"> <div class="col-lsm-3">
<img class="img-responsive center-block" src="@/assets/image/english/GDSN-2.jpg" alt="Foodservice" <img class="img-responsive center-block" src="@/assets/image/english/GDSN-2.jpg" alt="Foodservice"
style="padding-bottom:15px; padding-top:28px"> style="padding-bottom:15px; padding-top:28px">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c"> <div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
......
src/views/English/SecondaryMenu/HanXinCode.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<section> <section>
<h1>Han Xin Code</h1> <h1>Han Xin Code</h1>
<div class="row"> <div class="row">
<div class="col-sm-9" style="background-color:#FFF;border-top: 7px solid #f16333"> <div class="col-lsm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<h4 style="color: #f16333; border-bottom: none; padding-top:30px; line-height:35px"> <h4 style="color: #f16333; border-bottom: none; padding-top:30px; line-height:35px">
The background and the development of the Han Xin code</h4> The background and the development of the Han Xin code</h4>
<p class="small" style="padding:25px; line-height:35px; padding-bottom:5px; padding-top:10px"> <p class="small" style="padding:25px; line-height:35px; padding-bottom:5px; padding-top:10px">
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
will bring considerable economic profit as well as help global trading enterprises gaining powerful will bring considerable economic profit as well as help global trading enterprises gaining powerful
information coding technological support and competitive advantage.</p> information coding technological support and competitive advantage.</p>
</div> </div>
<div class="col-sm-3"> <div class="col-lsm-3">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c"> <div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
</div> </div>
<div class="content-module content-module-padding"> <div class="content-module content-module-padding">
......
src/views/English/SecondaryMenu/InnovativeSectors.vue
<template> <template>
<div class="container site-content flush-outside" style="width: 100%;max-width: 100%;"> <div class="container site-content flush-outside" style="width: 100%;max-width: 100%;">
<div class="container" style="padding-left:15px; padding-right:15px"> <div class="container" style="padding-left:15px; padding-right:15px">
<div class="row" style="background-color: #FFF;margin-right: 0px; <div class="row" style="margin-right: 0px;
margin-top: 20px"> margin-top: 20px">
<div class="row" style="margin-left: -15px; "> <div class="row" style="margin-left: -15px; ">
<div class="col-xs-12 col-md-12 section-spacing" style="margin-top: 0px; padding-bottom: 0px"> <div class="col-xs-12 col-md-12 section-spacing" style="margin-top: 0px; padding-bottom: 0px">
...@@ -167,4 +167,8 @@ export default { ...@@ -167,4 +167,8 @@ export default {
.toolkit .site-content { .toolkit .site-content {
margin-top: 0; margin-top: 0;
} }
.row {
margin-left: 0px;
margin-right: 0px;
}
</style> </style>
src/views/English/SecondaryMenu/Introduction.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</section> </section>
<section> <section>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<h1>Introduction</h1> <h1>Introduction</h1>
<p class="small" style="padding-top: 20px"> <p class="small" style="padding-top: 20px">
GS1 China, founded in 1988 under the authorization of the State Council of the People’s GS1 China, founded in 1988 under the authorization of the State Council of the People’s
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
continued adoption of GS1 system around China and to create opportunities for new sectors which will continued adoption of GS1 system around China and to create opportunities for new sectors which will
benefit the people, industry and business of our country.</p> benefit the people, industry and business of our country.</p>
</div> </div>
<div class="col-sm-3" style="padding-top:85px"> <div class="col-lsm-3" style="padding-top:85px">
<img class="img-responsive center-block" src="@/assets/image/english/ZCH.jpg" alt="Foodservice" <img class="img-responsive center-block" src="@/assets/image/english/ZCH.jpg" alt="Foodservice"
style="border-top: 7px solid #f16333"> style="border-top: 7px solid #f16333">
</div> </div>
......
src/views/English/SecondaryMenu/Structure.vue
...@@ -17,46 +17,30 @@ ...@@ -17,46 +17,30 @@
</section> </section>
<section> <section>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<h1>Structure</h1> <h1>Structure</h1>
<img <img src="@/assets/image/english/structure.jpg" alt="" class="img-responsive" />
src="@/assets/image/english/structure.jpg"
alt=""
class="img-responsive"
/>
</div> </div>
<div class="col-sm-3" style="padding-top: 85px"> <div class="col-lsm-3" style="padding-top: 85px">
<div class="content-module-container"> <div class="content-module-container">
<h4></h4> <h4></h4>
<div <div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div>
class="content-module-wrapper"
style="border-top: 7px solid #7ac143"
></div>
<div class="content-module content-module-padding"> <div class="content-module content-module-padding">
<h4>Tools</h4> <h4>Tools</h4>
<p class="small"> <p class="small">
<a <a href="http://www.gs1.org/check-digit-calculator" target="_blank">Check digit calculator</a><br />
href="http://www.gs1.org/check-digit-calculator"
target="_blank"
>Check digit calculator</a
><br />
Calculate correct check digit for barcodes. Calculate correct check digit for barcodes.
</p> </p>
<p class="small"> <p class="small">
<a href="http://gepir.gs1.org" target="_blank" <a href="http://gepir.gs1.org" target="_blank">Who owns this barcode?</a><br />
>Who owns this barcode?</a
><br />
Find companies linked to GS1 barcode numbers. Find companies linked to GS1 barcode numbers.
</p> </p>
</div> </div>
<div class="content-module content-module-padding"> <div class="content-module content-module-padding">
<h4>Standards</h4> <h4>Standards</h4>
<p class="small"> <p class="small">
<a <a href="http://www.gs1.org/how-gs1-standards-work" target="_blank">See how GS1 standards
href="http://www.gs1.org/how-gs1-standards-work" work</a><br />
target="_blank"
>See how GS1 standards work</a
><br />
GS1 standards help you single out what really matters. GS1 standards help you single out what really matters.
</p> </p>
</div> </div>
...@@ -69,11 +53,11 @@ ...@@ -69,11 +53,11 @@
</template> </template>
<script> <script>
export default { export default {
data() { data () {
return {}; return {};
}, },
methods: { methods: {
handleGo(val) { handleGo (val) {
this.$router.push({ path: val }); this.$router.push({ path: val });
}, },
}, },
......
src/views/English/SecondaryMenu/eLearning.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<section> <section>
<h1>e-Learning</h1> <h1>e-Learning</h1>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<p class="small" style="padding-top: 20px; line-height: 30px"> <p class="small" style="padding-top: 20px; line-height: 30px">
GS1 LEARN is the home of GS1 China complete programme of eLearning GS1 LEARN is the home of GS1 China complete programme of eLearning
and classroom training courses for staff of GS1's 112 Member and classroom training courses for staff of GS1's 112 Member
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<a href="http://learn.gs1.org/" target="_blank"><img class="img-responsive center-block" <a href="http://learn.gs1.org/" target="_blank"><img class="img-responsive center-block"
src="@/assets/image/english/prntscreen_course.gif" alt="" /></a> src="@/assets/image/english/prntscreen_course.gif" alt="" /></a>
</div> </div>
<div class="col-sm-3" style="padding-top: 15px"> <div class="col-lsm-3" style="padding-top: 15px">
<div class="content-module-container"> <div class="content-module-container">
<h4></h4> <h4></h4>
<div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div> <div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div>
......
src/views/English/TertiaryMenu/IndustryPromotion/FoodSafety.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</section> </section>
<section> <section>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<h1>Food safety</h1> <h1>Food safety</h1>
<p class="small" style="padding-top: 20px"> <p class="small" style="padding-top: 20px">
In recent years, food safety standards received widespread concern In recent years, food safety standards received widespread concern
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
food safety tracking and tracing system. food safety tracking and tracing system.
</p> </p>
</div> </div>
<div class="col-sm-3" style="padding-top: 85px"> <div class="col-lsm-3" style="padding-top: 85px">
<img class="img-responsive center-block" src="@/assets/image/english/FS-2.jpg" alt="Food satety" /> <img class="img-responsive center-block" src="@/assets/image/english/FS-2.jpg" alt="Food satety" />
</div> </div>
</div> </div>
......
src/views/English/TertiaryMenu/IndustryPromotion/Healthcare.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</section> </section>
<section> <section>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<h1>Healthcare</h1> <h1>Healthcare</h1>
<p class="small" style="padding-top: 20px"> <p class="small" style="padding-top: 20px">
In order to address to the domestic demand of healthcare safety, In order to address to the domestic demand of healthcare safety,
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</a> </a>
</p> </p>
</div> </div>
<div class="col-sm-3" style="padding-top: 85px"> <div class="col-lsm-3" style="padding-top: 85px">
<img class="img-responsive center-block" src="@/assets/image/english/HC-2.jpg" alt="Healthcare" /> <img class="img-responsive center-block" src="@/assets/image/english/HC-2.jpg" alt="Healthcare" />
</div> </div>
</div> </div>
......
src/views/English/TertiaryMenu/IndustryPromotion/Others.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</section> </section>
<section> <section>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-lsm-9">
<h1>Others</h1> <h1>Others</h1>
<p class="small" style="padding-top: 20px"> <p class="small" style="padding-top: 20px">
In 2007, due to the domestic and international concern, GS1 China In 2007, due to the domestic and international concern, GS1 China
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
Qingdao, Yantai, etc. Qingdao, Yantai, etc.
</p> </p>
</div> </div>
<div class="col-sm-3" style="padding-top: 85px"> <div class="col-lsm-3" style="padding-top: 85px">
<img class="img-responsive center-block" src="@/assets/image/english/TL-2.png" alt="Food satety" /> <img class="img-responsive center-block" src="@/assets/image/english/TL-2.png" alt="Food satety" />
</div> </div>
</div> </div>
......
src/views/Home/comps/list2.vue
<template> <template>
<div class="list"> <div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg"> <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)">
<div class="col li"> <div class="col li">
<span></span> <span></span>
<span :title="tmp.title">{{tmp.title}}</span> <span :title="tmp.title">{{tmp.title}}</span>
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
export default { export default {
props: ['list'], props: ['list'],
methods: { methods: {
handelMsg() { handelMsg(obj) {
this.$router.push({ this.$emit('toList2Father', obj);
path: '/News/Msg'
});
}, },
}, },
} }
......
src/views/Home/comps/other-list.vue
<template> <template>
<div class="list"> <div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg"> <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)">
<div class="col li"> <div class="col li">
<span></span> <span></span>
<span :title="tmp.name">{{tmp.name}}</span> <span :title="tmp.name">{{ tmp.name }}</span>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: ['list'], props: ["list"],
methods: { methods: {
handelMsg() { handelMsg(obj) {
this.$router.push({ let routeData = this.$router.resolve({
path: '/News/Msg' path: obj.url,
query: obj.query,
}); });
window.open(routeData.href, "_blank");
}, },
}, },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.list { .list {
...@@ -35,7 +37,7 @@ export default { ...@@ -35,7 +37,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: 14px;
color: #7E8EA9; color: #7e8ea9;
@include ellipsis; @include ellipsis;
span { span {
display: inline-block; display: inline-block;
......
src/views/Home/comps/yyly-list.vue
<template> <template>
<div class="list"> <div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg"> <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)">
<div class="col li"> <div class="col li">
<span></span> <span></span>
<span :title="tmp.name">{{tmp.name}}</span> <span :title="tmp.name">{{tmp.name}}</span>
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
export default { export default {
props: ['list'], props: ['list'],
methods: { methods: {
handelMsg() { handelMsg(obj) {
this.$router.push({ window.open(obj.url, '_blank');
path: '/News/Msg'
});
}, },
}, },
} }
......
src/views/Knowledge/knowledgeList.vue
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<!-- 热点点击 --> <!-- 热点点击 -->
...@@ -271,7 +272,7 @@ export default { ...@@ -271,7 +272,7 @@ export default {
zxcbm:[] zxcbm:[]
}, },
hotListArr:[], hotListArr:[],
message:''
}; };
}, },
...@@ -317,10 +318,8 @@ export default { ...@@ -317,10 +318,8 @@ export default {
}); });
}, },
goKnowledgeList(){ goKnowledgeList(){
this.$router.push({
path: '/Knowledge/knowledgeList', this.searchKnowledgeList(this.chaxun.type,this.chaxun.keywords)
query: {type:this.chaxun.type,title:this.chaxun.keywords}
});
}, },
getInfo(id,directpath){ getInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
...@@ -354,6 +353,7 @@ export default { ...@@ -354,6 +353,7 @@ export default {
const { returnCode, data } = policyListRes; const { returnCode, data } = policyListRes;
if (returnCode === "0") { if (returnCode === "0") {
this.listResult=data this.listResult=data
this.message='查询无结果！'
} }
......
src/views/News/Center.vue
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<cate :father="zxhdCate"></cate> <cate :father="zxhdCate"></cate>
<div class="container"> <div class="container">
<ul class="picNews-ul"> <ul class="picNews-ul">
<li v-for="(tmp, i) in 4" :key="i"> <li v-for="(tmp, i) in pictureListArr" :key="i" @click="getInfo(tmp.pictureid,tmp.jumppath)">
<div class="picNews-li-tp"> <div class="picNews-li-tp">
<img src="../../assets/image/news/tpzx-tp1.jpg" alt="" /> <img :src="tmp.picFile" alt="" />
</div> </div>
<div class="picNews-li-bt"> <div class="picNews-li-bt">
中国物品编码中心应邀出席食品安全智慧监管研讨会 {{tmp.title}}
</div> </div>
</li> </li>
</ul> </ul>
...@@ -47,10 +47,12 @@ export default { ...@@ -47,10 +47,12 @@ export default {
pageSize:15, pageSize:15,
totalCount:0 totalCount:0
}, },
pictureListArr:[]
}; };
}, },
created() { created() {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
this.pictureTop4()
}, },
methods: { methods: {
...mapMutations({ ...mapMutations({
...@@ -60,6 +62,17 @@ export default { ...@@ -60,6 +62,17 @@ export default {
lookMore() { lookMore() {
window.open('/News/PicNews', '_target'); window.open('/News/PicNews', '_target');
}, },
// 图片资讯列表TOP4
async pictureTop4() {
const listRes =
await this.$api.news.pictureTop4();
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.pictureListArr = data
}
},
// 列表 // 列表
async initListFn(page,limit) { async initListFn(page,limit) {
const params = { const params = {
...@@ -131,6 +144,8 @@ export default { ...@@ -131,6 +144,8 @@ export default {
margin-bottom: 30px; margin-bottom: 30px;
img { img {
width: 100%; width: 100%;
height: 140px;
background: url('../../assets/image/news/tpzx-tp1.jpg') 100% 100%;
} }
.picNews-li-bt { .picNews-li-bt {
width: 90%; width: 90%;
......
src/views/News/ECommerce.vue
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
<!-- <span class="more">更多>></span> --> <!-- <span class="more">更多>></span> -->
</p> </p>
<!-- <img src="../../assets/image/news/dzsw2.png" alt=""> --> <img src="../../assets/image/news/dzsw2.png" alt="">
<video controls="controls" src="" width="100%" height="100%" webkit-playsinline=""></video> <!-- <video controls="controls" src="" width="100%" height="100%" webkit-playsinline=""></video> -->
</div> </div>
</div> </div>
<div class="col-lg-6 lunbo "> <div class="col-lg-6 lunbo ">
......
src/views/News/Notice.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="composite"> <div class="composite">
<cate :father="bzkydtCate"></cate> <cate :father="bzkydtCate"></cate>
<div class="container"> <div class="container">
<p style="color:red;margin:15px 0 0 0 ;">【中心】</p> <!-- <p style="color:red;margin:15px 0 0 0 ;">【中心】</p> -->
<list :list="tableResult.list" @getInfo='getInfo' /> <list :list="tableResult.list" @getInfo='getInfo' />
<pages :total="tableResult.totalCount" :currPage="tableResult.currPage" :pageSize="tableResult.pageSize" @getLimit='initListFn' /> <pages :total="tableResult.totalCount" :currPage="tableResult.currPage" :pageSize="tableResult.pageSize" @getLimit='initListFn' />
</div> </div>
...@@ -69,7 +69,7 @@ export default { ...@@ -69,7 +69,7 @@ export default {
]; ];
this.setMatche(matche); this.setMatche(matche);
let link = this.$router.resolve({ let link = this.$router.resolve({
path: `/News/msg?id=${id}`, path: `/News/NoticeArticle?id=${id}`,
}); });
window.open(link.href,'_blank') window.open(link.href,'_blank')
} }
......
src/views/News/index.vue
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</div> </div>
<ul class="li-right-ul"> <ul class="li-right-ul">
<li v-for="(tmpB, ii) in tmpA.list" :key="ii"> <li v-for="(tmpB, ii) in tmpA.list" :key="ii">
<span></span><span>{{ tmpB.name }}</span> <span></span><span>{{ tmpB.title }}</span>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -148,13 +148,13 @@ export default { ...@@ -148,13 +148,13 @@ export default {
path:'/News/Retail', path:'/News/Retail',
list: [ list: [
{ {
name: "手机扫描商品条码：即时价格比较是零售业未来", title: "手机扫描商品条码：即时价格比较是零售业未来",
}, },
{ {
name: "山东德州市场约两成零售商品的条码为假冒伪造", title: "山东德州市场约两成零售商品的条码为假冒伪造",
}, },
{ {
name: "如何在非零售商品上使用商品条码——非零售商品的", title: "如何在非零售商品上使用商品条码——非零售商品的",
}, },
], ],
}, },
...@@ -164,13 +164,13 @@ export default { ...@@ -164,13 +164,13 @@ export default {
path:'/News/Logistics', path:'/News/Logistics',
list: [ list: [
{ {
name: "手机扫描商品条码：即时价格比较是零售业未来", title: "手机扫描商品条码：即时价格比较是零售业未来",
}, },
{ {
name: "山东德州市场约两成零售商品的条码为假冒伪造", title: "山东德州市场约两成零售商品的条码为假冒伪造",
}, },
{ {
name: "如何在非零售商品上使用商品条码——非零售商品的", title: "如何在非零售商品上使用商品条码——非零售商品的",
}, },
], ],
}, },
...@@ -180,13 +180,13 @@ export default { ...@@ -180,13 +180,13 @@ export default {
path:'/News/Health', path:'/News/Health',
list: [ list: [
{ {
name: "手机扫描商品条码：即时价格比较是零售业未来", title: "手机扫描商品条码：即时价格比较是零售业未来",
}, },
{ {
name: "山东德州市场约两成零售商品的条码为假冒伪造", title: "山东德州市场约两成零售商品的条码为假冒伪造",
}, },
{ {
name: "如何在非零售商品上使用商品条码——非零售商品的", title: "如何在非零售商品上使用商品条码——非零售商品的",
}, },
], ],
}, },
...@@ -196,13 +196,13 @@ export default { ...@@ -196,13 +196,13 @@ export default {
path:'/News/FoodSafety', path:'/News/FoodSafety',
list: [ list: [
{ {
name: "手机扫描商品条码：即时价格比较是零售业未来", title: "手机扫描商品条码：即时价格比较是零售业未来",
}, },
{ {
name: "山东德州市场约两成零售商品的条码为假冒伪造", title: "山东德州市场约两成零售商品的条码为假冒伪造",
}, },
{ {
name: "如何在非零售商品上使用商品条码——非零售商品的", title: "如何在非零售商品上使用商品条码——非零售商品的",
}, },
], ],
}, },
...@@ -212,13 +212,13 @@ export default { ...@@ -212,13 +212,13 @@ export default {
path:'/News/ECommerce', path:'/News/ECommerce',
list: [ list: [
{ {
name: "手机扫描商品条码：即时价格比较是零售业未来", title: "手机扫描商品条码：即时价格比较是零售业未来",
}, },
{ {
name: "山东德州市场约两成零售商品的条码为假冒伪造", title: "山东德州市场约两成零售商品的条码为假冒伪造",
}, },
{ {
name: "如何在非零售商品上使用商品条码——非零售商品的", title: "如何在非零售商品上使用商品条码——非零售商品的",
}, },
], ],
}, },
...@@ -228,13 +228,13 @@ export default { ...@@ -228,13 +228,13 @@ export default {
path:'/News/MCommerce', path:'/News/MCommerce',
list: [ list: [
{ {
name: "手机扫描商品条码：即时价格比较是零售业未来", title: "手机扫描商品条码：即时价格比较是零售业未来",
}, },
{ {
name: "山东德州市场约两成零售商品的条码为假冒伪造", title: "山东德州市场约两成零售商品的条码为假冒伪造",
}, },
{ {
name: "如何在非零售商品上使用商品条码——非零售商品的", title: "如何在非零售商品上使用商品条码——非零售商品的",
}, },
], ],
}, },
...@@ -244,13 +244,13 @@ export default { ...@@ -244,13 +244,13 @@ export default {
path:'/News/IoT', path:'/News/IoT',
list: [ list: [
{ {
name: "手机扫描商品条码：即时价格比较是零售业未来", title: "手机扫描商品条码：即时价格比较是零售业未来",
}, },
{ {
name: "山东德州市场约两成零售商品的条码为假冒伪造", title: "山东德州市场约两成零售商品的条码为假冒伪造",
}, },
{ {
name: "如何在非零售商品上使用商品条码——非零售商品的", title: "如何在非零售商品上使用商品条码——非零售商品的",
}, },
], ],
}, },
...@@ -260,13 +260,13 @@ export default { ...@@ -260,13 +260,13 @@ export default {
path:'/News/Other', path:'/News/Other',
list: [ list: [
{ {
name: "手机扫描商品条码：即时价格比较是零售业未来", title: "手机扫描商品条码：即时价格比较是零售业未来",
}, },
{ {
name: "山东德州市场约两成零售商品的条码为假冒伪造", title: "山东德州市场约两成零售商品的条码为假冒伪造",
}, },
{ {
name: "如何在非零售商品上使用商品条码——非零售商品的", title: "如何在非零售商品上使用商品条码——非零售商品的",
}, },
], ],
}, },
...@@ -298,6 +298,16 @@ export default { ...@@ -298,6 +298,16 @@ export default {
this.depthListFn(); this.depthListFn();
//top //top
this.newsTop10() this.newsTop10()
//零售
this.retailList()
//物流
// this.logostocsList()
// 电子商务
this.yydtList()
//物联网
this.iotList()
// 其他
this.otherList()
}, },
methods:{ methods:{
...mapMutations({ ...mapMutations({
...@@ -323,6 +333,7 @@ export default { ...@@ -323,6 +333,7 @@ export default {
path: path, path: path,
}); });
}, },
async initListFn(limit,classId) { async initListFn(limit,classId) {
const params = { const params = {
page: 1, page: 1,
...@@ -414,7 +425,79 @@ export default { ...@@ -414,7 +425,79 @@ export default {
window.open(link.href,'_blank') window.open(link.href,'_blank')
} }
} },
//零售列表
async retailList() {
const params = {
page: 1,
size: 3,
};
const listRes =
await this.$api.news.retailList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[0].list = data.list
}
},
//物流列表
async logostocsList() {
const params = {
page: 1,
size: 3,
};
const listRes =
await this.$api.news.logostocsList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[1].list = data.list
}
},
//电子商务列表
async yydtList() {
const params = {
page: 1,
limit: 3,
};
const listRes =
await this.$api.news.yydtList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[4].list = data.list
}
},
// 物联网列表
async iotList(page,limit) {
const params = {
page: 1,
limit: 3,
classId:30
};
const listRes =
await this.$api.news.iotList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[6].list = data.list
}
},
// 其他
async otherList(page,limit) {
const params = {
page: 1,
limit: 3,
};
const listRes =
await this.$api.news.otherList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[7].list = data.list
}
},
} }
}; };
</script> </script>
...@@ -439,6 +522,19 @@ export default { ...@@ -439,6 +522,19 @@ export default {
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.news { .news {
.picNews-top {
@include module-box;
}
.picNews-bottom {
@include module-box;
margin-top: 30px;
}
.picNews-li-tp{
img{
height: 140px;
background: url('../../assets/image/news/tpzx-tp1.jpg') 100% 100%;
}
}
@mixin newsUl { @mixin newsUl {
ul { ul {
padding: 0; padding: 0;
......
src/views/News/msg.vue
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<div class="cate"> <div class="cate">
<span>公告通知</span> <span>公告通知</span>
</div> </div>
<list2 :list="announceListArr" @getInfo="getInfo" /> <list2 :list="announceListArr" @getInfo="getNoticeInfo" />
</div> </div>
</div> </div>
<div class="zttj"> <div class="zttj">
...@@ -232,6 +232,17 @@ export default { ...@@ -232,6 +232,17 @@ export default {
window.open(link.href, "_blank"); window.open(link.href, "_blank");
} }
}, },
getNoticeInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
let link = this.$router.resolve({
path: `/News/NoticeArticle?id=${id}`,
});
window.open(link.href,'_blank')
}
},
// weibo // weibo
toweibo() { toweibo() {
this.sharesinastring = this.sharesinastring =
......
src/views/comps/title.vue
<template> <template>
<div class="zxcxgj-title"> <div class="zxcxgj-title"><span></span>{{ father.name }}</div>
<span></span>{{ father.name }}
</div>
</template> </template>
<script> <script>
export default { export default {
...@@ -11,7 +9,7 @@ export default { ...@@ -11,7 +9,7 @@ export default {
<style lang="scss"> <style lang="scss">
.zxcxgj-title { .zxcxgj-title {
font-size: 16px; font-size: 16px;
color: #04408d; color: #008dbd;
border-bottom: 1px solid #c5d8ee; border-bottom: 1px solid #c5d8ee;
padding: 14px 0; padding: 14px 0;
display: flex; display: flex;
...@@ -25,5 +23,8 @@ export default { ...@@ -25,5 +23,8 @@ export default {
border-radius: 50%; border-radius: 50%;
margin-right: 10px; margin-right: 10px;
} }
&.actived {
color: #04408d;
}
} }
</style> </style>
\ No newline at end of file
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