fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit cc6336164d32a956fbbb06d24d6f1b70091bec98 2 parents b3d34303 4317a96b

Merge branch 'hotfix/slim'

Inline Side-by-side
Showing 15 changed files with 8 additions and 80 deletions
@@ -10,20 +10,7 @@ @@ -10,20 +10,7 @@
10 s0.parentNode.insertBefore(s, s0); 10 s0.parentNode.insertBefore(s, s0);
11 })(document); 11 })(document);
12 </script> 12 </script>
13 -<script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script>  
14 -<script type="text/javascript">  
15 - window.criteo_q = window.criteo_q || [];  
16 - window.criteo_q.push(  
17 - {event: "setAccount", account: 16184},  
18 - {event: "setCustomerId", id: "{{uid}}"},  
19 - {event: "setSiteType", type: "d"},  
20 - {event: "viewBasket", item: [  
21 - {{# cart.criteo}}  
22 - {"id":"{{id}}","quantity":"{{quantity}}","price":"{{price}}"},  
23 - {{/ cart.criteo}}  
24 - ]}  
25 - );  
26 -</script> 13 +
27 <!-- 聚效 --> 14 <!-- 聚效 -->
28 <script type="text/javascript"> 15 <script type="text/javascript">
29 var _mvq = window._mvq || []; 16 var _mvq = window._mvq || [];
1 -<script>  
2 - window.onload = function() {  
3 - var hm = document.createElement("script");  
4 - hm.src = "//static.criteo.net/js/ld/ld.js";  
5 - hm.async = 1;  
6 - var s = document.getElementsByTagName("script")[0];  
7 - s.parentNode.insertBefore(hm, s);  
8 - var u = _ozuid || "";  
9 - u = (u == 0) ? "" : u;  
10 - window.criteo_q = window.criteo_q || [];  
11 - window.criteo_q.push({event: "setAccount", account: 16184 },{event: "setCustomerId", id: u},{event: "setSiteType", type: "d" },{event: "viewHome" });  
12 - };  
13 -</script> 1 +
14 2
@@ -151,8 +151,6 @@ const getListData = (params, channel) => { @@ -151,8 +151,6 @@ const getListData = (params, channel) => {
151 Object.assign(finalResult.list.leftContent, searchHandler.handleSortAds(result[4].data)); 151 Object.assign(finalResult.list.leftContent, searchHandler.handleSortAds(result[4].data));
152 } 152 }
153 153
154 - finalResult.criteo = {skn: searchHandler.getCriteo(_.get(finalResult.list, 'goods'))};  
155 -  
156 let seo = searchHandler.getListSeo(channel, 154 let seo = searchHandler.getListSeo(channel,
157 _.get(finalResult, 'list.leftContent.allSort.list'), 155 _.get(finalResult, 'list.leftContent.allSort.list'),
158 _.get(finalResult, 'list.filters.checkedConditions.conditions')); 156 _.get(finalResult, 'list.filters.checkedConditions.conditions'));
@@ -360,8 +358,6 @@ const getBrandData = (params, extra, channel) => { @@ -360,8 +358,6 @@ const getBrandData = (params, extra, channel) => {
360 _.get(result[3], 'data.coupons', []), {brandId: extra.brandId}); 358 _.get(result[3], 'data.coupons', []), {brandId: extra.brandId});
361 } 359 }
362 360
363 - finalResult.criteo = {skn: searchHandler.getCriteo(_.get(finalResult.brand, 'goods'))};  
364 -  
365 let seo = searchHandler.getBrandShopSeo(channel, extra, params); 361 let seo = searchHandler.getBrandShopSeo(channel, extra, params);
366 362
367 return Object.assign({}, seo, finalResult); 363 return Object.assign({}, seo, finalResult);
@@ -2,5 +2,4 @@ @@ -2,5 +2,4 @@
2 {{# brand}} 2 {{# brand}}
3 {{> list/list}} 3 {{> list/list}}
4 {{/brand}} 4 {{/brand}}
5 - {{> common/criteo}}  
6 </div> 5 </div>
@@ -8,5 +8,4 @@ @@ -8,5 +8,4 @@
8 {{> list/list}} 8 {{> list/list}}
9 9
10 {{/list}} 10 {{/list}}
11 - {{> common/criteo}}  
12 </div> 11 </div>
@@ -30,4 +30,3 @@ @@ -30,4 +30,3 @@
30 </div> 30 </div>
31 </div> 31 </div>
32 </div> 32 </div>
33 -{{> common/criteo}}  
@@ -11,5 +11,4 @@ @@ -11,5 +11,4 @@
11 {{/ saleList}} 11 {{/ saleList}}
12 </div> 12 </div>
13 </div> 13 </div>
14 -{{> common/criteo}}  
15 {{/ result}} 14 {{/ result}}
@@ -4,5 +4,4 @@ @@ -4,5 +4,4 @@
4 {{> list/list}} 4 {{> list/list}}
5 5
6 {{/search}} 6 {{/search}}
7 - {{> common/criteo}}  
8 </div> 7 </div>
1 -{{# criteo}}  
2 - <script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script>  
3 - <script type="text/javascript">  
4 - window.criteo_q = window.criteo_q || [];  
5 - window.criteo_q.push(  
6 - { event: "setAccount", account: [16184] },  
7 - { event: "setSiteType", type: "d" },  
8 - { event: "viewList", item: [{{#each skn}}"{{.}}"{{#unless @last}},{{/unless}}{{/each}}]}  
9 - );  
10 - </script>  
11 -{{/ criteo}}  
1 1
2 {{# brandBanner}} 2 {{# brandBanner}}
3 <div class="brand-banner"> 3 <div class="brand-banner">
4 - <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{image2 banner}})"></div> 4 + <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{image2 banner q=100}})"></div>
5 <div class="opt-wrap"> 5 <div class="opt-wrap">
6 <p class="opt center-content"> 6 <p class="opt center-content">
7 <a href="{{brandHome}}"> 7 <a href="{{brandHome}}">
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 22
23 {{# shopBanner}} 23 {{# shopBanner}}
24 <div class="brand-banner base-shop-banner"> 24 <div class="brand-banner base-shop-banner">
25 - <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{image2 banner}})"></div> 25 + <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{image2 banner q=100}})"></div>
26 <div class="opt-wrap"> 26 <div class="opt-wrap">
27 <div class="opt center-content"> 27 <div class="opt center-content">
28 {{#if showShopName}} 28 {{#if showShopName}}
1 {{# statGoodsInfo}} 1 {{# statGoodsInfo}}
2 - <script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script>  
3 - <script type="text/javascript">  
4 - window.criteo_q = window.criteo_q || [];  
5 - window.criteo_q.push(  
6 - {event: "setAccount", account: 16184},  
7 - {event: "setCustomerId", id: "{{uid}}"},  
8 - {event: "setSiteType", type: "d"},  
9 - {event: "viewItem", item: "{{skn}}"}  
10 - );  
11 - </script>  
12 <script type="text/javascript"> 2 <script type="text/javascript">
13 var _mvq = _mvq || []; 3 var _mvq = _mvq || [];
14 _mvq.push(['$setAccount', 'm-23428-1']); 4 _mvq.push(['$setAccount', 'm-23428-1']);
1 -{{# criteo}}  
2 -<script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script>  
3 -<script type="text/javascript">  
4 -window.criteo_q = window.criteo_q || [];  
5 -window.criteo_q.push(  
6 - { event: "setAccount", account: [16184] },  
7 - { event: "setSiteType", type: "d" },  
8 - { event: "trackTransaction" , id: "{{order_code}}", item: [  
9 - {{#each items}}  
10 - { id: "{{product_skn}}", price: "{{goods_price}}", quantity: "{{buy_number}}"}  
11 - {{#unless @last}}  
12 - ,  
13 - {{/unless}}  
14 - {{/each}}  
15 - ]}  
16 -);  
17 -</script>  
18 -{{/ criteo}} 1 +
1 { 1 {
2 "name": "yohobuy-node", 2 "name": "yohobuy-node",
3 - "version": "5.7.1", 3 + "version": "5.7.2",
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": {
@@ -61,7 +61,7 @@ module.exports = function(imageUrl, opts) { @@ -61,7 +61,7 @@ module.exports = function(imageUrl, opts) {
61 } else { 61 } else {
62 query = 'imageView2/2/interlace/1/q/' + (params.q || 75); 62 query = 'imageView2/2/interlace/1/q/' + (params.q || 75);
63 } 63 }
64 - return uri + '?' + query + '|imageslim'; 64 + return uri + '?' + query;
65 } else { 65 } else {
66 return imageUrl; 66 return imageUrl;
67 } 67 }
@@ -61,7 +61,7 @@ module.exports = { @@ -61,7 +61,7 @@ module.exports = {
61 } else { 61 } else {
62 query = 'imageView2/2/interlace/1/q/' + (params.q || 75); 62 query = 'imageView2/2/interlace/1/q/' + (params.q || 75);
63 } 63 }
64 - return uri + '?' + query + '|imageslim'; 64 + return uri + '?' + query;
65 } else { 65 } else {
66 return ''; 66 return '';
67 } 67 }