Authored by 郝肖肖

Merge branch 'release/wap-optim' of git.yoho.cn:fe/yohobuywap-node into release/wap-optim

... ... @@ -10,7 +10,7 @@
<span>{{money}}</span>
<p class="coupon-name">{{coupon_name}}</p>
<p>有效期:{{couponValidity}}</p>
{{#if ./used}}
{{#if ../used}}
<i></i>
{{/if}}
</div>
... ...
... ... @@ -106,7 +106,7 @@ const _searchGoods = (params) => {
delete params.filter_poolId;
}
if (params.shop_id) {
if (params.shop_id && !params.productPool) {
method = 'app.search.li';
} else if (params.brand) {
method = 'app.search.brand';
... ...
... ... @@ -12,7 +12,7 @@
a.async = 1;
a.src = j;
m.parentNode.insertBefore(a, m);
}(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.1.1/yas.js', '_yas'));
}(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.1.2/yas.js', '_yas'));
var _hmt = _hmt || [];
... ... @@ -56,7 +56,7 @@
uid = uid === 0 ? '' : uid;
window._ozuid = uid; // 暴露ozuid
if (window._yas) {
window._yas(1 * new Date(), '2.1.1', 'yohobuy_m', uid, '', '');
window._yas(1 * new Date(), '2.1.2', 'yohobuy_m', uid, '', '');
}
// 非登录状态,加载百度统计
... ...
{
"name": "m-yohobuy-node",
"version": "99.3.13",
"version": "5.3.15",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -39,6 +39,7 @@ var couponAJAX = function(statu, page) {
if ($(data).find('.null').html()) {
if (page === 1) {
employDom.append($(data).find('.null'));
window.rePosFooter();
}
AjaxFlag = 1;
return;
... ...
... ... @@ -1070,7 +1070,7 @@ $listNav.on('touchend touchcancel', function(e) {
}
if (nav.reload) {
$(document).trigger('shouldSendBpData', [bpIdData]);
search();
search({filtering: true});
}
}
});
... ...