Skip to content

Commit

Permalink
second merge
Browse files Browse the repository at this point in the history
  • Loading branch information
lovinglili committed Nov 13, 2018
2 parents 7c1577d + e04c05a commit 11667bf
Show file tree
Hide file tree
Showing 17 changed files with 517 additions and 100 deletions.
3 changes: 1 addition & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- <meta name="viewport" content="initial-scale=1.0"> -->
<!-- <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> -->
<!-- <meta name="viewport" content="width=device-width initial-scale=1.0"> -->
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="stylesheet" href="/libs/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/libs/stylesheets/animate.css">
Expand Down
2 changes: 2 additions & 0 deletions src/components/commons/home/BannerDown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export default {
},
methods:{
goToList(categories){
// this.$router.push({params:{id:123},query:{name:categories}})
this.$router.push({name:'bannernav',params:{id:123},query:{name:categories}})
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/commons/home/HomeBanner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<swiper v-if= "billboards.length" :options="swiperOption" ref="mySwiper" >
<swiper-slide v-for= '(billboard ,index) in billboards' :key= 'index'>

<img width='100%' :src= 'billboard.MediaUrl' title= '' alt= ''>
<img width='100%' :src= 'billboard.MediaUrl ? billboard.MediaUrl : billboard.ImgUrl' title= '' alt= ''>
</swiper-slide>

<div class="swiper-scrollbar scrollWidth" slot="scrollbar"></div>
<!-- <slot name="scrollbar" ></slot> -->
<div class="swiper-scrollbar scrollWidth" slot="scrollbar"></div>
</swiper>

</div>
Expand Down
28 changes: 23 additions & 5 deletions src/components/commons/home/HotOriginal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<p class="hoth2">{{hots.Title}}</p>
<p class="hotp">{{hots.Summary}}</p>
</div> -->
<home-top-words :title="hots.Title" :smallwords="hots.Summary"></home-top-words>
<home-top-words :title="hots.Title " :smallwords="hots.Summary "></home-top-words>

<ul>
<li v-for="(hot,index) in hots.Artworks" :key="index">
<li v-for="(hot,index) in (hots.Artworks ? hots.Artworks:hots.Prints)" :key="index">
<div class="hot-item-img">
<a><img :src="hot.ImgUrl"></a>
<a><img :src=" hot.ImgUrl ? hot.ImgUrl : hot.PreviewImgUrl"></a>
</div>
<div class="hot-item-words">
<i>{{hot.ArtistName}}</i>
Expand All @@ -19,16 +19,19 @@
</div>
</li>
</ul>
<div v-if="isbutton" class="hotMore">
<span>全部造艺作品</span>
</div>
</div>
</template>

<script>
import HomeTopWords from "@c/layout/HomeTopWords"
export default {
props: ["hots"],
props: ["hots","isbutton"],
components:{
HomeTopWords
}
},
};
</script>

Expand Down Expand Up @@ -72,4 +75,19 @@ export default {
}
}
}
.hotMore {
margin-top: -0.533333rem;
width: 100%;
height: 1.333333rem;
line-height: 1.333333rem;
text-align: center;
color: #666666;
font-size: 0.373333rem;
span {
background: url(https://cdn.ywart.com/icon/JianTou/indexJt.png) no-repeat
center right;
background-size: 0.106667rem 0.16rem;
padding-right: 0.24rem;
}
}
</style>
20 changes: 6 additions & 14 deletions src/components/commons/home/MoreUse.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
</div> -->
<home-top-words :title="more.Title" :smallwords="more.Summary"></home-top-words>
<div class="more-content">

<div class="more-img" v-for="(img ,index) in more.Items" :key="index"><img :src="img.ImgUrl"></div>
<div class="go-more"><span>点击查看</span></div>
<single-img :moreImg="more.Items"></single-img>
</div>
<div class="go-more"><span>点击查看</span></div>
</div>


Expand All @@ -19,10 +18,12 @@

<script>
import HomeTopWords from "@c/layout/HomeTopWords"
import SingleImg from "@c/commons/home/zaoyi/SingleImg"
export default {
props: ["moreuse"],
components:{
HomeTopWords
HomeTopWords,
SingleImg
}
};
</script>
Expand All @@ -33,15 +34,7 @@ export default {
margin-top: 0.266667rem;
padding-top: 0.346667rem;
.more-content{
.more-img{
width: 92%;
margin: 0 auto;
margin-top: .4rem;
img{
width:100%;
}
}
.go-more{
margin-top: .666667rem;
text-align: center;
Expand All @@ -54,7 +47,6 @@ export default {
padding-right: .24rem;
}
}
}
}
</style>
1 change: 1 addition & 0 deletions src/components/commons/home/bannerdown/BannerNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
export default {
created(){
console.log(this.$route.query,this.$route.params)
this.$http({
url:"https://www.ywart.com/ajax/index",
method:"POST",
Expand Down
24 changes: 24 additions & 0 deletions src/components/commons/home/zaoyi/SingleImg.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<template>
<div>
<div class="more-img" v-for="(img ,index) in moreImg" :key="index">
<img :src="img.ImgUrl">
</div>
</div>
</template>

<script>
export default {
props: ["moreImg"]
};
</script>

<style lang="scss">
.more-img{
width: 92%;
margin: 0 auto;
margin-top: .4rem;
img{
width:100%;
}
}
</style>
107 changes: 107 additions & 0 deletions src/components/commons/home/zaoyi/ZyWorks.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<template>
<div class="zyworks-container">
<h3>造艺作品</h3>
<ul>
<li class='li_item'>
<div class="li_img">
<a >
<img src="https://cdn.ywart.com/yw/20170210122418979ba81e3c3.jpg_small01">
</a>
</div>
<div class="li_words">
<div class="activity">
<a>囤画节</a>
</div>
<p class="price">¥1232</p>
<div class="woInFo">
<a>泛太克美术纸</a>
<a>,</a>
<a>不变的发生的</a>
</div>
</div>
</li>
</ul>
</div>
</template>

<script>
export default {
props:["indexDatas"]
};
</script>

<style lang="scss">
.zyworks-container {
background: #fff;
margin-top: 0.266667rem;
h3 {
width: 100%;
height: 1.333333rem;
font-weight: bold;
text-align: center;
line-height: 1.333333rem;
font-size: 17px;
margin-bottom: 0.213333rem;
padding-top: 0.213333rem;
}
ul {
width: 98%;
margin: 0 auto;
position: relative;
height: 13.333333rem;
li {
width: 46%;
margin: 3% 2%;
position: absolute;
}
.li_img {
a {
display: block;
img {
width: 100%;
display: block;
}
}
}
.li_words {
padding: 0.266667rem 0 0 0;
.activity {
font-size: 11px;
line-height: 18px;
text-align: right;
margin-bottom: 1px;
a {
color: #f27875;
background: #ffe9e9;
padding: 0 5px;
height: 0.48rem;
text-align: center;
display: inline-block;
margin-left: 0.08rem;
}
}
p.price {
font-size: 12px;
text-align: right;
margin-bottom: 0.026667rem;
}
.woInFo {
color: #666;
text-align: right;
font-size: 0;
a {
color: #666;
font-size: 12px;
display: inline-block;
}
a:last-child,a:first-child {
max-width: 2rem;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
}
}
}
</style>
49 changes: 49 additions & 0 deletions src/components/commons/home/zaoyi/groom.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<template>
<div>
<div class="groom">
<ul>
<li v-for="(billboard,index) in billboards" :key="index">
<div class="imgs">
<img :src="billboard.ImgUrl">
</div>
<p>${{billboard.DisplayName}}</p>
</li>
</ul>
</div>
</div>
</template>

<script>
export default {
props:["billboards"]
}
</script>

<style lang="scss">
.groom{
background: #FFF;
width: 100%;
margin-top:.266667rem;
ul{
display:flex;
justify-content: space-around;
li{
padding-top:.533333rem;
flex:1;
.imgs{
width:70%;
margin:auto;
}
img{
width: 100%;
margin-bottom: .426667rem;
}
p{
text-align: center;
margin-bottom: .533333rem;
font-size: .346667rem;
}
}
}
}
</style>
Loading

0 comments on commit 11667bf

Please sign in to comment.