Authored by ccbikai

Merge branch 'master' into release/4.8

1 { 1 {
2 - "extends": "stylelint-config-yoho" 2 + "extends": "stylelint-config-yoho",
  3 + "rules": {
  4 + "string-quotes": "double"
  5 + }
3 } 6 }
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 <div class="artice-cont"> 50 <div class="artice-cont">
51 <p>{{articeTxt}}</p> 51 <p>{{articeTxt}}</p>
52 <div class="artice-imgs-area"> 52 <div class="artice-imgs-area">
53 - <img src="{{image src 266 266}}" /> 53 + <img data-original="{{image src 266 266}}" class="lazy" />
54 54
55 {{!-- <ul class="artice-imgs"> 55 {{!-- <ul class="artice-imgs">
56 {{#each articeImg}} 56 {{#each articeImg}}
@@ -163,10 +163,6 @@ function setIndexAction() { @@ -163,10 +163,6 @@ function setIndexAction() {
163 $('#yoho-header, .head-tab').on('touchmove', function() { 163 $('#yoho-header, .head-tab').on('touchmove', function() {
164 return false; 164 return false;
165 }); 165 });
166 -  
167 - $('img').on('load', function() {  
168 - starIScroll.iScroll.refresh();  
169 - });  
170 } 166 }
171 167
172 function initAction() { 168 function initAction() {
@@ -242,6 +238,10 @@ starIScroll.iScroll.on('scrollStart', function() { @@ -242,6 +238,10 @@ starIScroll.iScroll.on('scrollStart', function() {
242 }); 238 });
243 239
244 starIScroll.iScroll.on('scroll', function() { 240 starIScroll.iScroll.on('scroll', function() {
  241 + if (this.directionY !== -1) {
  242 + starIScroll.iScroll.refresh();
  243 + }
  244 +
245 if ($avatarWrap.offset().top <= headTabH) { 245 if ($avatarWrap.offset().top <= headTabH) {
246 $avatarClone.show(); 246 $avatarClone.show();
247 247
@@ -278,6 +278,10 @@ starIScroll.iScroll.on('scrollEnd', function() { @@ -278,6 +278,10 @@ starIScroll.iScroll.on('scrollEnd', function() {
278 $loadingTip.slideUp(); 278 $loadingTip.slideUp();
279 }); 279 });
280 280
  281 +$('img').on('load', function() {
  282 + starIScroll && starIScroll.iScroll.refresh();
  283 +});
  284 +
281 window.setCookie('guangStarUid', window.queryString.uid); 285 window.setCookie('guangStarUid', window.queryString.uid);
282 286
283 // 明星动态文章图片相关操作 287 // 明星动态文章图片相关操作