Authored by jinhu.tung

Merge branch 'feature/shopping' of git.yoho.cn:fe/yoho-blk into feature/shopping

... ... @@ -10,7 +10,7 @@
</span>
</p>
<div class="content">
<ul class="clearfix shrink">
<ul class="clearfix address-list shrink">
{{#each address}}
<li class="address{{#if focus}} focus{{/if}}" data-id="{{id}}">
<div class="address-header"></div>
... ... @@ -36,9 +36,7 @@
<span class="delete">删除</span>
</p>
</div>
{{#if focus}}
<span class="address-chosed iconfont">&#xe63b;</span>
{{/if}}
<span class="address-chosed iconfont">&#xe63b;</span>
</li>
{{/each}}
</ul>
... ...
... ... @@ -37,6 +37,23 @@ require('../plugins/check');
lazyLoad($('img.lazy'));
// 地址切换
$('.address-list').on('click', '.address', function() {
var $this = $(this);
if ($this.hasClass('focus')) {
return;
}
$this.addClass('focus');
$this.siblings('.focus').removeClass('focus');
});
// 显示全部地址
$('.address-all').click(function() {
$(this).siblings('.address-list').removeClass('shrink').end().remove();
});
/**
* 发票弹窗Factory
*/
... ...
... ... @@ -202,7 +202,7 @@ a {
}
.body-mask {
position: absolute;
position: fixed;
z-index: 100;
background: #1d1d1d;
opacity: 0.3;
... ...
... ... @@ -19,6 +19,22 @@
overflow: hidden;
}
}
.new-address {
height: 52px;
}
}
.address {
cursor: pointer;
.address-chosed {
display: none;
}
&.focus .address-chosed {
display: block;
}
}
.new-address .iconfont {
... ...