Showing
6 changed files
with
27 additions
and
24 deletions
@@ -136,9 +136,10 @@ const _processDetailData = (list) => { | @@ -136,9 +136,10 @@ const _processDetailData = (list) => { | ||
136 | if (data.share && data.share.url) { | 136 | if (data.share && data.share.url) { |
137 | data.share.url = _processShareUrl(data); | 137 | data.share.url = _processShareUrl(data); |
138 | } | 138 | } |
139 | - let urlObj = url.parse(data.url); | ||
140 | - let appUrl = `&openby:yohobuy={"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"${ urlObj.protocol + '//' + urlObj.host + urlObj.pathname}","param":${JSON.stringify(qs.parse(urlObj.query))}}}`.replace(/\//g, '\/'); // eslint-disable-line | ||
141 | 139 | ||
140 | + let urlObj = url.parse(data.url); | ||
141 | + let qsObj = qs.parse(urlObj.query); | ||
142 | + let appUrl = `&openby:yohobuy={"action":"go.h5","params":{"shareparam":{"id":"${qsObj.id}"},"share":"/guang/api/v1/share/guang","id":"${qsObj.id}","islogin":"N","type":1,"updateflag":"N","url":"${ urlObj.protocol + '//' + urlObj.host + urlObj.pathname}","param":${JSON.stringify(qs.parse(urlObj.query))}}}`.replace(/\//g, '\/'); // eslint-disable-line | ||
142 | data.url += appUrl; | 143 | data.url += appUrl; |
143 | formatData.push(data); | 144 | formatData.push(data); |
144 | }); | 145 | }); |
@@ -164,7 +165,6 @@ const _processCollocationData = (list) => { | @@ -164,7 +165,6 @@ const _processCollocationData = (list) => { | ||
164 | } | 165 | } |
165 | formatData.push(data); | 166 | formatData.push(data); |
166 | }); | 167 | }); |
167 | - | ||
168 | return formatData; | 168 | return formatData; |
169 | }; | 169 | }; |
170 | 170 |
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | <ul class="clearfix swiper-wrapper"> | 12 | <ul class="clearfix swiper-wrapper"> |
13 | {{# starAvatar}} | 13 | {{# starAvatar}} |
14 | <li class="swiper-slide"> | 14 | <li class="swiper-slide"> |
15 | - <a href='{{url}}'><img src="{{image cover 180 180}}" /></a> | 15 | + <a href='{{url}}' data-avatar="{{image cover 180 180}}" class="rank-avatar"></a> |
16 | </li> | 16 | </li> |
17 | {{/ starAvatar}} | 17 | {{/ starAvatar}} |
18 | </ul> | 18 | </ul> |
@@ -11,11 +11,11 @@ | @@ -11,11 +11,11 @@ | ||
11 | <div class="count-area"> | 11 | <div class="count-area"> |
12 | <span class="time"><i class="iconfont time-ico"></i>{{publishTime}}</span> | 12 | <span class="time"><i class="iconfont time-ico"></i>{{publishTime}}</span> |
13 | <span class="see"><i class="iconfont see-ico"></i>{{viewsNum}}</span> | 13 | <span class="see"><i class="iconfont see-ico"></i>{{viewsNum}}</span> |
14 | - {{#if ../isApp}} | ||
15 | - {{#if share.url}} | ||
16 | - <a href="{{share.url}}" class="iconfont forward"></a> | ||
17 | - {{/if}} | 14 | + |
15 | + {{#if share.url}} | ||
16 | + <a href="{{share.url}}" class="iconfont forward"></a> | ||
18 | {{/if}} | 17 | {{/if}} |
18 | + | ||
19 | <span class="collection"><i class="iconfont collected-ico {{#isCollected}} collected {{/isCollected}}"></i></span> | 19 | <span class="collection"><i class="iconfont collected-ico {{#isCollected}} collected {{/isCollected}}"></i></span> |
20 | </div> | 20 | </div> |
21 | </div> | 21 | </div> |
@@ -13,8 +13,8 @@ module.exports = { | @@ -13,8 +13,8 @@ module.exports = { | ||
13 | port: 6001, | 13 | port: 6001, |
14 | siteUrl: '//m.yohobuy.com', | 14 | siteUrl: '//m.yohobuy.com', |
15 | domains: { | 15 | domains: { |
16 | - api: 'http://testapi.yoho.cn:28078/', | ||
17 | - service: 'http://testservice.yoho.cn:28077/' | 16 | + api: 'http://api.yoho.yohoops.org/', |
17 | + service: 'http://service.yoho.yohoops.org/' | ||
18 | }, | 18 | }, |
19 | useOneapm: false, | 19 | useOneapm: false, |
20 | useCache: false, | 20 | useCache: false, |
@@ -52,13 +52,15 @@ function setAvatar($userAvatar) { | @@ -52,13 +52,15 @@ function setAvatar($userAvatar) { | ||
52 | // 部分老用户没有头像,显示默认头像 | 52 | // 部分老用户没有头像,显示默认头像 |
53 | avatar = $userAvatar.data('avatar'); | 53 | avatar = $userAvatar.data('avatar'); |
54 | 54 | ||
55 | - if (avatar) { | ||
56 | - myImage.src = avatar; | ||
57 | - } | ||
58 | - | ||
59 | myImage.onload = function() { | 55 | myImage.onload = function() { |
60 | $userAvatar.css('background-image', 'url(' + avatar + ')'); | 56 | $userAvatar.css('background-image', 'url(' + avatar + ')'); |
61 | }; | 57 | }; |
58 | + | ||
59 | + if (avatar) { | ||
60 | + myImage.src = avatar; | ||
61 | + } else { | ||
62 | + $userAvatar.addClass('default-avater'); | ||
63 | + } | ||
62 | } | 64 | } |
63 | 65 | ||
64 | 66 | ||
@@ -80,23 +82,18 @@ function bindAvatar(dom) { | @@ -80,23 +82,18 @@ function bindAvatar(dom) { | ||
80 | 82 | ||
81 | return false; | 83 | return false; |
82 | } | 84 | } |
83 | - | ||
84 | - // else if (window.queryString.app_version) { | ||
85 | - // return false; | ||
86 | - // } | ||
87 | } | 85 | } |
88 | 86 | ||
89 | function setIndexAction() { | 87 | function setIndexAction() { |
90 | var starIScroll; | 88 | var starIScroll; |
91 | 89 | ||
92 | - var commonHeaderTop = $('#yoho-header').outerHeight(), | ||
93 | - $loadingTip = $('.loading-tip'), | 90 | + var $loadingTip = $('.loading-tip'), |
94 | $avatarWrap = $('.avatar-wrap:not(.avatar-clone)'), | 91 | $avatarWrap = $('.avatar-wrap:not(.avatar-clone)'), |
95 | avatarHeight = $('.avatar').height(); | 92 | avatarHeight = $('.avatar').height(); |
96 | 93 | ||
97 | // 下拉刷新,上拉加载 | 94 | // 下拉刷新,上拉加载 |
98 | starIScroll = new PullRefresh('.star-wrap', { | 95 | starIScroll = new PullRefresh('.star-wrap', { |
99 | - height: $(window).height() - commonHeaderTop - avatarHeight, | 96 | + height: $(window).height() - avatarHeight, |
100 | pullDown: function() { | 97 | pullDown: function() { |
101 | if (!stopLoading) { | 98 | if (!stopLoading) { |
102 | stopLoading = true; | 99 | stopLoading = true; |
@@ -219,14 +216,16 @@ function setIndexAction() { | @@ -219,14 +216,16 @@ function setIndexAction() { | ||
219 | } | 216 | } |
220 | 217 | ||
221 | $('.rank-avatar').each(function(key, item) { | 218 | $('.rank-avatar').each(function(key, item) { |
222 | - if ($(item).attr('data-avatar') !== '') { | ||
223 | - setAvatar($(item)); | ||
224 | - } | 219 | + setAvatar($(item)); |
225 | }); | 220 | }); |
226 | 221 | ||
227 | $('#yoho-header, .head-tab').on('touchmove', function() { | 222 | $('#yoho-header, .head-tab').on('touchmove', function() { |
228 | return false; | 223 | return false; |
229 | }); | 224 | }); |
225 | + | ||
226 | + $('.artice-imgs-area img').on('load', function() { | ||
227 | + starIScroll.iScroll.refresh(); | ||
228 | + }); | ||
230 | } | 229 | } |
231 | 230 | ||
232 | 231 |
@@ -380,6 +380,10 @@ | @@ -380,6 +380,10 @@ | ||
380 | background-size: contain; | 380 | background-size: contain; |
381 | } | 381 | } |
382 | 382 | ||
383 | + .default-avater { | ||
384 | + background-image: resolve('guang/star/user-avatar.png'); | ||
385 | + } | ||
386 | + | ||
383 | .loading-tip { | 387 | .loading-tip { |
384 | display: none; | 388 | display: none; |
385 | text-align: center; | 389 | text-align: center; |
-
Please register or login to post a comment