fe / yohobuywap-node · Commits

Go to a project

Authored by 李奇
Commit 3e32844b694fe5021de291cd62d50c338f57ca88 2 parents 66d83d39 170e20ea

Merge remote-tracking branch 'origin/master' into feature/cs-quit-queue

Inline Side-by-side
Showing 5 changed files with 25 additions and 17 deletions
... ... @@ -34,6 +34,7 @@ const app = express();
// 向模板注入变量
app.locals.devEnv = app.get('env') === 'development';
app.locals.isProduction = app.get('env') === 'production';
app.locals.version = pkg.version;
app.locals.startTime = moment().format('YYYYMMDDHH');
... ...
... ... @@ -22,9 +22,9 @@
style="{{#if param.bgcolor}}background-color:{{param.bgcolor}}{{/if}}">
{{#if param.bgimg}}
{{#isLazyLoad type @index}}
<img class="lazy" data-original="{{image2 param.bgimg q=60}}">
<img class="lazy" data-original="{{image2 param.bgimg q=75}}">
{{else}}
<img src="{{image2 param.bgimg q=60}}">
<img src="{{image2 param.bgimg q=75}}">
{{/isLazyLoad}}
{{/if}}
{{#component}}
... ... @@ -34,7 +34,7 @@
{{#if modalImg}}
<div class="modal">
<span class="modal-close"></span>
<img class="modal-img lazy" data-original="{{image2 modalImg q=60}}">
<img class="modal-img lazy" data-original="{{image2 modalImg q=75}}">
</div>
{{/if}}
{{/isEqualOr}}
... ... @@ -65,7 +65,7 @@
<div class="swiper-wrapper">
{{#list}}
<div class="swiper-slide" style="{{styleFormat this percent=1}}">
<img src="{{image2 src q=60}}">
<img src="{{image2 src q=75}}">
<a class="anchor" href="{{#if link}}{{link}}{{else}}javascript:void(0);{{/if}}" fp="{{getAnalysis ../../this @index}}"></a>
</div>
{{/list}}
... ... @@ -87,7 +87,7 @@
{{#isEqualOr type 'productGroup'}}
{{! 商品池}}
<div class="product-container item{{numOfOneRow}}" {{#if proBgImg}}style="background:url({{image2 proBgImg q=60}}) repeat;background-size:100%;"{{/if}}>
<div class="product-container item{{numOfOneRow}}" {{#if proBgImg}}style="background:url({{image2 proBgImg q=75}}) repeat;background-size:100%;"{{/if}}>
<div class="product-source" condition='{{stringify searchCondition}}' fp="{{getAnalysis ../this @index}}"
{{#unless defaultPros.length}}
{{#if searchCondition.item}}
... ... @@ -96,15 +96,15 @@
cloneitem="{{searchCondition.limit}}"
{{/if}}
{{/unless}}>
<input class="imgwh" type="hidden" value="193x257">
<input class="imgwh" type="hidden" value="386x514">
{{#if defaultPros.length}}
{{#defaultPros}}
<div class="feature-product-info {{#if ../searchCondition}}novisible{{/if}}">
<a class="first-part product-detail" href='{{producturl}}'>
<div class="product-detail-imgbox">
{{#if ../lefTopImg}}<img class="leftopimg lazy" data-original="{{image2 ../lefTopImg q=60}}">{{/if}}
{{#if ../rigTopImg}}<img class="rigtopimg lazy" data-original="{{image2 ../rigTopImg q=60}}">{{/if}}
<img class="product-detail-img lazy" data-original="{{image2 productimg q=60}}">
{{#if ../lefTopImg}}<img class="leftopimg lazy" data-original="{{image2 ../lefTopImg q=75}}">{{/if}}
{{#if ../rigTopImg}}<img class="rigtopimg lazy" data-original="{{image2 ../rigTopImg q=75}}">{{/if}}
<img class="product-detail-img lazy" data-original="{{image2 productimg q=75}}">
</div>
{{#isEqualOr ../showPrdName '1'}}<p class="product-name">{{productname}}</p>{{/isEqualOr}}
<div class="product-detail-text">
... ... @@ -127,7 +127,7 @@
<div class="brand-div">
<span class="brand-name"{{#if ../fontColor}}style="color:{{../fontColor}};"{{/if}}>{{brandname}}</span>
</div>
<img class="brand-img lazy" data-original="{{image2 ../brandImg q=60}}">
<img class="brand-img lazy" data-original="{{image2 ../brandImg q=75}}">
</a>
{{/if}}
</div>
... ... @@ -136,8 +136,8 @@
<div class="feature-product-info novisible">
<a class="first-part product-detail" href=''>
<div class="product-detail-imgbox">
{{#if lefTopImg}}<img class="leftopimg" src="{{image2 lefTopImg q=60}}">{{/if}}
{{#if rigTopImg}}<img class="rigtopimg" src="{{image2 rigTopImg q=60}}">{{/if}}
{{#if lefTopImg}}<img class="leftopimg" src="{{image2 lefTopImg q=75}}">{{/if}}
{{#if rigTopImg}}<img class="rigtopimg" src="{{image2 rigTopImg q=75}}">{{/if}}
<img class="product-detail-img" src="">
</div>
{{#isEqualOr showPrdName '1'}}<p class="product-name"></p>{{/isEqualOr}}
... ... @@ -160,7 +160,7 @@
<div class="brand-div">
<span class="brand-name" {{#if fontColor}}style="color:{{fontColor}};"{{/if}}></span>
</div>
<img class="brand-img" src="{{image2 brandImg q=60}}">
<img class="brand-img" src="{{image2 brandImg q=75}}">
</a>
{{/if}}
</div>
... ...
... ... @@ -74,8 +74,15 @@
{{> footer}}
{{/unless}}
</div>
{{> download-app}}
{{#ifand isProduction wap.open.bughd}}
<script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js" crossOrigin="anonymous"></script>
<script type="text/javascript">
window.bughd = window.bughd || function(){};
bughd("create",{key:"31114646b053c0185782a800db730dd4"})
</script>
{{/ifand}}
{{#wechatShare}}
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
{{/wechatShare}}
... ...
{
"name": "m-yohobuy-node",
"version": "5.6.4",
"version": "5.6.5",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ... @@ -103,7 +103,7 @@
"yoho-hammer": "^2.0.7",
"yoho-iscroll": "^5.2.0",
"yoho-jquery": "^2.2.4",
"yoho-jquery-lazyload": "^1.9.10",
"yoho-jquery-lazyload": "^1.9.11",
"yoho-jquery-qrcode": "^0.14.0",
"yoho-mlellipsis": "0.0.3",
"yoho-qs": "^1.0.1",
... ...
... ... @@ -8,7 +8,7 @@ global.jQuery = $;
let isAndroid = /(Android)/i.test(navigator.userAgent);
let isWechat = /micromessenger/i.test(navigator.userAgent);
lazyLoad($('img.lazy'));
lazyLoad($('img.lazy'), {q: 75});
function swiperInit() {
$('.swiper-container').each(function() {
... ...