Authored by 王水玲

星潮bug修改

... ... @@ -136,9 +136,10 @@ const _processDetailData = (list) => {
if (data.share && data.share.url) {
data.share.url = _processShareUrl(data);
}
let urlObj = url.parse(data.url);
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
let urlObj = url.parse(data.url);
let qsObj = qs.parse(urlObj.query);
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
data.url += appUrl;
formatData.push(data);
});
... ... @@ -164,7 +165,6 @@ const _processCollocationData = (list) => {
}
formatData.push(data);
});
return formatData;
};
... ...
... ... @@ -12,7 +12,7 @@
<ul class="clearfix swiper-wrapper">
{{# starAvatar}}
<li class="swiper-slide">
<a href='{{url}}'><img src="{{image cover 180 180}}" /></a>
<a href='{{url}}' data-avatar="{{image cover 180 180}}" class="rank-avatar"></a>
</li>
{{/ starAvatar}}
</ul>
... ...
... ... @@ -11,11 +11,11 @@
<div class="count-area">
<span class="time"><i class="iconfont time-ico">&#xe603;</i>{{publishTime}}</span>
<span class="see"><i class="iconfont see-ico">&#xe602;</i>{{viewsNum}}</span>
{{#if ../isApp}}
{{#if share.url}}
<a href="{{share.url}}" class="iconfont forward">&#xe600;</a>
{{/if}}
{{#if share.url}}
<a href="{{share.url}}" class="iconfont forward">&#xe600;</a>
{{/if}}
<span class="collection"><i class="iconfont collected-ico {{#isCollected}} collected {{/isCollected}}">&#xe605;</i></span>
</div>
</div>
... ...
... ... @@ -13,8 +13,8 @@ module.exports = {
port: 6001,
siteUrl: '//m.yohobuy.com',
domains: {
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/'
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/'
},
useOneapm: false,
useCache: false,
... ...
... ... @@ -52,13 +52,15 @@ function setAvatar($userAvatar) {
// 部分老用户没有头像,显示默认头像
avatar = $userAvatar.data('avatar');
if (avatar) {
myImage.src = avatar;
}
myImage.onload = function() {
$userAvatar.css('background-image', 'url(' + avatar + ')');
};
if (avatar) {
myImage.src = avatar;
} else {
$userAvatar.addClass('default-avater');
}
}
... ... @@ -80,23 +82,18 @@ function bindAvatar(dom) {
return false;
}
// else if (window.queryString.app_version) {
// return false;
// }
}
function setIndexAction() {
var starIScroll;
var commonHeaderTop = $('#yoho-header').outerHeight(),
$loadingTip = $('.loading-tip'),
var $loadingTip = $('.loading-tip'),
$avatarWrap = $('.avatar-wrap:not(.avatar-clone)'),
avatarHeight = $('.avatar').height();
// 下拉刷新,上拉加载
starIScroll = new PullRefresh('.star-wrap', {
height: $(window).height() - commonHeaderTop - avatarHeight,
height: $(window).height() - avatarHeight,
pullDown: function() {
if (!stopLoading) {
stopLoading = true;
... ... @@ -219,14 +216,16 @@ function setIndexAction() {
}
$('.rank-avatar').each(function(key, item) {
if ($(item).attr('data-avatar') !== '') {
setAvatar($(item));
}
setAvatar($(item));
});
$('#yoho-header, .head-tab').on('touchmove', function() {
return false;
});
$('.artice-imgs-area img').on('load', function() {
starIScroll.iScroll.refresh();
});
}
... ...
... ... @@ -380,6 +380,10 @@
background-size: contain;
}
.default-avater {
background-image: resolve('guang/star/user-avatar.png');
}
.loading-tip {
display: none;
text-align: center;
... ...