Compare commits

..

2 Commits

Author SHA1 Message Date
odjbin 9c900b53a1 Merge pull request '邓洁 : 修改页面bug' (#25) from dj into master
Reviewed-on: #25
2023-05-29 15:22:45 +00:00
邓洁 4d919fdeb5 邓洁 : 修改页面bug 2023-05-29 23:22:22 +08:00
9 changed files with 140 additions and 192 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

View File

@ -21,7 +21,7 @@
</el-row>
<el-row :gutter="10" style="padding: 0 5% ">
<el-col :span="8" v-for="(imgTextItem,imgTextIndex) in imgTextList" :key="imgTextIndex"
:class="'culture_'+imgTextIndex" >
:class="'culture_'+imgTextIndex">
<div class="imgAndText" @click="handleChangeMenu(imgTextItem)">
<a :href="imgTextItem.href">
<span class="pic">
@ -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 {
</script>
<style scoped lang="scss">
*{
font: 14px / 1.8 微软正黑体, "Microsoft JhengHei", "Microsoft Yahei", 微软雅黑, "Hiragino Sans GB", 冬青黑体, Arial, Helvetica, SimHei, 黑体, STXihei, 华文细黑, sans-serif;
}
@media screen and (max-width: 1660px) {
.aboutUs {
width: 1200px !important;
}
.img_innerBox {
padding: 20px!important;
}
padding: 20px !important;
}
}
.aboutUs {
min-width: 1300px;

View File

@ -1,15 +1,17 @@
<template>
<div class="newsCenter">
<div class="news_bg">
<!-- <div class="news_title">-->
<!-- <div>MENGBILI</div>-->
<!-- <div>CERAMIC WORLD</div>-->
<!-- <div>蒙彼利陶瓷 艺术无处不在</div>-->
<!-- <div class="case_more">-->
<!-- <a href="/about_us">READ MORE</a>-->
<!-- </div>-->
<!-- </div>-->
</div>
<a href="/about_us">
<div class="news_bg">
<!-- <div class="news_title">-->
<!-- <div>MENGBILI</div>-->
<!-- <div>CERAMIC WORLD</div>-->
<!-- <div>蒙彼利陶瓷 艺术无处不在</div>-->
<!-- <div class="case_more">-->
<!-- <a href="/about_us">READ MORE</a>-->
<!-- </div>-->
<!-- </div>-->
</div>
</a>
<div class="newsWidth">
<div class="news_left">
<div class="items">
@ -131,42 +133,45 @@ export default {
background-size: cover;
height: 380px;
.news_title {
position: relative;
display: block;
width: 100%;
float: left;
padding: 100px 0 80px;
text-align: center;
> div:first-child {
font-size: 40px;
color: #ffffff;
font-weight: 700;
}
> div:nth-child(2) {
font-size: 40px;
color: #ffffff;
font-weight: 700;
}
> div:nth-child(3) {
font-size: 18px;
color: #eceaea;
}
.case_more {
margin: 30px 0 0;
a {
color: #ffffff;
display: inline-block;
width: 120px;
height: 40px;
line-height: 40px;
font-size: 14px;
border: 1px solid #ffffff;
}
}
}
//.news_title {
// position: relative;
// display: block;
// width: 100%;
// float: left;
// padding: 100px 0 80px;
// text-align: center;
//
// > div:first-child {
// font-size: 40px;
// color: #ffffff;
// font-weight: 700;
// }
//
// > div:nth-child(2) {
// font-size: 40px;
// color: #ffffff;
// font-weight: 700;
// }
//
// > div:nth-child(3) {
// font-size: 18px;
// color: #eceaea;
// }
//
// .case_more {
// margin: 30px 0 0;
//
// a {
// color: #ffffff;
// display: inline-block;
// width: 120px;
// height: 40px;
// line-height: 40px;
// font-size: 14px;
// border: 1px solid #ffffff;
// }
// }
//}
}
.newsWidth {

View File

@ -10,9 +10,7 @@
<el-row type="flex">
<el-col :xs="1" :sm="2" :md="2" :lg="2" :xl="4"></el-col>
<el-col :xs="22" :sm="20" :md="20" :lg="20" :xl="16">
<div class="introduce" id="introduce">
<span v-html="pList"></span>
</div>
<div v-html="pList"></div>
</el-col>
</el-row>
</div>
@ -26,7 +24,7 @@ export default {
name: "index",
metaInfo() {
return {
title: this.aboutName+" | " + localStorage.getItem("corporate_name")
title: this.aboutName + " | " + localStorage.getItem("corporate_name")
};
},
components: {ProductsTabsItem},
@ -34,14 +32,14 @@ export default {
return {
aboutTabs: [],
pList: [],
aboutName:''
aboutName: ''
};
},
watch:{
$route(to){
watch: {
$route(to) {
for (let i = 0; i < this.aboutTabs.length; i++) {
if (this.aboutTabs[i].id ==to.query.menu ) {
this.$refs.ProductsTabsItem.activeName= i+'';
if (this.aboutTabs[i].id == to.query.menu) {
this.$refs.ProductsTabsItem.activeName = i + '';
}
}
this.getInfo(to.query.menu)
@ -49,27 +47,27 @@ export default {
},
beforeUpdate() {
for (let i = 0; i < this.aboutTabs.length; i++) {
if (this.aboutTabs[i].id ==this.$route.query.menu ) {
this.$refs.ProductsTabsItem.activeName= i+'';
if (this.aboutTabs[i].id == this.$route.query.menu) {
this.$refs.ProductsTabsItem.activeName = i + '';
}
}
},
mounted() {
if(this.$route.query.menu){
if (this.$route.query.menu) {
//
this.getInfo(this.$route.query.menu)
}else {
} else {
this.getInfo(1)
}
},
methods: {
//
getInfo(infoId){
getInfo(infoId) {
getArticleInfo(infoId).then(res => {
this.aboutTabs = res.data.articlelist;
this.pList = res.data.articleinfo.content;
if(infoId===1){
this.aboutName=this.aboutTabs[0].title
if (infoId === 1) {
this.aboutName = this.aboutTabs[0].title
}
});
},
@ -82,7 +80,7 @@ export default {
menu: this.aboutTabs[i].id,
}
});
this.aboutName=this.aboutTabs[i].title
this.aboutName = this.aboutTabs[i].title
this.getInfo(this.aboutTabs[i].id)
}
}
@ -138,14 +136,6 @@ export default {
}
}
.introduce {
padding: 40px 0;
font-size: 16px;
p {
padding-bottom: 25px;
}
}
.band {
p {

View File

@ -10,14 +10,7 @@
<el-row type="flex">
<el-col :xs="1" :sm="2" :md="2" :lg="2" :xl="4"></el-col>
<el-col :xs="22" :sm="20" :md="20" :lg="20" :xl="16">
<div class="support">
<div class="support_title">
{{classid==4?'支持策略 / SUPPORT STRATEGY':'加盟条件 / FRANCHISE CONDITIONS'}}
</div>
<div style="font-size: 16px;padding-bottom: 25px">
<span v-html="supportList"></span>
</div>
</div>
<div style="padding: 50px 0" v-html="supportList"></div>
</el-col>
</el-row>
</div>
@ -31,13 +24,13 @@ export default {
name: "index",
metaInfo() {
return {
title:'招商加盟 | '+localStorage.getItem('corporate_name')
title: '招商加盟 | ' + localStorage.getItem('corporate_name')
};
},
components: {ProductsTabsItem},
data() {
return {
classid:4,
classid: 4,
joinTab: [],
supportList: []
};
@ -69,7 +62,7 @@ export default {
},
methods: {
//
getInfo(classId){
getInfo(classId) {
getArticleInfo(classId).then(res => {
this.joinTab = res.data.articlelist;
this.supportList = res.data.articleinfo.content;

View File

@ -6,48 +6,38 @@
</div>
<!--标签栏 -->
<ProductsTabsItem :tab-list="contactTabs"/>
<div class="contact_content">
<p class="title">
<strong>{{ corporate_name }}</strong>
</p>
<p class="address">
地址{{ corporate_add }}
</p>
<p class="phone">电话{{ tel }}</p>
<div class="contact_logo">
<img src="@/assets/qr1.jpg" alt=""/>
</div>
</div>
<el-row type="flex">
<el-col :xs="1" :sm="2" :md="2" :lg="2" :xl="4"></el-col>
<el-col :xs="22" :sm="20" :md="20" :lg="20" :xl="16">
<div v-html="contactList"></div>
</el-col>
</el-row>
</div>
</template>
<script>
import ProductsTabsItem from "@/components/ProductsTabsItem";
import {getPublicData} from "@/api";
import {getArticleInfo} from "@/api";
export default {
name: "index",
metaInfo() {
return {
title:'联系我们 | '+localStorage.getItem('corporate_name')
title: '联系我们 | ' + localStorage.getItem('corporate_name')
};
},
components: {ProductsTabsItem},
data() {
return {
contactTabs: [],
corporate_name: "",
corporate_add: "",
tel: ""
contactList: ''
};
},
mounted() {
getPublicData().then(res => {
this.corporate_name = res.data.corporate_name;
this.corporate_add = res.data.corporate_add;
this.tel = res.data.tel;
this.contactTabs = res.data.contact_us;
getArticleInfo(5).then(res => {
console.log('res', res)
this.contactList = res.data.articleinfo.content;
this.contactTabs = res.data.articlelist;
});
}
};
@ -59,46 +49,12 @@ export default {
.contact_us_bg {
height: 360px;
img{
img {
width: 100%;
height: 360px;
object-fit: cover;
}
}
.contact_content {
padding: 40px 0;
text-align: center;
.title {
padding-bottom: 50px;
strong {
font-size: 24px;
}
}
.address {
line-height: 28.8px;
font-size: 16px;
color: rgb(68, 68, 68);
font-family: 微软雅黑, "Microsoft YaHei", Arial, sans-serif;
background-color: rgb(255, 255, 255);
}
.phone {
font-size: 16px;
line-height: 28.8px;
}
.contact_logo {
margin-top: 30px;
margin-bottom: 50px;
img {
width: 500px;
}
}
}
}
</style>

View File

@ -18,7 +18,7 @@
</ul>
</div>
<div class="up_right">
<img style="width: 100px; height: 100px" src="@/assets/qr2.jpg" alt=""/>
<img style="width: 100px; height: 100px" :src="footer_qr" alt=""/>
</div>
</el-row>
<el-row type="flex" class="down_footer">
@ -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:{

View File

@ -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) {