Showing
5 changed files
with
25 additions
and
6 deletions
@@ -41,6 +41,14 @@ | @@ -41,6 +41,14 @@ | ||
41 | <p class="name">{{tagName}}3</p> | 41 | <p class="name">{{tagName}}3</p> |
42 | </a> | 42 | </a> |
43 | {{/ tags}} | 43 | {{/ tags}} |
44 | + {{# tags}} | ||
45 | + {{#if @first}} | ||
46 | + <a href="{{avatarUrl}}"> | ||
47 | + <div data-avatar="{{image cover 100 100}}" class="rank-avatar" ></div> | ||
48 | + <p class="name">{{tagName}}1</p> | ||
49 | + </a> | ||
50 | + {{/if}} | ||
51 | + {{/ tags}} | ||
44 | </div> | 52 | </div> |
45 | {{!-- {{#if isSwiper}} | 53 | {{!-- {{#if isSwiper}} |
46 | <div class="article-avatar-swiper"> | 54 | <div class="article-avatar-swiper"> |
@@ -232,6 +232,10 @@ starIScroll.iScroll.on('scroll', function() { | @@ -232,6 +232,10 @@ starIScroll.iScroll.on('scroll', function() { | ||
232 | // starIScroll.iScroll.refresh(); | 232 | // starIScroll.iScroll.refresh(); |
233 | } | 233 | } |
234 | 234 | ||
235 | + console.log(this); | ||
236 | + | ||
237 | + $window.trigger('scroll'); | ||
238 | + | ||
235 | // if ($avatarWrap.offset().top <= headTabH) { | 239 | // if ($avatarWrap.offset().top <= headTabH) { |
236 | // $avatarClone.show(); | 240 | // $avatarClone.show(); |
237 | // | 241 | // |
@@ -35,7 +35,7 @@ function PullRefresh(seclector, options) { | @@ -35,7 +35,7 @@ function PullRefresh(seclector, options) { | ||
35 | 35 | ||
36 | this.iScroll = new IScroll($em.get(0), { | 36 | this.iScroll = new IScroll($em.get(0), { |
37 | click: true, | 37 | click: true, |
38 | - probeType: 3 | 38 | + probeType: 2 |
39 | }); | 39 | }); |
40 | 40 | ||
41 | this.iScroll.on('scrollStart', function() { | 41 | this.iScroll.on('scrollStart', function() { |
1 | @keyframes avatar { | 1 | @keyframes avatar { |
2 | - 25% { | 2 | + 0% { |
3 | transform: translate3d(0, 0, 0); | 3 | transform: translate3d(0, 0, 0); |
4 | } | 4 | } |
5 | 5 | ||
6 | - 50% { | 6 | + 33% { |
7 | transform: translate3d(-120px, 0, 0); | 7 | transform: translate3d(-120px, 0, 0); |
8 | } | 8 | } |
9 | 9 | ||
10 | - 75% { | 10 | + 66% { |
11 | transform: translate3d(-240px, 0, 0); | 11 | transform: translate3d(-240px, 0, 0); |
12 | } | 12 | } |
13 | + | ||
14 | + 100% { | ||
15 | + transform: translate3d(-360px, 0, 0); | ||
16 | + } | ||
13 | } | 17 | } |
14 | 18 | ||
15 | .star-page { | 19 | .star-page { |
@@ -201,7 +205,8 @@ | @@ -201,7 +205,8 @@ | ||
201 | } | 205 | } |
202 | 206 | ||
203 | .star-avatar { | 207 | .star-avatar { |
204 | - width: 134px; | 208 | + width: 120px; |
209 | + margin-right: 20px; | ||
205 | box-sizing: border-box; | 210 | box-sizing: border-box; |
206 | float: left; | 211 | float: left; |
207 | overflow: hidden; | 212 | overflow: hidden; |
@@ -209,11 +214,13 @@ | @@ -209,11 +214,13 @@ | ||
209 | .avatar-wrap { | 214 | .avatar-wrap { |
210 | white-space: nowrap; | 215 | white-space: nowrap; |
211 | animation: avatar 6s infinite; | 216 | animation: avatar 6s infinite; |
217 | + font-size: 0; | ||
212 | } | 218 | } |
213 | 219 | ||
214 | a { | 220 | a { |
215 | display: inline-block; | 221 | display: inline-block; |
216 | padding: 8px; | 222 | padding: 8px; |
223 | + width: 120px; | ||
217 | } | 224 | } |
218 | 225 | ||
219 | .article-avatar-swiper { | 226 | .article-avatar-swiper { |
-
Please register or login to post a comment