fe / yohobuy-node · Commits

Go to a project

Authored by 黄涛
Commit eebd1ef9ca15a8cca36cfdfa0bbaf8e08001cf7a 2 parents 71b908e9 5f7e242f

Merge branch 'hotfix/imageslim' into 'gray' 

imageslim



See merge request !105
Inline Side-by-side
Showing 9 changed files with 30 additions and 23 deletions
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 <ul class="package-goods clearfix"> 89 <ul class="package-goods clearfix">
90 {{#each goods_list}} 90 {{#each goods_list}}
91 <li class="left"> 91 <li class="left">
92 - <img class="lazy package-goods-img" data-original="{{image goods_images 68 90}}"> 92 + <img class="lazy package-goods-img" data-original="{{image2 goods_images w=68 h=90}}">
93 {{#isEqual goods_type 'gift'}} 93 {{#isEqual goods_type 'gift'}}
94 <span>赠品</span> 94 <span>赠品</span>
95 {{/isEqual}} 95 {{/isEqual}}
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
124 <td{{#if @first}} class="border-top"{{/if}}></td> 124 <td{{#if @first}} class="border-top"{{/if}}></td>
125 <td class="border-top aline-left"> 125 <td class="border-top aline-left">
126 <a class="image" href="{{linkToGoods}}"> 126 <a class="image" href="{{linkToGoods}}">
127 - <img src="{{image goods_images 64 85}}" class="thumb"> 127 + <img src="{{image2 goods_images w=64 h=85}}" class="thumb">
128 <p class="name"> 128 <p class="name">
129 {{#isEqual goods_type 'gift'}} 129 {{#isEqual goods_type 'gift'}}
130 <span>赠品</span> 130 <span>赠品</span>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 {{# imgBrand}} 4 {{# imgBrand}}
5 <li class="img-item"> 5 <li class="img-item">
6 <a href="{{url}}" target= "_blank" title="{{title}}"> 6 <a href="{{url}}" target= "_blank" title="{{title}}">
7 - <img data-original="{{image src 378 175}}" src="{{image2 src w=378 h=175}}" alt="{{alt}}"> 7 + <img data-original="{{image2 src w=378 h=175}}" src="{{image2 src w=378 h=175}}" alt="{{alt}}">
8 </a> 8 </a>
9 </li> 9 </li>
10 {{/ imgBrand}} 10 {{/ imgBrand}}
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 {{#each trendList}} 62 {{#each trendList}}
63 <li> 63 <li>
64 <a href="{{href}}"> 64 <a href="{{href}}">
65 - <img src="{{image src 264 173}}" /> 65 + <img src="{{image2 src w=264 h=173}}" />
66 <div class="main-title">{{mainTitle}}</div> 66 <div class="main-title">{{mainTitle}}</div>
67 <div class="sub-title">{{Subtitle}}</div> 67 <div class="sub-title">{{Subtitle}}</div>
68 </a> 68 </a>
1 {{# mainBanner}} 1 {{# mainBanner}}
2 - <div class="main-banner slide-container"{{#unless list}} style="background:url({{image src 1920 450}}) no-repeat top center;"{{/unless}}> 2 + <div class="main-banner slide-container"{{#unless list}} style="background:url({{image2 src w=1920 h=450}}) no-repeat top center;"{{/unless}}>
3 {{#if list}} 3 {{#if list}}
4 <div class="slide-wrapper"> 4 <div class="slide-wrapper">
5 <ul> 5 <ul>
6 {{# list}} 6 {{# list}}
7 - <li class="banner-img" style="background: {{bgColor}} url({{image src 1920 450}}) no-repeat top center;"> 7 + <li class="banner-img" style="background: {{bgColor}} url({{image2 src w=1920 h=450}}) no-repeat top center;">
8 {{#if url}} 8 {{#if url}}
9 <a href="{{url}}" target= "_blank"></a> 9 <a href="{{url}}" target= "_blank"></a>
10 {{/if}} 10 {{/if}}
1 {{# banner}} 1 {{# banner}}
2 - <div class="brand-banner" style="background:{{bgColor}}{{#if bgImg}} url({{image bgImg 1920 45}}){{/if}}"> 2 + <div class="brand-banner" style="background:{{bgColor}}{{#if bgImg}} url({{image2 bgImg w=1920 h=45}}){{/if}}">
3 <div class="center-content clearfix"> 3 <div class="center-content clearfix">
4 <a class="pull-left" href="{{homeUrl}}"> 4 <a class="pull-left" href="{{homeUrl}}">
5 <img src="{{logo}}"> 5 <img src="{{logo}}">
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <div class="color-row"> 5 <div class="color-row">
6 {{#each colors}} 6 {{#each colors}}
7 <div class="dt {{#if active}} active current-color{{/if}} {{#if disable}} disabled{{/if}}" 7 <div class="dt {{#if active}} active current-color{{/if}} {{#if disable}} disabled{{/if}}"
8 - data-pic="{{image pic 100 134}}" 8 + data-pic="{{image2 pic w=100 h=134}}"
9 data-pid="{{pid}}" 9 data-pid="{{pid}}"
10 {{!--data-target="{{proId}}-color-{{@index}}" 10 {{!--data-target="{{proId}}-color-{{@index}}"
11 data-title="{{this.color}}" --}} 11 data-title="{{this.color}}" --}}
@@ -40,9 +40,9 @@ @@ -40,9 +40,9 @@
40 {{# colors}} 40 {{# colors}}
41 <div class="bigImg {{#unless active}} hide{{/unless}}"> 41 <div class="bigImg {{#unless active}} hide{{/unless}}">
42 {{#if pic}} 42 {{#if pic}}
43 - <img src="{{image pic 100 134}}" /> 43 + <img src="{{image2 pic w=100 h=134}}" />
44 {{else}} 44 {{else}}
45 - <img src="{{image ../defaultImg 100 134}}" /> 45 + <img src="{{image2 ../defaultImg w=100 h=134}}" />
46 {{/if}} 46 {{/if}}
47 </div> 47 </div>
48 {{/ colors}} 48 {{/ colors}}
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <div class="good-info" data-skn="{{skn}}" data-id="{{id}}" data-index="{{@index}}"> 14 <div class="good-info" data-skn="{{skn}}" data-id="{{id}}" data-index="{{@index}}">
15 <div class="good-detail-img"> 15 <div class="good-detail-img">
16 <a class="good-thumb" href="{{url}}" target="_blank"> 16 <a class="good-thumb" href="{{url}}" target="_blank">
17 - <img class="lazy" src="{{image src 100 135}}" style="display: block;"> 17 + <img class="lazy" src="{{image2 src w=100 h=135}}" style="display: block;">
18 </a> 18 </a>
19 </div> 19 </div>
20 <div class="good-detail-text stu-good-detail "> 20 <div class="good-detail-text stu-good-detail ">
@@ -3,8 +3,10 @@ @@ -3,8 +3,10 @@
3 var cdnDomains = require('../../../../config/dns-prefetch'); 3 var cdnDomains = require('../../../../config/dns-prefetch');
4 4
5 function cdnReplace(cdn, imgUrl) { 5 function cdnReplace(cdn, imgUrl) {
  6 + var key;
  7 +
6 if (cdn === 'qcloud') { 8 if (cdn === 'qcloud') {
7 - for (var key in cdnDomains) { 9 + for (key in cdnDomains) {
8 if (imgUrl.indexOf(key) >= 0) { 10 if (imgUrl.indexOf(key) >= 0) {
9 imgUrl = imgUrl.replace(key, cdnDomains[key]); 11 imgUrl = imgUrl.replace(key, cdnDomains[key]);
10 } 12 }
@@ -15,12 +17,13 @@ function cdnReplace(cdn, imgUrl) { @@ -15,12 +17,13 @@ function cdnReplace(cdn, imgUrl) {
15 17
16 module.exports = function(imageUrl, opts) { 18 module.exports = function(imageUrl, opts) {
17 var cdn = window.cdn; 19 var cdn = window.cdn;
  20 + var params, urls, query, uri;
18 21
19 if (imageUrl) { 22 if (imageUrl) {
20 - var params = opts.hash;  
21 - var urls = imageUrl.split('?');  
22 - var query = urls[1] || '';  
23 - var uri = urls[0]; 23 + params = opts.hash;
  24 + urls = imageUrl.split('?');
  25 + query = urls[1] || '';
  26 + uri = urls[0];
24 27
25 if (uri.indexOf('http:') === 0) { 28 if (uri.indexOf('http:') === 0) {
26 uri = uri.replace('http:', ''); 29 uri = uri.replace('http:', '');
@@ -29,7 +32,8 @@ module.exports = function(imageUrl, opts) { @@ -29,7 +32,8 @@ module.exports = function(imageUrl, opts) {
29 uri = cdnReplace(cdn, uri); 32 uri = cdnReplace(cdn, uri);
30 33
31 if (query) { 34 if (query) {
32 - query = query.replace(/{width}/g, params.w).replace(/{height}/g, params.h).replace(/{mode}/g, (params.mode || 2)); 35 + query = query.replace(/{width}/g, params.w).replace(/{height}/g,
  36 + params.h).replace(/{mode}/g, (params.mode || 2));
33 37
34 if (query.indexOf('imageView2') === 0) { 38 if (query.indexOf('imageView2') === 0) {
35 if (params.q && query.indexOf('/q/') > 0) { 39 if (params.q && query.indexOf('/q/') > 0) {
@@ -57,7 +61,7 @@ module.exports = function(imageUrl, opts) { @@ -57,7 +61,7 @@ module.exports = function(imageUrl, opts) {
57 } else { 61 } else {
58 query = 'imageView2/2/interlace/1/q/' + (params.q || 75); 62 query = 'imageView2/2/interlace/1/q/' + (params.q || 75);
59 } 63 }
60 - return uri + '?' + query; 64 + return uri + '?' + query + '&imageslim';
61 } else { 65 } else {
62 return imageUrl; 66 return imageUrl;
63 } 67 }
1 'use strict'; 1 'use strict';
2 2
3 -const url = require('url'); 3 +// const url = require('url');
4 const _ = require('lodash'); 4 const _ = require('lodash');
5 -const config = require('../config/common');  
6 -const assetUrl = config.assetUrl; 5 +
  6 +// const config = require('../config/common');
  7 +
  8 +// const assetUrl = config.assetUrl;
7 9
8 let cdnDomains = require('../config/dns-prefetch'); 10 let cdnDomains = require('../config/dns-prefetch');
9 11
@@ -35,7 +37,8 @@ module.exports = { @@ -35,7 +37,8 @@ module.exports = {
35 uri = cdnReplace(cdn, uri); 37 uri = cdnReplace(cdn, uri);
36 38
37 if (query) { 39 if (query) {
38 - query = query.replace(/{width}/g, params.w).replace(/{height}/g, params.h).replace(/{mode}/g, (params.mode || 2)); 40 + query = query.replace(/{width}/g, params.w).replace(/{height}/g, params.h).
  41 + replace(/{mode}/g, (params.mode || 2));
39 42
40 if (query.indexOf('imageView2') === 0) { 43 if (query.indexOf('imageView2') === 0) {
41 if (params.q && query.indexOf('/q/') > 0) { 44 if (params.q && query.indexOf('/q/') > 0) {
@@ -63,7 +66,7 @@ module.exports = { @@ -63,7 +66,7 @@ module.exports = {
63 } else { 66 } else {
64 query = 'imageView2/2/interlace/1/q/' + (params.q || 75); 67 query = 'imageView2/2/interlace/1/q/' + (params.q || 75);
65 } 68 }
66 - return uri + '?' + query; 69 + return uri + '?' + query + '&imageslim';
67 } else { 70 } else {
68 return ''; 71 return '';
69 } 72 }