fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai
Commit f2afe0282e9c15e3dc3b0c450fcf95343babb989 2 parents ff5bde99 973ca61f

Merge branch 'feature/sale' into release/4.8

Inline Side-by-side
Showing 3 changed files with 15 additions and 15 deletions
... ... @@ -3,14 +3,14 @@
<div class="left-container">
{{# left}}
<a href="{{url}}">
<div class="thumb-row-box left-thumb-row-box" style="background-image:url({{image src 275 160}})"></div>
<div class="thumb-row-box left-thumb-row-box" style="background-image:url({{image src 276 296}})"></div>
</a>
{{/ left}}
</div>
<div class="right-container">
{{# right}}
<a href="{{url}}">
<div class="thumb-row-box right-thumb-row-box {{#if @first}}first{{/if}}" style="background-image:url({{image src 275 160}})"></div>
<div class="thumb-row-box right-thumb-row-box {{#if @first}}first{{/if}}" style="background-image:url({{image src 276 134}})"></div>
</a>
{{/ right}}
</div>
... ...
... ... @@ -297,6 +297,13 @@ function search(opt) {
}
}
$('.good-detail-text .name').each(function() {
var $this = $(this),
$title = $this.find('a');
$title[0].mlellipsis(2);
});
nav.reload = false;
nav.page = page;
... ... @@ -304,13 +311,6 @@ function search(opt) {
loading.hideLoadingMask();
window.rePosFooter();
$('.good-detail-text .name').each(function() {
var $this = $(this),
$title = $this.find('a');
$title[0].mlellipsis(2);
});
},
error: function() {
tip.show('网络断开连接了~');
... ...
... ... @@ -8,8 +8,8 @@
.thumb-row-box {
display: inline-block;
width: 275px;
height: 132px;
width: 276px;
height: 134px;
border-radius: 0;
background-size: 100% 100%;
background-repeat: no-repeat;
... ... @@ -22,7 +22,7 @@
}
.left-thumb-row-box {
height: 308px;
height: 296px;
}
.left-container {
... ... @@ -31,13 +31,13 @@
.right-container {
float: right;
width: 275px;
height: 280px;
width: 276px;
height: 296px;
border-radius: 4px;
margin: 0;
.right-thumb-row-box {
margin: 44px 0 0;
margin: 28px 0 0;
}
}
}
... ...