Authored by ccbikai

Merge branch 'master' into release/4.6

... ... @@ -35,7 +35,6 @@ function PullRefresh(seclector, options) {
this.iScroll = new IScroll($em.get(0), {
click: true,
bounce: false,
probeType: 3
});
... ...
... ... @@ -121,6 +121,7 @@
}
.star-main {
position: relative;
margin-top: 88px;
}
... ... @@ -390,11 +391,15 @@
}
.loading-tip {
position: absolute;
top: 0;
left: 50%;
transform: translate(-50%, 0);
padding: 30px 0;
display: none;
text-align: center;
color: #ccc;
font-size: 18px;
margin: 30px 0;
}
.swiper-num {
... ...