fe / yohobuy-node · Commits

Go to a project

Authored by 陈峰
Commit fe36f4df79c6e6a9b2d90535a8d252f2d4a208dd 2 parents 2163965e 70035d43

Merge branch 'hotfix/yohobi' into 'master' 

remove yohobi



See merge request !435
Inline Side-by-side
Showing 3 changed files with 17 additions and 17 deletions
@@ -1196,18 +1196,18 @@ function _detailDataPkg(origin, uid, vipLevel, cookies) { @@ -1196,18 +1196,18 @@ function _detailDataPkg(origin, uid, vipLevel, cookies) {
1196 result.coupon = _getCoupon(coupon); 1196 result.coupon = _getCoupon(coupon);
1197 1197
1198 // 有货币 1198 // 有货币
1199 - if (!_.includes(['', '0'], propOrigin('yohoCoinNum'))) {  
1200 - const C_VALUE = {  
1201 - type: '返有货币',  
1202 - des: '每件返 ',  
1203 - rest: '个 有货币'  
1204 - };  
1205 -  
1206 - result.activity.push({  
1207 - type: C_VALUE.type,  
1208 - des: `${C_VALUE.des}${propOrigin('yohoCoinNum')}${C_VALUE.rest}`  
1209 - });  
1210 - } 1199 + // if (!_.includes(['', '0'], propOrigin('yohoCoinNum'))) {
  1200 + // const C_VALUE = {
  1201 + // type: '返有货币',
  1202 + // des: '每件返 ',
  1203 + // rest: '个 有货币'
  1204 + // };
  1205 +
  1206 + // result.activity.push({
  1207 + // type: C_VALUE.type,
  1208 + // des: `${C_VALUE.des}${propOrigin('yohoCoinNum')}${C_VALUE.rest}`
  1209 + // });
  1210 + // }
1211 1211
1212 // 上市期 1212 // 上市期
1213 if (propOrigin('expect_arrival_time')) { 1213 if (propOrigin('expect_arrival_time')) {
1 { 1 {
2 "name": "yohobuy-node", 2 "name": "yohobuy-node",
3 - "version": "6.9.2", 3 + "version": "6.9.4",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -87,15 +87,15 @@ $('#signin-url').attr('href', window.signinUrl()); @@ -87,15 +87,15 @@ $('#signin-url').attr('href', window.signinUrl());
87 $('#reg-url').attr('href', window.registerUrl()); 87 $('#reg-url').attr('href', window.registerUrl());
88 88
89 $('.phoneapp').mouseenter(function() { 89 $('.phoneapp').mouseenter(function() {
90 - window._html && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); // eslint-disable-line 90 + window._hmt && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); // eslint-disable-line
91 }).click(function() { 91 }).click(function() {
92 - window._html && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); // eslint-disable-line 92 + window._hmt && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); // eslint-disable-line
93 }); 93 });
94 94
95 $('.we-chat').mouseenter(function() { 95 $('.we-chat').mouseenter(function() {
96 - window._html && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); 96 + window._hmt && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']);
97 }).click(function() { 97 }).click(function() {
98 - window._html && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); 98 + window._hmt && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']);
99 }); 99 });
100 100
101 // handlebars模板 101 // handlebars模板