fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit 8868fbcbec0ecc7dc9a6b9dff7eb36aec583c3ae 2 parents bc2a4acf 56af0b73

Merge remote-tracking branch 'origin/feature/appversion' into release/5.7

Inline Side-by-side
Showing 4 changed files with 19 additions and 18 deletions
@@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@
22 style="{{#if param.bgcolor}}background-color:{{param.bgcolor}}{{/if}}"> 22 style="{{#if param.bgcolor}}background-color:{{param.bgcolor}}{{/if}}">
23 {{#if param.bgimg}} 23 {{#if param.bgimg}}
24 {{#isLazyLoad type @index}} 24 {{#isLazyLoad type @index}}
25 - <img class="lazy" data-original="{{image2 param.bgimg q=70}}"> 25 + <img class="lazy" data-original="{{image2 param.bgimg q=75}}">
26 {{else}} 26 {{else}}
27 - <img src="{{image2 param.bgimg q=70}}"> 27 + <img src="{{image2 param.bgimg q=75}}">
28 {{/isLazyLoad}} 28 {{/isLazyLoad}}
29 {{/if}} 29 {{/if}}
30 {{#component}} 30 {{#component}}
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 {{#if modalImg}} 34 {{#if modalImg}}
35 <div class="modal"> 35 <div class="modal">
36 <span class="modal-close"></span> 36 <span class="modal-close"></span>
37 - <img class="modal-img lazy" data-original="{{image2 modalImg q=70}}"> 37 + <img class="modal-img lazy" data-original="{{image2 modalImg q=75}}">
38 </div> 38 </div>
39 {{/if}} 39 {{/if}}
40 {{/isEqualOr}} 40 {{/isEqualOr}}
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <div class="swiper-wrapper"> 66 <div class="swiper-wrapper">
67 {{#list}} 67 {{#list}}
68 <div class="swiper-slide" style="{{styleFormat this percent=1}}"> 68 <div class="swiper-slide" style="{{styleFormat this percent=1}}">
69 - <img src="{{image2 src q=70}}"> 69 + <img src="{{image2 src q=75}}">
70 <a class="anchor" href="{{#if link}}{{link}}{{else}}javascript:void(0);{{/if}}" fp="{{getAnalysis ../../this @index}}"></a> 70 <a class="anchor" href="{{#if link}}{{link}}{{else}}javascript:void(0);{{/if}}" fp="{{getAnalysis ../../this @index}}"></a>
71 </div> 71 </div>
72 {{/list}} 72 {{/list}}
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 88
89 {{#isEqualOr type 'productGroup'}} 89 {{#isEqualOr type 'productGroup'}}
90 {{! 商品池}} 90 {{! 商品池}}
91 - <div class="product-container item{{numOfOneRow}}" {{#if proBgImg}}style="background:url({{image2 proBgImg q=70}}) repeat;background-size:100%;"{{/if}}> 91 + <div class="product-container item{{numOfOneRow}}" {{#if proBgImg}}style="background:url({{image2 proBgImg q=75}}) repeat;background-size:100%;"{{/if}}>
92 <div class="product-source" condition='{{stringify searchCondition}}' fp="{{getAnalysis ../this @index}}" 92 <div class="product-source" condition='{{stringify searchCondition}}' fp="{{getAnalysis ../this @index}}"
93 {{#unless defaultPros.length}} 93 {{#unless defaultPros.length}}
94 {{#if searchCondition.item}} 94 {{#if searchCondition.item}}
@@ -97,15 +97,15 @@ @@ -97,15 +97,15 @@
97 cloneitem="{{searchCondition.limit}}" 97 cloneitem="{{searchCondition.limit}}"
98 {{/if}} 98 {{/if}}
99 {{/unless}}> 99 {{/unless}}>
100 - <input class="imgwh" type="hidden" value="193x257"> 100 + <input class="imgwh" type="hidden" value="386x514">
101 {{#if defaultPros.length}} 101 {{#if defaultPros.length}}
102 {{#defaultPros}} 102 {{#defaultPros}}
103 <div class="feature-product-info {{#if ../searchCondition}}novisible{{/if}}"> 103 <div class="feature-product-info {{#if ../searchCondition}}novisible{{/if}}">
104 <a class="first-part product-detail" href='{{producturl}}'> 104 <a class="first-part product-detail" href='{{producturl}}'>
105 <div class="product-detail-imgbox"> 105 <div class="product-detail-imgbox">
106 - {{#if ../lefTopImg}}<img class="leftopimg lazy" data-original="{{image2 ../lefTopImg q=70}}">{{/if}}  
107 - {{#if ../rigTopImg}}<img class="rigtopimg lazy" data-original="{{image2 ../rigTopImg q=70}}">{{/if}}  
108 - <img class="product-detail-img lazy" data-original="{{image2 productimg q=70}}"> 106 + {{#if ../lefTopImg}}<img class="leftopimg lazy" data-original="{{image2 ../lefTopImg q=75}}">{{/if}}
  107 + {{#if ../rigTopImg}}<img class="rigtopimg lazy" data-original="{{image2 ../rigTopImg q=75}}">{{/if}}
  108 + <img class="product-detail-img lazy" data-original="{{image2 productimg q=75}}">
109 </div> 109 </div>
110 {{#isEqualOr ../showPrdName '1'}}<p class="product-name">{{productname}}</p>{{/isEqualOr}} 110 {{#isEqualOr ../showPrdName '1'}}<p class="product-name">{{productname}}</p>{{/isEqualOr}}
111 <div class="product-detail-text"> 111 <div class="product-detail-text">
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 <div class="brand-div"> 128 <div class="brand-div">
129 <span class="brand-name"{{#if ../fontColor}}style="color:{{../fontColor}};"{{/if}}>{{brandname}}</span> 129 <span class="brand-name"{{#if ../fontColor}}style="color:{{../fontColor}};"{{/if}}>{{brandname}}</span>
130 </div> 130 </div>
131 - <img class="brand-img lazy" data-original="{{image2 ../brandImg q=70}}"> 131 + <img class="brand-img lazy" data-original="{{image2 ../brandImg q=75}}">
132 </a> 132 </a>
133 {{/if}} 133 {{/if}}
134 </div> 134 </div>
@@ -137,8 +137,8 @@ @@ -137,8 +137,8 @@
137 <div class="feature-product-info novisible"> 137 <div class="feature-product-info novisible">
138 <a class="first-part product-detail" href=''> 138 <a class="first-part product-detail" href=''>
139 <div class="product-detail-imgbox"> 139 <div class="product-detail-imgbox">
140 - {{#if lefTopImg}}<img class="leftopimg" src="{{image2 lefTopImg q=70}}">{{/if}}  
141 - {{#if rigTopImg}}<img class="rigtopimg" src="{{image2 rigTopImg q=70}}">{{/if}} 140 + {{#if lefTopImg}}<img class="leftopimg" src="{{image2 lefTopImg q=75}}">{{/if}}
  141 + {{#if rigTopImg}}<img class="rigtopimg" src="{{image2 rigTopImg q=75}}">{{/if}}
142 <img class="product-detail-img" src=""> 142 <img class="product-detail-img" src="">
143 </div> 143 </div>
144 {{#isEqualOr showPrdName '1'}}<p class="product-name"></p>{{/isEqualOr}} 144 {{#isEqualOr showPrdName '1'}}<p class="product-name"></p>{{/isEqualOr}}
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 <div class="brand-div"> 161 <div class="brand-div">
162 <span class="brand-name" {{#if fontColor}}style="color:{{fontColor}};"{{/if}}></span> 162 <span class="brand-name" {{#if fontColor}}style="color:{{fontColor}};"{{/if}}></span>
163 </div> 163 </div>
164 - <img class="brand-img" src="{{image2 brandImg q=70}}"> 164 + <img class="brand-img" src="{{image2 brandImg q=75}}">
165 </a> 165 </a>
166 {{/if}} 166 {{/if}}
167 </div> 167 </div>
1 /* 1 /*
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2016-05-18 10:02:21 3 * @Date: 2016-05-18 10:02:21
4 - * @Last Modified by: Targaryen  
5 - * @Last Modified time: 2016-05-18 11:39:11 4 + * @Last Modified by: Targaryen
  5 + * @Last Modified time: 2017-05-19 14:17:08
6 */ 6 */
7 7
8 'use strict'; 8 'use strict';
@@ -342,7 +342,8 @@ let getintroData = (data, req) => { @@ -342,7 +342,8 @@ let getintroData = (data, req) => {
342 let getintroIntro = (data) => { 342 let getintroIntro = (data) => {
343 return api.get('', { 343 return api.get('', {
344 method: 'app.product.intro', 344 method: 'app.product.intro',
345 - product_skn: data.productskn 345 + product_skn: data.productskn,
  346 + app_version: '5.6.0'
346 }, { 347 }, {
347 cache: true 348 cache: true
348 }).then(result => { 349 }).then(result => {
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 "yoho-hammer": "^2.0.7", 104 "yoho-hammer": "^2.0.7",
105 "yoho-iscroll": "^5.2.0", 105 "yoho-iscroll": "^5.2.0",
106 "yoho-jquery": "^2.2.4", 106 "yoho-jquery": "^2.2.4",
107 - "yoho-jquery-lazyload": "^1.9.10", 107 + "yoho-jquery-lazyload": "^1.9.11",
108 "yoho-jquery-qrcode": "^0.14.0", 108 "yoho-jquery-qrcode": "^0.14.0",
109 "yoho-mlellipsis": "0.0.3", 109 "yoho-mlellipsis": "0.0.3",
110 "yoho-qs": "^1.0.1", 110 "yoho-qs": "^1.0.1",
@@ -9,7 +9,7 @@ global.jQuery = $; @@ -9,7 +9,7 @@ global.jQuery = $;
9 let isAndroid = /(Android)/i.test(navigator.userAgent); 9 let isAndroid = /(Android)/i.test(navigator.userAgent);
10 let isWechat = /micromessenger/i.test(navigator.userAgent); 10 let isWechat = /micromessenger/i.test(navigator.userAgent);
11 11
12 -lazyLoad($('img.lazy')); 12 +lazyLoad($('img.lazy'), {q: 75});
13 13
14 function swiperInit() { 14 function swiperInit() {
15 $('.swiper-container').each(function() { 15 $('.swiper-container').each(function() {