Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1

This commit is contained in:
zongzhimin
2018-05-09 14:21:33 +08:00
2 changed files with 17 additions and 23 deletions
+10 -16
View File
@@ -1315,19 +1315,13 @@ input[type=range]::-webkit-slider-thumb {
.contentStart .startImg{width:100%;}
/* 引导页 */
.swiper-container{width:100%;height:100%;background:#fff;z-index:10000;}
.swiper-slide img{margin:0 auto;margin-top:7rem;}
.swiper-slide img.guideImg01{width:90%;}
.swiper-slide img.guideImg02{width:85%;}
.swiper-slide img.guideImg03{width:55%;}
.swiper-slide div{position:absolute;bottom:5rem;width:100%;}
.swiper-slide p{text-align:center;padding:0 1rem;}
.swiper-slide p label{font-size:1rem;}
.swiper-slide p small{font-size:0.7rem;color:#999;}
.swiper-slide div.content-block{bottom:0.5rem;}
.swiper-slide div.content-block .button{width:50%;margin:0 auto;height:2.1rem;line-height:2rem;}
.swiper-pagination-bullet{width:10px;height:10px;background:#D7D7D7;opacity:1;}
.swiper-pagination-bullet-active{width:22px;height:10px;background:#F18D00;border-radius:0.3rem;}
.guideSwiper.swiper-container{width:100%;height:100%;background:#fff;z-index:10000;}
.guideSwiper .swiper-slide img{width:100%;}
.guideSwiper .swiper-slide div{position:absolute;bottom:5rem;width:100%;}
.guideSwiper .swiper-slide div.content-block{bottom:0.5rem;}
.guideSwiper .swiper-slide div.content-block .button{width:50%;margin:0 auto;height:2.1rem;line-height:2rem;}
.guideSwiper .swiper-pagination-bullet{width:10px;height:10px;background:#D7D7D7;opacity:1;}
.guideSwiper .swiper-pagination-bullet-active{width:22px;height:10px;background:#F18D00;border-radius:0.3rem;}
/* 字体图标 */
@font-face {font-family: "iconfont";
@@ -1423,9 +1417,9 @@ input[type=range]::-webkit-slider-thumb {
@media(min-height:750px){
.bar-tab{bottom:1.7rem;}
.bar-tab ~ .content{bottom:4.2rem;}
.swiper-slide div{bottom:12rem;}
.swiper-slide div.content-block{bottom:5rem;}
.swiper-container-horizontal>.swiper-pagination{bottom:4rem;}
.guideSwiper .swiper-slide div{bottom:12rem;}
.guideSwiper .swiper-slide div.content-block{bottom:5rem;}
.guideSwiper.swiper-container-horizontal >.swiper-pagination{bottom:4rem;}
}
@media only screen and (-webkit-min-device-pixel-ratio:2){
.list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
+7 -7
View File
@@ -20,16 +20,16 @@
<div class="page-group" id="app">
<div class="swiper-container guideSwiper dn" data-space-between="10">
<div class="swiper-wrapper">
<div class="swiper-slide" v-for="(img,index) in guideImgs">
<img v-bind:src="img" class="guideImg01">
<div class="content-block" v-if="index==guideImgs.length-1">
<p><a class="button button-big theme">开启有房之旅</a></p>
<div class="swiper-wrapper">
<div class="swiper-slide" v-for="(img,index) in guideImgs">
<img v-bind:src="img">
<div class="content-block" v-if="index==guideImgs.length-1">
<p><a class="button button-big theme">开启有房之旅</a></p>
</div>
</div>
</div>
<div class="swiper-pagination"></div>
</div>
<div class="swiper-pagination"></div>
</div>
<div class="page page-current">
<div class="content contentStart">
<a class="time" @click="skip()">跳过 <span id="time">5</span></a>