diff --git a/src/assets/qr1.jpg b/src/assets/qr1.jpg deleted file mode 100644 index d5f1735..0000000 Binary files a/src/assets/qr1.jpg and /dev/null differ diff --git a/src/assets/qr2.jpg b/src/assets/qr2.jpg deleted file mode 100644 index dc55a17..0000000 Binary files a/src/assets/qr2.jpg and /dev/null differ diff --git a/src/components/AboutUs.vue b/src/components/AboutUs.vue index fffb2ad..24546de 100644 --- a/src/components/AboutUs.vue +++ b/src/components/AboutUs.vue @@ -21,7 +21,7 @@ + :class="'culture_'+imgTextIndex">
@@ -83,31 +83,33 @@ export default { src: require('../assets/index/a1.jpg'), boldText: 'Brand', enText: 'culture', - cnTitle: '' + cnTitle: '企业简介' }, { id: '', src: require('../assets/index/a2.jpg'), boldText: 'Enterprise', enText: 'viewpoint', - cnTitle: '' + cnTitle: '企业观点' }, { id: '', src: require('../assets/index/a3.jpg'), boldText: 'corporate', enText: 'culture', - cnTitle: '' + cnTitle: '企业文化' } ] } }, created() { getArticleInfo(1).then(res => { - this.imgTextList[0].id = res.data.articlelist[1].id; - this.imgTextList[1].id = res.data.articlelist[2].id; - this.imgTextList[2].id = res.data.articlelist[3].id; - this.imgTextList[0].cnTitle = res.data.articlelist[1].title; - this.imgTextList[1].cnTitle = res.data.articlelist[2].title; - this.imgTextList[2].cnTitle = res.data.articlelist[3].title; + if (res.code === 200) { + const list = res.data.articlelist + for (let i = 0; i < list.length; i++) { + if (list[i].title = this.imgTextList[i].cnTitle) { + this.imgTextList[i].id = list[i].id + } + } + } }); }, methods: { @@ -124,17 +126,14 @@ export default { diff --git a/src/views/footer/index.vue b/src/views/footer/index.vue index 00f23a0..ce28128 100644 --- a/src/views/footer/index.vue +++ b/src/views/footer/index.vue @@ -18,7 +18,7 @@
- +
@@ -44,6 +44,7 @@ export default { data() { return { logo: "", + footer_qr:'', corporate_name: "", corporate_add: "", footerList: [ @@ -97,12 +98,15 @@ export default { }, mounted() { getPublicData().then(res => { - this.logo = res.data.logo; - this.corporate_name = res.data.corporate_name; - this.corporate_add = res.data.corporate_add; - this.footerList[0].items=res.data.aboutus - this.footerList[3].items=res.data.join - this.footerList[4].items=res.data.contact_us + if(res.code===200){ + this.logo = res.data.logo; + this.footer_qr = res.data.footer_qr; + this.corporate_name = res.data.corporate_name; + this.corporate_add = res.data.corporate_add; + this.footerList[0].items=res.data.aboutus + this.footerList[3].items=res.data.join + this.footerList[4].items=res.data.contact_us + } }); }, methods:{ diff --git a/src/views/productsCenter/index.vue b/src/views/productsCenter/index.vue index d955de0..cc95eef 100644 --- a/src/views/productsCenter/index.vue +++ b/src/views/productsCenter/index.vue @@ -75,8 +75,7 @@ export default { watch: { $route(to) { //点击产品中心的一级分类切换 - if (to.query.menu !== undefined && to.query.classify === undefined && to.query.style === undefined && to.query.space === undefined) { - console.log("点击产品中心的一级分类切换"); + if (to.query.menu != undefined && to.query.classify == undefined && to.query.style == undefined && to.query.space == undefined) { //改变二级分类 for (let i = 0; i < this.productTabs.length; i++) { if (this.productTabs[i].id == to.query.menu) { @@ -85,37 +84,39 @@ export default { } this.getCategory(to.query.menu); //获取产品列表 - this.getList(to.query.menu, 1, this.pageSize); - } - if (to.query.classify == 0) { - if (to.query.style == "全部") { - this.getList(to.query.menu, 1, this.pageSize, 0, to.query.space); - if (to.query.space == "全部") { - this.getList(to.query.menu, 1, this.pageSize, 0, 0); - } - } else if (to.query.space == "全部") { - this.getList(to.query.menu, 1, this.pageSize, to.query.style, 0); + this.getList(to.query.menu, 1, this.pageSize,'',''); + }else { + if (to.query.classify == 0) { if (to.query.style == "全部") { - this.getList(to.query.menu, 1, this.pageSize, 0, 0); + this.getList(to.query.menu, 1, this.pageSize, 0, to.query.space); + if (to.query.space == "全部") { + this.getList(to.query.menu, 1, this.pageSize, 0, 0); + } + } else if (to.query.space == "全部") { + this.getList(to.query.menu, 1, this.pageSize, to.query.style, 0); + if (to.query.style == "全部") { + this.getList(to.query.menu, 1, this.pageSize, 0, 0); + } + } else { + this.getList(to.query.menu, 1, this.pageSize, to.query.style, to.query.space); } - } else { - this.getList(to.query.menu, 1, this.pageSize, to.query.style, to.query.space); - } - } else if (to.query.classify != 0) { - if (to.query.style == "全部") { - this.getList(to.query.classify, 1, this.pageSize, 0, to.query.space); - if (to.query.space == "全部") { - this.getList(to.query.classify, 1, this.pageSize, 0, 0); - } - } else if (to.query.space == "全部") { - this.getList(to.query.classify, 1, this.pageSize, to.query.style, 0); + } else if (to.query.classify != 0) { if (to.query.style == "全部") { - this.getList(to.query.classify, 1, this.pageSize, 0, 0); + this.getList(to.query.classify, 1, this.pageSize, 0, to.query.space); + if (to.query.space == "全部") { + this.getList(to.query.classify, 1, this.pageSize, 0, 0); + } + } else if (to.query.space == "全部") { + this.getList(to.query.classify, 1, this.pageSize, to.query.style, 0); + if (to.query.style == "全部") { + this.getList(to.query.classify, 1, this.pageSize, 0, 0); + } + } else { + this.getList(to.query.classify, 1, this.pageSize, to.query.style, to.query.space); } - } else { - this.getList(to.query.classify, 1, this.pageSize, to.query.style, to.query.space); } } + } }, //点击分类,字体颜色变红 @@ -251,11 +252,11 @@ export default { } }); this.getCategory(index); - this.getGoodsList(index, 1, this.pageSize); + this.getList(index, 1, this.pageSize); }, //产品分页 handleChangePage(value) { - this.getGoodsList(this.classIndex, value, this.pageSize); + this.getList(this.classIndex, value, this.pageSize); }, //点击二级分类,筛选产品数据 changeClassify(item) {