fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit a4aae8fe7906fb29fa749c5d5a35ea59e900d644 2 parents 60b70334 570efc10

Merge branch 'develop' into feature/my-order

Inline Side-by-side
Showing 7 changed files with 28 additions and 14 deletions
<div class="ad-banner">
{{#adBanner}}
<img class="lazy-img" data-original="{{image img 1150 160}}" alt="">
<a href="{{link}}">
<img class="lazy-img" data-original="{{image img 1150 160}}" alt="">
</a>
{{/adBanner}}
</div>
... ...
<div class="ad-container clearfix">
{{# brandsAd}}
<div class="ad {{#if @first}}first{{/if}}">
<img class="lazy-img" data-original="{{image img 240 240}}" alt="">
<img class="lazy-img" data-original="{{image img 240 240}}" alt="">
{{> brand-text-box}}
</div>
</div>
{{/ brandsAd}}
</div>
... ...
{{# classicBrands}}
<div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
<a href="{{link}}">
{{# big}}
<img class="big-img lazy-img" data-original="{{image img 556 333}}" alt="big-img">
{{/ big}}
{{# small}}
<img class="small-img lazy-img {{#if @first}}first{{/if}}" data-original="{{image img 283 283}}" alt="big-img">
{{/ small}}
</a>
</div>
{{/ classicBrands}}
... ...
... ... @@ -4,12 +4,16 @@
{{# editorial}}
<div class="news left">
{{# big}}
<img class="lazy-img" data-original="{{image img 395 495}}" alt="">
<a href="{{link}}">
<img class="lazy-img" data-original="{{image img 395 495}}" alt="">
</a>
{{/ big}}
</div>
<div class="news right">
{{# small}}
<img class="lazy-img {{#if bottomSpace}}bottom-space{{/if}} {{#if rightSpace}}right-space{{/if}}" data-original="{{image img 360 240}}" alt="">
<a href="{{link}}">
<img class="lazy-img {{#if bottomSpace}}bottom-space{{/if}} {{#if rightSpace}}right-space{{/if}}" data-original="{{image img 360 240}}" alt="">
</a>
{{/ small}}
</div>
{{/ editorial}}
... ...
... ... @@ -4,15 +4,23 @@
{{# newArrivals}}
<div class="arrival-item {{#if smallImg}}small-img{{/if}} {{#if @last}}last{{^}}normal{{/if}}">
{{#if even}}
<a href="{{link}}">
<img class="lazy-img" data-original="{{#if smallImg}}{{image img 223 490}}{{^}}{{image img 325 490}}{{/if}}" alt="">
</a>
<div class="brand-name">
<span class="bottom">{{name}}</span>
<a href="{{link}}">
<span class="bottom">{{name}}</span>
</a>
</div>
{{^}}
<div class="brand-name">
<span class="top">{{name}}</span>
<a href="{{link}}">
<span class="top">{{name}}</span>
</a>
</div>
<img class="lazy-img" data-original="{{#if smallImg}}{{image img 223 490}}{{^}}{{image img 325 490}}{{/if}}" alt="">
<a href="{{link}}">
<img class="lazy-img" data-original="{{#if smallImg}}{{image img 223 490}}{{^}}{{image img 325 490}}{{/if}}" alt="">
</a>
{{/if}}
</div>
{{/ newArrivals}}
... ...
... ... @@ -32,7 +32,8 @@ module.exports = {
infoFile: {
name: 'info',
level: 'info',
filename: 'logs/info.log'
filename: 'logs/info.log',
maxFiles: 7
},
errorFile: {
name: 'error',
... ... @@ -42,7 +43,7 @@ module.exports = {
},
udp: { // send by udp
level: 'debug', // logger level
host: '192.168.102.162', // influxdb host
host: 'influxdb.yohoops.org', // influxdb host
port: '4444' // influxdb port
},
console: {
... ...
... ... @@ -7,8 +7,6 @@
var $ = require('yoho-jquery'),
lazyLoad = require('yoho-jquery-lazyload');
var prising;
lazyLoad($('#msg-list img.lazy'));
$('.msg-nav li').on('click', function() {
... ... @@ -22,8 +20,7 @@ $('.msg-nav li').on('click', function() {
});
$('.editorial-index-page').on('click', '.like-icon', function() {
var $this = $(this),
msgId = $this.closest('.content-msg').data().id;
var $this = $(this);
$this.toggleClass('liked');
... ...