Skip to content

G
gs1
Commit fc6d8bf2 by tang
Options

Merge remote-tracking branch 'origin/master'

parents 7ad5489f ec67c294
Showing with 113 additions and 40 deletions
src/axios/module/news.js
......@@ -143,7 +143,10 @@ const retailList = (params = {}) => {
const logostocsList = (params = {}) => {
return POST(`${Prefix}/office/news/api/logostocsList`, params);
}
// 医疗
const getList3ByType = (params = {}) => {
return GET(`${Prefix}/office/medical/api/getList3ByType`, params);
}
export default {
......@@ -178,5 +181,6 @@ export default {
jcspList,
jcspiInfo,
retailList,
logostocsList
logostocsList,
getList3ByType
}
src/views/Knowledge/index.vue
......@@ -39,7 +39,7 @@
<div class="col-lg-5">
<!-- 国家物品 -->
<div class="knowledge-cnt">
<div class="knowledge-title">国家物品编码体系</div>
<div class="knowledge-title" @click="goGjbm">国家物品编码体系</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
<div class="col-md-6">
......@@ -71,7 +71,7 @@
<div class="col-lg-7">
<!-- GS1系统 -->
<div class="knowledge-cnt">
<div class="knowledge-title">GS1系统</div>
<div class="knowledge-title" @click="goGs1">GS1系统</div>
<div class="knowledge-container card h-100">
<div class="row g-2 ">
<div class="col-md-4">
......@@ -134,7 +134,7 @@
<div class="col-lg-7">
<!-- 标准文献 -->
<div class="knowledge-cnt">
<div class="knowledge-title">标准文献</div>
<div class="knowledge-title" @click="gobzwx">标准文献</div>
<div class="knowledge-container card h-100">
<div class="row g-2 ">
<div class="col-md-3">
......@@ -168,7 +168,7 @@
<!-- 商品条码 -->
<div class="knowledge-cnt">
<div class="knowledge-title">
商品条码
<a href="/Knowledge/GS1System/goodsGln">商品条码</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -189,7 +189,7 @@
<!-- 产品电子代码（EPC） -->
<div class="knowledge-cnt">
<div class="knowledge-title">
产品电子代码（EPC）
<a href="/Knowledge/GS1System/goodsEpc">产品电子代码（EPC）</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -210,7 +210,7 @@
<!-- 全球数据同步（GDS） -->
<div class="knowledge-cnt">
<div class="knowledge-title">
全球数据同步（GDS）
<a href="/Knowledge/GS1System/goodsGDS">全球数据同步（GDS）</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -231,7 +231,7 @@
<!-- 全球位置编码（GLN） -->
<div class="knowledge-cnt">
<div class="knowledge-title">
全球位置编码（GLN）
<a href="/Knowledge/GS1System/goodsPosition">全球位置编码（GLN）</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -252,7 +252,7 @@
<!-- 自称车编码 -->
<div class="knowledge-cnt">
<div class="knowledge-title">
自称车编码
<a href="/Knowledge/GS1System/zxcbm">自称车编码</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -273,7 +273,7 @@
<!-- 动物编码 -->
<div class="knowledge-cnt">
<div class="knowledge-title">
动物编码
<a href="/Knowledge/GS1System/dwbm">动物编码</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -294,7 +294,7 @@
<!-- 二维条码 -->
<div class="knowledge-cnt">
<div class="knowledge-title">
二维条码
<a href="/Knowledge/GS1System/ewbm">二维条码</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -315,7 +315,7 @@
<!-- 高效消费者响应（ECR） -->
<div class="knowledge-cnt">
<div class="knowledge-title">
高效消费者响应（ECR）
<a href="/Knowledge/GS1System/gxfECR">高效消费者响应（ECR）</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -336,7 +336,7 @@
<!-- EbXML -->
<div class="knowledge-cnt">
<div class="knowledge-title">
EbXML
<a href="/Knowledge/GS1System/ebxml">EbXML</a>
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
......@@ -492,6 +492,11 @@ export default {
path: "/Knowledge/GS1System/sjjhtx",
});
},
gobzwx(){
this.$router.push({
path:'/Knowledge/Standard'
})
},
goKnowledgeList() {
this.$router.push({
path: "/Knowledge/knowledgeList",
......@@ -676,16 +681,18 @@ export default {
}
}
.knowledge-cnt {
.knowledge-title {
margin-bottom: 20px;
font-size: 18px;
// font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #0e2c6b;
color: #0e2c6b!important;
line-height: 25px;
margin-top: 40px;
position: relative;
cursor: pointer;
.leftIcon {
position: absolute;
left: 30px;
......@@ -840,6 +847,12 @@ export default {
margin-top: 40px;
position: relative;
cursor: pointer;
a{
color: #0e2c6b;
&:hover,&:active{
color: #0e2c6b;
}
}
}
.card-body {
padding-left: 46px;
......
src/views/News/index.vue
......@@ -9,7 +9,7 @@
<span @click="goNewPic">查看更多>></span>
</div>
<div class="tpzx-ul">
<div class="tpzx-li" v-for="(tmp, i) in picList.slice(0,3)" :key="i" @click="goInfo(tmp.pictureId)">
<div class="tpzx-li" v-for="(tmp, i) in picList.slice(0,3)" :key="i" @click="goInfo(tmp.pictureId,tmp.directpath)">
<div class="tpzx-li-tp">
<img :src="tmp.picFile" alt="" />
</div>
......@@ -24,7 +24,7 @@
</div>
<div class="top10-kj">
<ul>
<li v-for="(tmp, i) in topData.slice(0,5)" :key="i" @click="getInfo(tmp.id,tmp.directpath)">
<li v-for="(tmp, i) in topData.slice(0,5)" :key="i" @click="goInfo(tmp.id,tmp.directpath)">
<span></span
><span>{{tmp.title}}</span
>
......@@ -45,7 +45,7 @@
</div>
<div class="two-kj">
<ul class="two-ul">
<li v-for="(tmp, i) in centerList" :key="i" @click="goInfo(tmp.id)">
<li v-for="(tmp, i) in centerList" :key="i" @click="goInfo(tmp.id,tmp.directpath)">
<span></span><span>{{tmp.title}}</span>
</li>
</ul>
......@@ -58,7 +58,7 @@
</div>
<div class="two-kj">
<ul class="two-ul">
<li v-for="(tmp, i) in localList" :key="i" @click="goInfo(tmp.id)">
<li v-for="(tmp, i) in localList" :key="i" @click="goInfo(tmp.id,tmp.directpath)">
<span></span><span>{{tmp.title}}</span>
</li>
</ul>
......@@ -80,7 +80,7 @@
</div>
<div class="col-lg-4">
<ul v-if="depthList.length > 0">
<li v-for="(tmp, i) in depthList" :key="i" @click="goInfo(tmp.id)">
<li v-for="(tmp, i) in depthList" :key="i" @click="goInfo(tmp.id,tmp.directpath)">
<span></span><span>{{tmp.title}}</span>
</li>
</ul>
......@@ -112,12 +112,12 @@
<div class="news-four">
<div class="container">
<ul class="four-ul">
<li v-for="(tmpA, i) in four" :key="i" class="row" @click="goPath(tmpA.path)">
<div class="col-lg-4 four-li-left">
<li v-for="(tmpA, i) in four" :key="i" class="row" >
<div class="col-lg-4 four-li-left" @click="goPath(tmpA.path)">
<img :src="tmpA.ico" alt="" />
</div>
<div class="col-lg-8 four-li-right">
<div class="li-right-top">
<div class="li-right-top" @click="goPath(tmpA.path)">
<div>{{ tmpA.name }}</div>
<div>
<img src="../../assets/image/news/ico-download.png" alt="" />
......@@ -125,7 +125,7 @@
</div>
</div>
<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" @click="goInfo(tmpB.id,tmpB.directpath,tmpA.name)">
<span></span><span>{{ tmpB.title }}</span>
</li>
</ul>
......@@ -137,8 +137,14 @@
</div>
</template>
<script>
import { mapMutations } from "vuex";
import { mapMutations,mapState } from "vuex";
import {
FILE_PREFIX,
} from "@/config/constant";
export default {
computed: {
...mapState(["urls"]),
},
data() {
return {
four: [
......@@ -164,14 +170,17 @@ export default {
path:'/News/Logistics',
list: [
{
title: "手机扫描商品条码：即时价格比较是零售业未来",
title: "GBT 16830-2008 商品条码 储运包装商品编码与条码表示",
directpath: `${FILE_PREFIX}/2021-12-18/1472207864411062272-GBT 16830-2008 商品条码 储运包装商品编码与条码表示.pdf`,
},
{
title: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "GBT 18127-2009 商品条码 物流单元编码与条码表示",
directpath: `${FILE_PREFIX}/2021-12-18/1472207864411062273-GBT 18127-2009 商品条码 物流单元编码与条码表示.pdf`,
},
{
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
title: "GBT 31005-2014 托盘编码及条码表示",
directpath: `${FILE_PREFIX}/2021-12-18/1472207864411062274-GBT 31005-2014 托盘编码及条码表示.PDF`,
}
],
},
{
......@@ -227,15 +236,7 @@ export default {
name: "移动商务",
path:'/News/MCommerce',
list: [
{
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
{
......@@ -308,6 +309,18 @@ export default {
this.iotList()
// 其他
this.otherList()
// 食品安全
this.foodList()
// 医疗
this.getList3ByType()
},
mounted(){
this.four[5].list=[
{
title:'移动商务（宣传折页）',
directpath: `${this.urls.gs1cnTwo}Manage/down/20130620GS1 MobileCom.pdf`
}
]
},
methods:{
...mapMutations({
......@@ -389,14 +402,28 @@ export default {
}
},
// 详情
goInfo(id){
console.log(id,'id')
goInfo(id,directpath,name){
if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
if(name=='医疗'){
let link = this.$router.resolve({
path: `/News/HealthDetail?id=${id}`,
});
window.open(link.href,'_blank')
}else{
let link = this.$router.resolve({
path: `/News/msg?id=${id}`,
});
window.open(link.href,'_blank')
}
}
},
// top列表
async newsTop10() {
const policyListRes =
......@@ -440,6 +467,17 @@ export default {
}
},
//医疗列表
async getList3ByType() {
const listRes =
await this.$api.news.getList3ByType();
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[2].list = data
}
},
//物流列表
async logostocsList() {
const params = {
......@@ -498,6 +536,21 @@ export default {
}
},
// 食品追溯
async foodList() {
const params = {
page: 1,
limit: 3,
};
const listRes =
await this.$api.news.foodSafetyList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[3].list = data.list
}
},
}
};
</script>
......
src/views/News/msg.vue
......@@ -178,6 +178,9 @@ export default {
this.xgljList(data.keyword);
}
},
// getBreadcrumb(classId){
// },
// top列表
async newsTop10() {
const policyListRes = await this.$api.news.syzxphList();
......
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