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

Compare commits

base: clay:2faacc412e6fabe4358a96d70125eb6d75e6dd23
Branches Tags
clay:master
clay:dj
..
compare: clay:3d08b47ed1efcd452f2d61d6e2f30ea6d5c090ae
Branches Tags
clay:dj
clay:master

No commits in common. "2faacc412e6fabe4358a96d70125eb6d75e6dd23" and "3d08b47ed1efcd452f2d61d6e2f30ea6d5c090ae" have entirely different histories.
2faacc412e ... 3d08b47ed1

10 changed files with 158 additions and 222 deletions
Show Stats Expand all files Collapse all files

1
src/App.vue
View File

@ -42,7 +42,6 @@ export default {
*{ *{
padding: 0; padding: 0;
margin: 0; margin: 0;
font: 14px/1.8 "微软正黑体","Microsoft JhengHei","Microsoft Yahei","微软雅黑","Hiragino Sans GB","冬青黑体","Arial","Helvetica","SimHei","黑体","STXihei","华文细黑",sans-serif;
} }
a{ a{
width: 100%; width: 100%;

1
src/components/AboutUs.vue
View File

@ -105,7 +105,6 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.aboutUs { .aboutUs {
min-width: 1300px;
margin-bottom: 50px; margin-bottom: 50px;
.about_title { .about_title {

5
src/components/Carousel.vue
View File

@ -1,4 +1,6 @@
<template> <template>
<el-row>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
<div class="slideshow"> <div class="slideshow">
<el-carousel trigger="click" height="36.2vw"> <el-carousel trigger="click" height="36.2vw">
<el-carousel-item v-for="(item,index) in bannerDate" :key="index"> <el-carousel-item v-for="(item,index) in bannerDate" :key="index">
@ -8,6 +10,8 @@
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
</el-col>
</el-row>
</template> </template>
<script> <script>
@ -33,7 +37,6 @@ export default {
<style scoped> <style scoped>
.slideshow { .slideshow {
width: 100%; width: 100%;
min-width: 1300px;
} }
img { img {

47
src/components/FastFindProducts.vue
View File

@ -1,7 +1,10 @@
<template> <template>
<div style="min-width: 1300px"> <div>
<div style=" border-top: 1px solid #e9e9e9;border-bottom: 1px solid #e9e9e9;"> <div class="fastFind">
<el-row class="fastFind"> <el-row type="flex">
<el-col :span="4">
</el-col>
<el-col :span="16">
<div class="fast_left"> <div class="fast_left">
<p> <p>
快速查找产品 快速查找产品
@ -23,10 +26,14 @@
</li> </li>
</ul> </ul>
</div> </div>
</el-col>
</el-row> </el-row>
</div> </div>
<div style="border-bottom: 1px solid #e9e9e9;"> <div class="classify">
<el-row class="classify"> <el-row type="flex">
<el-col :span="4">
</el-col>
<el-col :span="16">
<div :id="'bok_'+findIndex" v-for="(findItem,findIndex) in findList" :key="findIndex"> <div :id="'bok_'+findIndex" v-for="(findItem,findIndex) in findList" :key="findIndex">
<ul> <ul>
<li v-for="(childrenItem,childrenIndex) in findItem.children" :key="childrenIndex"> <li v-for="(childrenItem,childrenIndex) in findItem.children" :key="childrenIndex">
@ -36,6 +43,7 @@
</li> </li>
</ul> </ul>
</div> </div>
</el-col>
</el-row> </el-row>
</div> </div>
</div> </div>
@ -192,32 +200,13 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@media screen and (max-width: 1660px) {
.fastFind {
width: 1230px !important;
}
.classify {
width: 1230px !important;
}
}
@media screen and (max-width: 1480px) {
.fastFind {
width: 1100px !important;
}
.classify {
width: 1100px !important;
}
}
.current { .current {
background: #eeeeee; background: #eeeeee;
} }
.fastFind { .fastFind {
width: 1360px; border-top: 1px solid #e9e9e9;
margin: 0 auto; border-bottom: 1px solid #e9e9e9;
background-color: #ffffff; background-color: #ffffff;
.fast_left { .fast_left {
@ -272,9 +261,10 @@ export default {
} }
.classify { .classify {
width: 1360px;
margin: 0 auto;
padding: 15px 0; padding: 15px 0;
height: 30px;
line-height: 30px;
border-bottom: 1px solid #e9e9e9;
#bok_1 { #bok_1 {
display: none; display: none;
@ -293,7 +283,6 @@ export default {
color: #333; color: #333;
margin-right: 25px; margin-right: 25px;
} }
> a:hover { > a:hover {
text-decoration: underline; text-decoration: underline;
} }

3
src/components/NewsCenter.vue
View File

@ -100,9 +100,8 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.newsCenter { .newsCenter {
min-width: 1300px;
.news_bg { .news_bg {
//min-width: 1300px; margin: 0 60px;
background: #ffffff url('http://www.yipengtaoci.com/upfiles/images/20181214/15447660862344831.jpg') no-repeat center 0; background: #ffffff url('http://www.yipengtaoci.com/upfiles/images/20181214/15447660862344831.jpg') no-repeat center 0;
background-size: cover; background-size: cover;
height: 380px; height: 380px;

17
src/components/ProductsClassify.vue
View File

@ -1,10 +1,9 @@
<template> <template>
<div class="grid"> <div class="grid">
<el-row type="flex"> <el-row type="flex">
<el-col :xs="1" :sm="1" :md="2" :lg="4" :xl="4"> <el-col :span="4">
</el-col> </el-col>
<el-col :xs="22" :sm="22" :md="20" :lg="16" :xl="16"> <el-col :span="16">
<el-row>
<el-col :span="8"> <el-col :span="8">
<div class="grid_left"> <div class="grid_left">
<a href=""> <a href="">
@ -30,7 +29,6 @@
</ul> </ul>
</div> </div>
</el-col> </el-col>
</el-row>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -78,18 +76,23 @@ export default {
opacity: 1; opacity: 1;
} }
//.grid_left:hover span:nth-child(2) {
// //background-color: red;
//}
.grid_left { .grid_left {
position: relative; position: relative;
display: inline-block; display: inline-block;
transition: all 0.6s; transition: all 0.6s;
a { a {
.pic { .pic {
img { img {
width: 440px; width: 440px;
//z-index: 9;
} }
} }
span:last-child { span:last-child {
color: #fff; color: #fff;
position: absolute; position: absolute;
@ -104,6 +107,7 @@ export default {
text-align: center; text-align: center;
background-color: #de832f; background-color: #de832f;
border-radius: 100px 100px 100px 100px; border-radius: 100px 100px 100px 100px;
//z-index: 999;
} }
} }
} }
@ -154,8 +158,7 @@ export default {
overflow: hidden; overflow: hidden;
transition: all 0.6s; transition: all 0.6s;
} }
img:hover{
img:hover {
filter: brightness(85%); filter: brightness(85%);
opacity: 1; opacity: 1;
} }

17
src/components/ProductsShow.vue
View File

@ -11,10 +11,10 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex" style="width: 987px;margin: 0 auto"> <el-row type="flex">
<!-- <el-col :span="4">--> <el-col :span="4">
<!-- </el-col>--> </el-col>
<!-- <el-col :span="16" class="tagRow">--> <el-col :span="16" class="tagRow">
<div> <div>
<el-tag <el-tag
v-for="item in tagItems" v-for="item in tagItems"
@ -23,8 +23,9 @@
<a :href="item.href">{{ item.title }}</a> <a :href="item.href">{{ item.title }}</a>
</el-tag> </el-tag>
</div> </div>
<!-- </el-col>--> </el-col>
</el-row> </el-row>
</div> </div>
</template> </template>
@ -80,14 +81,9 @@ export default {
background-color: #333; background-color: #333;
a{ a{
color: #fff; color: #fff;
} }
} }
.el-tag:last-child{
margin-right: 0;
}
.el-tag { .el-tag {
border: none; border: none;
margin-right: 10px; margin-right: 10px;
padding: 0 12px; padding: 0 12px;
@ -99,7 +95,6 @@ export default {
} }
} }
.product_show { .product_show {
min-width: 1300px;
padding: 60px 0 60px 0; padding: 60px 0 60px 0;
border-top: 1px solid #e9e9e9; border-top: 1px solid #e9e9e9;
background-color: #f1f1f1; background-color: #f1f1f1;

23
src/components/ProjectCase.vue
View File

@ -70,31 +70,10 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
//@media screen and (max-width: 1660px) {
// .pics {
// img {
// height: 221px!important;
// }
// }
// .case_example {
// width: 1230px !important;
// }
//}
//
//@media screen and (max-width: 1480px) {
// .pics {
// img {
// height: 196px!important;
// }
// }
// .case_example {
// width: 1100px !important;
// }
//}
.projectCase { .projectCase {
height: 970px; height: 970px;
.case_bg { .case_bg {
min-width: 1300px; margin: 0 60px;
background: #ffffff url('http://www.yipengtaoci.com/images/cbg0.jpg') no-repeat center 0; background: #ffffff url('http://www.yipengtaoci.com/images/cbg0.jpg') no-repeat center 0;
background-size: cover; background-size: cover;
height: 540px; height: 540px;

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

@ -1,6 +1,9 @@
<template> <template>
<div class="footer_bg"> <div class="footer_bg">
<el-row type="flex" class="up_footer"> <el-row type="flex" class="up_footer">
<el-col :span="4">
</el-col>
<el-col :span="16">
<div class="up_left"> <div class="up_left">
<el-image <el-image
style="margin-bottom: 15px" style="margin-bottom: 15px"
@ -24,6 +27,7 @@
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
src="http://www.yipengtaoci.com/upfiles/images/20200706/15940289752944272.jpg"></el-image> src="http://www.yipengtaoci.com/upfiles/images/20200706/15940289752944272.jpg"></el-image>
</div> </div>
</el-col>
</el-row> </el-row>
<el-row type="flex" class="down_footer"> <el-row type="flex" class="down_footer">
<el-col :span="3"> <el-col :span="3">
@ -111,27 +115,16 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@media screen and (max-width: 1660px) {
.up_footer {
width: 1230px!important;
}
}
@media screen and (max-width: 1480px) {
.up_footer {
width: 1100px!important;
}
}
.footer_bg { .footer_bg {
height: 276px; height: 276px;
width: 100%; width: 100%;
background-color: #111; background-color: #111;
color: #fff; color: #fff;
min-width: 1300px;
.up_footer { .up_footer {
position: relative;
width: 1360px;
margin: 0 auto;
color: #fff; color: #fff;
width: 100%;
float: left;
padding: 50px 0 50px; padding: 50px 0 50px;
font-size: 12px; font-size: 12px;
@ -187,8 +180,7 @@ export default {
} }
.up_right { .up_right {
position: absolute; float: right;
right: 0;
} }
} }

58
src/views/header/index.vue
View File

@ -1,17 +1,22 @@
<template> <template>
<div style="min-width: 1300px"> <div>
<div class="header_bg" id="header_bg"> <div class="header_bg" id="header_bg">
<div class="upHeaderBox"> <el-row type="flex" class="up_header">
<div class="up_header"> <el-col :span="4">
</el-col>
<el-col :span="16" style="z-index: 400;">
<span class="up_left"> <span class="up_left">
艺鹏瓷砖 —— 拒绝千篇一律，艺术无处不在 艺鹏瓷砖 —— 拒绝千篇一律，艺术无处不在
</span> </span>
<span class="up_right"> <span class="up_right">
广东祥睿陶瓷有限公司 广东祥睿陶瓷有限公司
</span> </span>
</div> </el-col>
</div> </el-row>
<div class="down_header"> <el-row type="flex" class="down_header">
<el-col :span="4">
</el-col>
<el-col :span="16">
<div class="down_left"> <div class="down_left">
<a href="/"> <a href="/">
<el-image <el-image
@ -34,7 +39,8 @@
</li> </li>
</ul> </ul>
</div> </div>
</div> </el-col>
</el-row>
</div> </div>
<div class="search_header" id="search_header"> <div class="search_header" id="search_header">
<div class="headerItems"> <div class="headerItems">
@ -193,28 +199,6 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@media screen and (max-width: 1660px) {
.down_header {
width: 1230px!important;
}
.up_header {
width: 1230px!important;
}
.headerItems {
width: 1230px!important;
}
}
@media screen and (max-width: 1480px) {
.down_header {
width: 1100px!important;
}
.up_header {
width: 1100px!important;
}
.headerItems {
width: 1100px!important;
}
}
.header_bg { .header_bg {
transition: all 0.6s; transition: all 0.6s;
height: 130px; height: 130px;
@ -222,13 +206,8 @@ export default {
background-color: #111; background-color: #111;
color: #fff; color: #fff;
.upHeaderBox {
width: 100%;
border-bottom: 1px solid #333;
.up_header { .up_header {
width: 1360px; border-bottom: 1px solid #333;
margin: 0 auto;
height: 36px; height: 36px;
.up_left { .up_left {
@ -248,12 +227,11 @@ export default {
font-size: 12px; font-size: 12px;
} }
} }
}
.down_header { .down_header {
width: 1360px;
margin: 0 auto;
position: relative; position: relative;
width: 100%;
float: left;
padding: 4px 0; padding: 4px 0;
z-index: 30; z-index: 30;
@ -343,13 +321,13 @@ export default {
.headerItems { .headerItems {
position: relative; position: relative;
padding: 8px 0; padding: 8px 0;
width: 1360px; width: 66%;
margin: 0 auto; margin: 0 auto;
ul { ul {
display: flex; display: flex;
width: 100%; width: 100%;
padding-left: 50px; padding-left: 100px;
li { li {
position: relative; position: relative;