Skip to content

G
gs1
Commit 0926b902 by 林家欣
Options

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

parents c40df54d e5cf0315
Showing with 175 additions and 42 deletions
src/axios/module/news.js
......@@ -135,6 +135,15 @@ const jcspList = (params = {}) => {
const jcspiInfo = (params = {}) => {
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 {
......@@ -167,5 +176,7 @@ export default {
bzkydtList,
sdztList,
jcspList,
jcspiInfo
jcspiInfo,
retailList,
logostocsList
}
src/views/Djwh/index.vue
......@@ -293,8 +293,8 @@ export default {
}else{
const matche = [
{
name: "行业应用",
path: "/News/Application",
name: "深度专题",
path: "/News/DepthTopics",
}
];
this.setMatche(matche);
......
src/views/Knowledge/knowledgeList.vue
......@@ -209,6 +209,7 @@
</div>
</div>
</div>
</div>
<div class="col-lg-4">
<!-- 热点点击 -->
......@@ -271,7 +272,7 @@ export default {
zxcbm:[]
},
hotListArr:[],
message:''
};
},
......@@ -317,10 +318,8 @@ export default {
});
},
goKnowledgeList(){
this.$router.push({
path: '/Knowledge/knowledgeList',
query: {type:this.chaxun.type,title:this.chaxun.keywords}
});
this.searchKnowledgeList(this.chaxun.type,this.chaxun.keywords)
},
getInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){
......@@ -354,6 +353,7 @@ export default {
const { returnCode, data } = policyListRes;
if (returnCode === "0") {
this.listResult=data
this.message='查询无结果！'
}
......
src/views/News/Center.vue
......@@ -4,12 +4,12 @@
<cate :father="zxhdCate"></cate>
<div class="container">
<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">
<img src="../../assets/image/news/tpzx-tp1.jpg" alt="" />
<img :src="tmp.picFile" alt="" />
</div>
<div class="picNews-li-bt">
中国物品编码中心应邀出席食品安全智慧监管研讨会
{{tmp.title}}
</div>
</li>
</ul>
......@@ -47,10 +47,12 @@ export default {
pageSize:15,
totalCount:0
},
pictureListArr:[]
};
},
created() {
this.initListFn(this.tableResult.currPage);
this.pictureTop4()
},
methods: {
...mapMutations({
......@@ -60,6 +62,17 @@ export default {
lookMore() {
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) {
const params = {
......@@ -131,6 +144,8 @@ export default {
margin-bottom: 30px;
img {
width: 100%;
height: 140px;
background: url('../../assets/image/news/tpzx-tp1.jpg') 100% 100%;
}
.picNews-li-bt {
width: 90%;
......
src/views/News/ECommerce.vue
......@@ -54,8 +54,8 @@
<!-- <span class="more">更多>></span> -->
</p>
<!-- <img src="../../assets/image/news/dzsw2.png" alt=""> -->
<video controls="controls" src="" width="100%" height="100%" webkit-playsinline=""></video>
<img src="../../assets/image/news/dzsw2.png" alt="">
<!-- <video controls="controls" src="" width="100%" height="100%" webkit-playsinline=""></video> -->
</div>
</div>
<div class="col-lg-6 lunbo ">
......
src/views/News/Notice.vue
......@@ -2,7 +2,7 @@
<div class="composite">
<cate :father="bzkydtCate"></cate>
<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' />
<pages :total="tableResult.totalCount" :currPage="tableResult.currPage" :pageSize="tableResult.pageSize" @getLimit='initListFn' />
</div>
......@@ -69,7 +69,7 @@ export default {
];
this.setMatche(matche);
let link = this.$router.resolve({
path: `/News/msg?id=${id}`,
path: `/News/NoticeArticle?id=${id}`,
});
window.open(link.href,'_blank')
}
......
src/views/News/index.vue
......@@ -126,7 +126,7 @@
</div>
<ul class="li-right-ul">
<li v-for="(tmpB, ii) in tmpA.list" :key="ii">
<span></span><span>{{ tmpB.name }}</span>
<span></span><span>{{ tmpB.title }}</span>
</li>
</ul>
</div>
......@@ -148,13 +148,13 @@ export default {
path:'/News/Retail',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -164,13 +164,13 @@ export default {
path:'/News/Logistics',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -180,13 +180,13 @@ export default {
path:'/News/Health',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -196,13 +196,13 @@ export default {
path:'/News/FoodSafety',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -212,13 +212,13 @@ export default {
path:'/News/ECommerce',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -228,13 +228,13 @@ export default {
path:'/News/MCommerce',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -244,13 +244,13 @@ export default {
path:'/News/IoT',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -260,13 +260,13 @@ export default {
path:'/News/Other',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -298,6 +298,16 @@ export default {
this.depthListFn();
//top
this.newsTop10()
//零售
this.retailList()
//物流
// this.logostocsList()
// 电子商务
this.yydtList()
//物联网
this.iotList()
// 其他
this.otherList()
},
methods:{
...mapMutations({
......@@ -323,6 +333,7 @@ export default {
path: path,
});
},
async initListFn(limit,classId) {
const params = {
page: 1,
......@@ -414,7 +425,79 @@ export default {
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>
......@@ -439,6 +522,19 @@ export default {
</style>
<style lang="scss" scoped>
.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 {
ul {
padding: 0;
......
src/views/News/msg.vue
......@@ -79,7 +79,7 @@
<div class="cate">
<span>公告通知</span>
</div>
<list2 :list="announceListArr" @getInfo="getInfo" />
<list2 :list="announceListArr" @getInfo="getNoticeInfo" />
</div>
</div>
<div class="zttj">
......@@ -232,6 +232,17 @@ export default {
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
toweibo() {
this.sharesinastring =
......
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