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

@ -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,9 +126,6 @@ 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;

View File

@ -1,5 +1,6 @@
<template>
<div class="newsCenter">
<a href="/about_us">
<div class="news_bg">
<!-- <div class="news_title">-->
<!-- <div>MENGBILI</div>-->
@ -10,6 +11,7 @@
<!-- </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>
@ -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>

View File

@ -6,25 +6,18 @@
</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",
@ -37,17 +30,14 @@ export default {
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 {
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 => {
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,8 +84,8 @@ export default {
}
this.getCategory(to.query.menu);
//
this.getList(to.query.menu, 1, this.pageSize);
}
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, to.query.space);
@ -117,6 +116,8 @@ export default {
}
}
}
}
},
//,
beforeUpdate() {
@ -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) {