Authored by OF1706

Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

@@ -25,6 +25,10 @@ @@ -25,6 +25,10 @@
25 </p> 25 </p>
26 </div> 26 </div>
27 {{/ deliveryAddress}} 27 {{/ deliveryAddress}}
  28 + <div id="new-address-block" class="new-addr">
  29 + <div class="plus-icon"></div>
  30 + <p>增加收货地址</p>
  31 + </div>
28 </div> 32 </div>
29 <p class="addr-opt"> 33 <p class="addr-opt">
30 <span class="more-addr-btn">显示全部地址<i class="iconfont">&#xe60b;</i></span> 34 <span class="more-addr-btn">显示全部地址<i class="iconfont">&#xe60b;</i></span>
@@ -286,7 +286,7 @@ function newEditAddress(title, info, $el) { @@ -286,7 +286,7 @@ function newEditAddress(title, info, $el) {
286 bindOperateEvent(addDia.$el); 286 bindOperateEvent(addDia.$el);
287 } 287 }
288 288
289 -$('#new-address-btn').click(function() { 289 +$('#new-address-btn, #new-address-block').click(function() {
290 newEditAddress('新增地址'); 290 newEditAddress('新增地址');
291 }); 291 });
292 292
@@ -179,6 +179,7 @@ @@ -179,6 +179,7 @@
179 overflow: hidden; 179 overflow: hidden;
180 } 180 }
181 181
  182 + .new-addr,
182 .addr-item { 183 .addr-item {
183 width: 200px; 184 width: 200px;
184 height: 162px; 185 height: 162px;
@@ -189,7 +190,36 @@ @@ -189,7 +190,36 @@
189 border: 1px solid $borderColor; 190 border: 1px solid $borderColor;
190 position: relative; 191 position: relative;
191 cursor: pointer; 192 cursor: pointer;
  193 + }
  194 +
  195 + .new-addr {
  196 + .plus-icon {
  197 + width: 60px;
  198 + padding-top: 70px;
  199 + margin-left: 72px;
  200 + border-bottom: 4px solid #e0e0e0;
  201 + margin-bottom: 50px;
  202 + position: relative;
  203 + }
192 204
  205 + .plus-icon:after {
  206 + content: '';
  207 + height: 60px;
  208 + display: block;
  209 + border-left: 4px solid #e0e0e0;
  210 + position: absolute;
  211 + left: 28px;
  212 + top: 42px;
  213 + }
  214 +
  215 + > p {
  216 + padding-left: 6px;
  217 + text-align: center;
  218 + }
  219 +
  220 + }
  221 +
  222 + .addr-item {
193 &:before { 223 &:before {
194 content: ''; 224 content: '';
195 width: 100%; 225 width: 100%;