fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit a3c5cd54b517bfe66acac716e1d14d214b94c275 2 parents 72701e5a ee8626ca

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 5 changed files with 49 additions and 38 deletions
... ... @@ -16,6 +16,7 @@ var $addressForm = $('.edit-address'),
$footer = $('#yoho-footer'),
$backBtn = $('.nav-back'),
$navTitle = $('.nav-title'),
$input = $('input, textarea'),
navTitle = $navTitle.html(),
$area = $('.area'),
isSubmiting,
... ... @@ -101,6 +102,7 @@ $addressForm.on('submit', function() {
});
$submit.on('touchend', function() {
$input.blur();
$addressForm.submit();
return false;
}).on('touchstart', function() {
... ... @@ -109,26 +111,26 @@ $submit.on('touchend', function() {
$(this).removeClass('highlight');
});
$('input, textarea').on('focus', function() {
$input.on('focus', function() {
$footer.hide();
}).on('blur', function() {
$footer.show();
});
// 省市区
$area.on('touchend', function() {
$editAddressPage.hide();
$addressListPage.show(1, function() {
$footer.hide();
});
currentPage = 'list';
$navTitle.html('地区选择');
});
// 省市区列表异步加载
$.get('/home/locationList').then(function(html) {
$addressListPage.html(html);
// 省市区
$area.on('touchend', function() {
$editAddressPage.hide();
$addressListPage.show(1, function() {
$footer.hide();
});
currentPage = 'list';
$navTitle.html('地区选择');
});
// touchend 在下滑的时候会触发
// 省市区联动
$addressListPage.find('.address').each(function(i, elem) {
... ... @@ -137,6 +139,9 @@ $.get('/home/locationList').then(function(html) {
addressHammer.on('tap', function(e) {
var $this = $(e.target);
if (e.target.tagName !== 'li') {
$this = $this.parent('li');
}
newArea.push($this.children('.caption').text());
$this.siblings().hide();
$this.children('ul').show().children('li').show();
... ...
... ... @@ -38,7 +38,7 @@ $basicBtnC:#eb0313;
.column {
box-sizing: border-box;
display: table-cell;
padding: pxToRem(16px) pxToRem(12px);
padding: pxToRem(20px) pxToRem(12px);
width: 50%;
border-bottom: 1px solid #fff;
border-right: 1px solid #fff;
... ... @@ -100,8 +100,10 @@ $basicBtnC:#eb0313;
margin-left: .5px;
font-size: pxToRem(18px);
text-align: center;
line-height: pxToRem(30px);
padding: 0 8px;
line-height: pxToRem(24px);
position: relative;
vertical-align: middle;
padding:0 5px;
}
.new-tag {
background-color: #78dc7e;
... ... @@ -253,6 +255,7 @@ $basicBtnC:#eb0313;
vertical-align: middle;
display: inline-block;
line-height: pxToRem(88px);
padding-left: pxToRem(8px);
}
.vip-img {
width: pxToRem(53px);
... ... @@ -394,9 +397,10 @@ $basicBtnC:#eb0313;
// .recommend-for-you {
// margin-bottom: pxToRem(30px);
// }
.yoho-tip{
top:40%;
}
}
.bottom-blank{
height: pxToRem(120px);
}
@import "comments-consults";
@import "product-description";
... ...
... ... @@ -44,27 +44,24 @@
min-height: pxToRem(136px);
margin: pxToRem(10px) 0;
text-align: center;
display: flex;
align-items: center;
// width: 100%;
// border-bottom:1px solid $borderC;
img {
position:absolute;
top:0;
bottom:0;
left:0;
margin:auto;
//position:absolute;
//top:0;
//bottom:0;
//left:0;
//margin:auto;
//width: pxToRem(90px);
height: auto;
padding-right: pxToRem(20px);
//height: auto;
//padding-right: pxToRem(20px);
}
.material-image {
display: inline-block;
width: 23%;
min-height: pxToRem(136px);
float: left;
//background-size: 100%;
background-position-x: center;
background-repeat: no-repeat;
}
.material-desc {
//padding-left:pxToRem(120px);
... ... @@ -84,17 +81,17 @@
}
}
.wash-tips{
padding-top:pxToRem(18px);
padding-top:pxToRem(20px);
&.page-block{
// border-top: 0px;
padding-left: pxToRem(15px);
padding-right: pxToRem(15px);
}
// padding-bottom:pxToRem(18px);
.tip{
display: inline-block;
width: 16.6%;
float:left;
//min-height: pxToRem(120px);
// margin-right: pxToRem(24px);
img{
width: pxToRem(48px);
... ... @@ -106,7 +103,9 @@
padding: 0 pxToRem(13px);
font-size: pxToRem(18px);
line-height: pxToRem(22px);
margin-bottom: pxToRem(18px);
//margin-bottom: pxToRem(18px);
min-height: pxToRem(44px);
text-align:center;
}
}
... ... @@ -146,11 +145,12 @@
width: pxToRem(70px);
margin-top: pxToRem(66px);
.avatar {
line-height: pxToRem(40px);
// line-height: pxToRem(40px);
display: inline-block;
width: pxToRem(40px);
border-radius: 50%;
height: pxToRem(40px);
margin: pxToRem(18px) 0;
margin: pxToRem(12px) 0;
}
}
}
... ...
... ... @@ -2,10 +2,10 @@
<div class="good-detail-page yoho-page">
<div class="banner-container">
<div class="tag-container">
<!-- <p class="good-tag new-tag">NEW</p> -->
<p class="good-tag new-tag">NEW</p>
{{# tags}}
{{# is_new}}
<p class="good-tag new-tag">NEW</p>
<!-- <p class="good-tag new-tag">NEW</p> -->
{{/ is_new}}
{{# is_advance}}
<p class="good-tag renew-tag">再到着</p>
... ... @@ -56,7 +56,7 @@
<ul class="vip-level clearfix">
{{# list}}
<li class="icons-item">
<span class="vip-img" style="background-size:cover;">
<span class="vip-img" style="background-size:contain;">
</span>
<span class="vip-price">{{text}}</span>
</li>
... ...
... ... @@ -105,7 +105,9 @@
<p class="material-desc">
{{desc}}
</p>-->
<div class="material-image" style="background-image:url({{img}})"></div>
<div class="material-image">
<img src="{{img}}" alt="材质图">
</div>
<div class="material-desc">
{{desc}}
</div>
... ...