Authored by liangxs

Merge branch 'featrue/4.5' of http://git.dev.yoho.cn/web/yohobuywap into featrue/4.5

# Conflicts:
#	static/js/common.js
@@ -200,7 +200,7 @@ function reMarginFooter(fixedElement) { @@ -200,7 +200,7 @@ function reMarginFooter(fixedElement) {
200 200
201 window._ozuid = uid;//暴露ozuid 201 window._ozuid = uid;//暴露ozuid
202 202
203 - if (window._yas && $('.buriedpoint')) { 203 + if (window._yas) {
204 window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', uid, '', ''); 204 window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', uid, '', '');
205 $('.buriedpoint').each(function() { 205 $('.buriedpoint').each(function() {
206 $(this).click(function(e) { 206 $(this).click(function(e) {
@@ -3,13 +3,13 @@ @@ -3,13 +3,13 @@
3 <ul class="swiper-wrapper"> 3 <ul class="swiper-wrapper">
4 {{#each banner}} 4 {{#each banner}}
5 {{#if @first}} 5 {{#if @first}}
6 - <li class="swiper-slide"> 6 + <li class="swiper-slide" data-bpId="guang_swiper_one_false">
7 <a href="{{url}}"> 7 <a href="{{url}}">
8 <img src="{{img}}"> 8 <img src="{{img}}">
9 </a> 9 </a>
10 </li> 10 </li>
11 {{^}} 11 {{^}}
12 - <li class="swiper-slide"> 12 + <li class="swiper-slide" data-bpId="guang_swiper_two_false">
13 <a href="{{url}}"> 13 <a href="{{url}}">
14 <img class="swiper-lazy" data-src="{{img}}"> 14 <img class="swiper-lazy" data-src="{{img}}">
15 </a> 15 </a>
1 <ul class="head-tab"> 1 <ul class="head-tab">
2 {{#each headTab}} 2 {{#each headTab}}
3 - <li {{#if cur}} class="cur" {{/if}}><a href="{{ url }}">{{ name }}</a></li> 3 + <li {{#if cur}} class="cur" {{/if}} data-bpId="guang_tab_{{name}}_false"><a href="{{ url }}">{{ name }}</a></li>
4 {{/each}} 4 {{/each}}
5 -</ul>  
  5 +</u>