clay
/
ceramic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: clay:5bf70543dd4ddccb8f1d56c4ba68e8181259c7f3
Branches Tags
clay:master
clay:dj
...
compare: clay:9c900b53a1f54a6b29f7726ee252dbe305a50c14
Branches Tags
clay:dj
clay:master

2 Commits
5bf70543dd ... 9c900b53a1

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
Show Stats Expand all files Collapse all files

BIN
src/assets/qr1.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 87 KiB

BIN
src/assets/qr2.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 86 KiB

29
src/components/AboutUs.vue
View File

@ -21,7 +21,7 @@
</el-row> </el-row>
<el-row :gutter="10" style="padding: 0 5% "> <el-row :gutter="10" style="padding: 0 5% ">
<el-col :span="8" v-for="(imgTextItem,imgTextIndex) in imgTextList" :key="imgTextIndex" <el-col :span="8" v-for="(imgTextItem,imgTextIndex) in imgTextList" :key="imgTextIndex"
:class="'culture_'+imgTextIndex" > :class="'culture_'+imgTextIndex">
<div class="imgAndText" @click="handleChangeMenu(imgTextItem)"> <div class="imgAndText" @click="handleChangeMenu(imgTextItem)">
<a :href="imgTextItem.href"> <a :href="imgTextItem.href">
<span class="pic"> <span class="pic">
@ -83,31 +83,33 @@ export default {
src: require('../assets/index/a1.jpg'), src: require('../assets/index/a1.jpg'),
boldText: 'Brand', boldText: 'Brand',
enText: 'culture', enText: 'culture',
cnTitle: '' cnTitle: '企业简介'
}, { }, {
id: '', id: '',
src: require('../assets/index/a2.jpg'), src: require('../assets/index/a2.jpg'),
boldText: 'Enterprise', boldText: 'Enterprise',
enText: 'viewpoint', enText: 'viewpoint',
cnTitle: '' cnTitle: '企业观点'
}, { }, {
id: '', id: '',
src: require('../assets/index/a3.jpg'), src: require('../assets/index/a3.jpg'),
boldText: 'corporate', boldText: 'corporate',
enText: 'culture', enText: 'culture',
cnTitle: '' cnTitle: '企业文化'
} }
] ]
} }
}, },
created() { created() {
getArticleInfo(1).then(res => { getArticleInfo(1).then(res => {
this.imgTextList[0].id = res.data.articlelist[1].id; if (res.code === 200) {
this.imgTextList[1].id = res.data.articlelist[2].id; const list = res.data.articlelist
this.imgTextList[2].id = res.data.articlelist[3].id; for (let i = 0; i < list.length; i++) {
this.imgTextList[0].cnTitle = res.data.articlelist[1].title; if (list[i].title = this.imgTextList[i].cnTitle) {
this.imgTextList[1].cnTitle = res.data.articlelist[2].title; this.imgTextList[i].id = list[i].id
this.imgTextList[2].cnTitle = res.data.articlelist[3].title; }
}
}
}); });
}, },
methods: { methods: {
@ -124,17 +126,14 @@ export default {
</script> </script>
<style scoped lang="scss"> <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) { @media screen and (max-width: 1660px) {
.aboutUs { .aboutUs {
width: 1200px !important; width: 1200px !important;
} }
.img_innerBox { .img_innerBox {
padding: 20px!important; padding: 20px !important;
}
} }
}
.aboutUs { .aboutUs {
min-width: 1300px; min-width: 1300px;

97
src/components/NewsCenter.vue
View File

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

40
src/views/aboutUs/index.vue
View File

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

15
src/views/attractAndJoin/index.vue
View File

@ -10,14 +10,7 @@
<el-row type="flex"> <el-row type="flex">
<el-col :xs="1" :sm="2" :md="2" :lg="2" :xl="4"></el-col> <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"> <el-col :xs="22" :sm="20" :md="20" :lg="20" :xl="16">
<div class="support"> <div style="padding: 50px 0" v-html="supportList"></div>
<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>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -31,13 +24,13 @@ export default {
name: "index", name: "index",
metaInfo() { metaInfo() {
return { return {
title:'招商加盟 | '+localStorage.getItem('corporate_name') title: '招商加盟 | ' + localStorage.getItem('corporate_name')
}; };
}, },
components: {ProductsTabsItem}, components: {ProductsTabsItem},
data() { data() {
return { return {
classid:4, classid: 4,
joinTab: [], joinTab: [],
supportList: [] supportList: []
}; };
@ -69,7 +62,7 @@ export default {
}, },
methods: { methods: {
//获取数据 //获取数据
getInfo(classId){ getInfo(classId) {
getArticleInfo(classId).then(res => { getArticleInfo(classId).then(res => {
this.joinTab = res.data.articlelist; this.joinTab = res.data.articlelist;
this.supportList = res.data.articleinfo.content; this.supportList = res.data.articleinfo.content;

74
src/views/contactUs/index.vue
View File

@ -6,48 +6,38 @@
</div> </div>
<!--标签栏 --> <!--标签栏 -->
<ProductsTabsItem :tab-list="contactTabs"/> <ProductsTabsItem :tab-list="contactTabs"/>
<el-row type="flex">
<div class="contact_content"> <el-col :xs="1" :sm="2" :md="2" :lg="2" :xl="4"></el-col>
<p class="title"> <el-col :xs="22" :sm="20" :md="20" :lg="20" :xl="16">
<strong>{{ corporate_name }}</strong> <div v-html="contactList"></div>
</p> </el-col>
<p class="address"> </el-row>
地址：{{ corporate_add }}
</p>
<p class="phone">电话：{{ tel }}</p>
<div class="contact_logo">
<img src="@/assets/qr1.jpg" alt=""/>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
import ProductsTabsItem from "@/components/ProductsTabsItem"; import ProductsTabsItem from "@/components/ProductsTabsItem";
import {getPublicData} from "@/api"; import {getArticleInfo} from "@/api";
export default { export default {
name: "index", name: "index",
metaInfo() { metaInfo() {
return { return {
title:'联系我们 | '+localStorage.getItem('corporate_name') title: '联系我们 | ' + localStorage.getItem('corporate_name')
}; };
}, },
components: {ProductsTabsItem}, components: {ProductsTabsItem},
data() { data() {
return { return {
contactTabs: [], contactTabs: [],
corporate_name: "", contactList: ''
corporate_add: "",
tel: ""
}; };
}, },
mounted() { mounted() {
getPublicData().then(res => { getArticleInfo(5).then(res => {
this.corporate_name = res.data.corporate_name; console.log('res', res)
this.corporate_add = res.data.corporate_add; this.contactList = res.data.articleinfo.content;
this.tel = res.data.tel; this.contactTabs = res.data.articlelist;
this.contactTabs = res.data.contact_us;
}); });
} }
}; };
@ -59,46 +49,12 @@ export default {
.contact_us_bg { .contact_us_bg {
height: 360px; height: 360px;
img{
img {
width: 100%; width: 100%;
height: 360px; height: 360px;
object-fit: cover; 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> </style>

18
src/views/footer/index.vue
View File

@ -18,7 +18,7 @@
</ul> </ul>
</div> </div>
<div class="up_right"> <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> </div>
</el-row> </el-row>
<el-row type="flex" class="down_footer"> <el-row type="flex" class="down_footer">
@ -44,6 +44,7 @@ export default {
data() { data() {
return { return {
logo: "", logo: "",
footer_qr:'',
corporate_name: "", corporate_name: "",
corporate_add: "", corporate_add: "",
footerList: [ footerList: [
@ -97,12 +98,15 @@ export default {
}, },
mounted() { mounted() {
getPublicData().then(res => { getPublicData().then(res => {
this.logo = res.data.logo; if(res.code===200){
this.corporate_name = res.data.corporate_name; this.logo = res.data.logo;
this.corporate_add = res.data.corporate_add; this.footer_qr = res.data.footer_qr;
this.footerList[0].items=res.data.aboutus this.corporate_name = res.data.corporate_name;
this.footerList[3].items=res.data.join this.corporate_add = res.data.corporate_add;
this.footerList[4].items=res.data.contact_us this.footerList[0].items=res.data.aboutus
this.footerList[3].items=res.data.join
this.footerList[4].items=res.data.contact_us
}
}); });
}, },
methods:{ methods:{

59
src/views/productsCenter/index.vue
View File

@ -75,8 +75,7 @@ export default {
watch: { watch: {
$route(to) { $route(to) {
//点击产品中心的一级分类切换 //点击产品中心的一级分类切换
if (to.query.menu !== undefined && to.query.classify === undefined && to.query.style === undefined && to.query.space === undefined) { if (to.query.menu != undefined && to.query.classify == undefined && to.query.style == undefined && to.query.space == undefined) {
console.log("点击产品中心的一级分类切换");
//改变二级分类 //改变二级分类
for (let i = 0; i < this.productTabs.length; i++) { for (let i = 0; i < this.productTabs.length; i++) {
if (this.productTabs[i].id == to.query.menu) { if (this.productTabs[i].id == to.query.menu) {
@ -85,37 +84,39 @@ export default {
} }
this.getCategory(to.query.menu); 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.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);
if (to.query.style == "全部") { 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 { } else if (to.query.classify != 0) {
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);
if (to.query.style == "全部") { 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.getCategory(index);
this.getGoodsList(index, 1, this.pageSize); this.getList(index, 1, this.pageSize);
}, },
//产品分页 //产品分页
handleChangePage(value) { handleChangePage(value) {
this.getGoodsList(this.classIndex, value, this.pageSize); this.getList(this.classIndex, value, this.pageSize);
}, },
//点击二级分类,筛选产品数据 //点击二级分类,筛选产品数据
changeClassify(item) { changeClassify(item) {