fe / YOHOBUYWAP · Commits

Go to a project

Authored by biao
Commit 9caa1761799a821fdf1d49d4aaa9e18837521100 2 parents 8335deec 2ab721d7

Merge branch 'featrue/4.5' into release/4.5

Inline Side-by-side
Showing 19 changed files with 60 additions and 53 deletions
... ... @@ -200,11 +200,18 @@ function reMarginFooter(fixedElement) {
window._ozuid = uid;//暴露ozuid
if (window._yas && $('.buriedpoint')) {
if (window._yas) {
window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', uid, '', '');
$('.buriedpoint').each(function() {
$(this).click(function(e) {
window._yas.sendMouseEvent(e);
var bpIdArr = $(this).data('bpId').split('_');
var jsonData = {
page: bpIdArr[0],
floor: bpIdArr[1],
data: bpIdArr[2]
};
window._yas.sendCustomInfo(jsonData, bpIdArr[3]);
});
});
}
... ...
... ... @@ -112,7 +112,7 @@
<h2>相关品牌</h2>
<ul class="brand-list clearfix">
{{# relatedBrand}}
<li class="brand">
<li class="brand" data-bp-id="guang_brand_{{name}}_false">
<a href={{url}}>
<div class="brand-logo">
<img class="lazy" data-original={{thumb}}>
... ... @@ -143,7 +143,7 @@
<h2>相关文章</h2>
<ul class="info-list">
{{# relatedInfo}}
<li>
<li data-bp-id="guang_article_{{title}}_false">
<a class="clearfix" href={{url}}>
<img class="lazy {{#if squareThumb}}square{{/if}}" data-original={{thumb}}>
<span class="title">{{title}}</span>
... ...
{{#each collocationList}}
<li articleId="{{articleId}}">
<li articleId="{{articleId}}" data-bp-id="guang_collocationList_{{title}}_false">
{{#if img}}
<a href="{{url}}"><img class="lazy" src ="" data-original="{{img}}" /></a>
{{/if}}
... ...
... ... @@ -21,7 +21,7 @@
{{/if}}
{{#if video}}
<div class="subject-video-area">
<div class="subject-video-area" data-bp-id="guang_subject_video_true">
<video id="subject-video" controls="controls" poster="{{videoImg}}" autobuffer>
<source src="{{videoUrl}}">
</video>
... ...
... ... @@ -6,7 +6,7 @@
<ul class="subject-list">
{{#each resources}}
{{#if video}}
<li>
<li data-bp-id="guang_subjectList_{{title}}_false">
<a href="{{videoUrl}}">
<img class="lazy" data-original="{{videoImg}}" alt="{{alt}}"/>
<p>{{title}}</p>
... ...
... ... @@ -4,7 +4,7 @@
<div id="search-input" class="search-input">
<form id="search-form" action={{url}} method="get">
<i class="search-icon iconfont">&#xe60f;</i>
<input type="text" placeholder="搜索商品" name="query">
<input type="text" placeholder="搜索商品" name="query" data-bp-id="search_page_input_true">
<input type="hidden" name="from" value="search">
<i class="clear-input iconfont hide">&#xe626;</i>
<span id="search" class="search" type="submit">搜索</span>
... ...
... ... @@ -2,7 +2,7 @@
<div class="product-category yoho-page">
{{# content}}
<a class="allproduct" href="{{allproduct}}">
<a class="allproduct" href="{{allproduct}}"data-bp-id="page_product-category_true" >
全部商品
<span class="arrow-icon iconfont">
&#xe614;
... ... @@ -16,7 +16,7 @@
<div class="content">
<ul class="primary-level">
{{# class}}
<li class="p-level-item">{{name}}
<li class="p-level-item" data-bp-id="product-primarylevel_{{name}}_true">{{name}}
<div class="primary-level-trilangle hide"></div>
</li>
{{/ class}}
... ... @@ -25,7 +25,7 @@
{{# category}}
<ul class="sub-level">
{{# subcategory}}
<li>
<li data-bp-id="product-sublevel_{{category_name}}_false">
<a href={{url}}>
{{category_name}}
</a>
... ...
... ... @@ -10,7 +10,7 @@
<div id="search-input" class="search-input">
<form id="search-form" action={{url}} method="get">
<i class="search-icon iconfont">&#xe60f;</i>
<input type="text" placeholder="搜索店铺内潮品" name="query">
<input type="text" placeholder="搜索店铺内潮品" name="query" data-bp-id="shop_search_one_true">
<input type="hidden" name="shop_id" value="{{shopId}}">
<input type="hidden" name="app_version" value="{{appVersion}}">
<i class="clear-input iconfont hide">&#xe626;</i>
... ... @@ -27,17 +27,17 @@
{{#if collect}}
<div class="alreadyCollect" id="collect"></div>
{{else}}
<div class="notCollect" id="collect"></div>
<div class="notCollect" id="collect" data-bp-id="shop_collect_one_true"></div>
{{/if}}
</div>
</div>
</div>
<ul id="nav" class="nav">
<li class="active color" tab="home-page">首页</li>
<li tab="new-arrival">上新</li>
<li tab="popularity">人气</li>
<li>
<li class="active color" tab="home-page" data-bp-id="shop_nav_one_true">首页</li>
<li tab="new-arrival" data-bp-id="shop_nav_two_true">上新</li>
<li tab="popularity" data-bp-id="shop_nav_three_true">人气</li>
<li data-bp-id="shop_nav_four_true">
<a href="{{allGoods}}" target="_blank">全部商品</a>
</li>
</ul>
... ... @@ -50,7 +50,7 @@
<div class="multi-browse">
<ul class="swiper-wrapper">
{{#each brandList.list}}
<li class="swiper-slide brand-img">
<li class="swiper-slide brand-img" data-bp-id="shop_brandList_{{brandName}}_false">
<a href="{{url}}">
<img src="{{img}}">
</a>
... ... @@ -70,7 +70,7 @@
<ul class="spring">
{{#each spring}}
<li>
<li data-bp-id="shop_spring_{{springType}}_false">
<a href="{{url}}">
<img src="{{springType}}">
</a>
... ... @@ -85,12 +85,12 @@
<div class="popularity-title">
人气单品
<a class="more" href="{{more_url}}">&#xe618;</a>
<a class="more" href="{{more_url}}" data-bp-id="shop_popularity_more_false">&#xe618;</a>
</div>
<ul class="product-list">
{{#each hotList}}
<li>
<li data-bp-id="shop_popularity_{{productName}}_false">
<a href="{{url}}">
<img src="{{listUrl}}">
</a>
... ... @@ -116,22 +116,22 @@
{{> product/shop-footer}}
{{/unless}}
<ul id="pos-nav" class="nav hide">
<li class="active color" tab="home-page">首页</li>
<li tab="new-arrival">上新</li>
<li tab="popularity">人气</li>
<li>
<a href="{{allGoods}}" target="_blank">全部商品</a>
<li class="active color" tab="home-page" data-bp-id="shop_posnav_one_true">首页</li>
<li tab="new-arrival" data-bp-id="shop_posnav_two_true">上新</li>
<li tab="popularity" data-bp-id="shop_posnav_three_true">人气</li>
<li data-bp-id="shop_posnav_four_true">
<a href="{{allGoods}}" target="_blank" data-bp-id="shop_posnav_four_true">全部商品</a>
</li>
</ul>
<ul id="pos-list" class="home-sub-nav pos-list nav hide">
<li class="new active">
<li class="new active" data-bp-id="shop_poslist_new_true">
<a href="javascript:void(0);">
<span class="spanTest">最新</span>
<span class="iconfont cur">&#xe616;</span>
</a>
</li>
<li class="price">
<li class="price" data-bp-id="shop_posnav_price_true">
<a href="javascript:void(0);">
<span class="spanTest">价格</span>
<span class="icon">
... ... @@ -140,7 +140,7 @@
</span>
</a>
</li>
<li class="discount">
<li class="discount" data-bp-id="shop_posnav_discount_true">
<a href="javascript:void(0);">
<span class="spanTest">折扣</span>
<span class="icon">
... ... @@ -149,7 +149,7 @@
</span>
</a>
</li>
<li class="filter">
<li class="filter" data-bp-id="shop_posnav_filter_true">
<a href="javascript:void(0);">
<span class="spanTest">筛选</span>
<span class="iconfont cur">&#xe613;</span>
... ...
... ... @@ -3,14 +3,14 @@
<div class="filter-body">
<ul class="classify">
{{#each classify}}
<li class="classify-item{{#if @first}} active{{/if}}">
<li class="classify-item{{#if @first}} active{{/if}}" data-bp-id="filter_classify_{{name}}_true">
<p class="shower{{#if default}} default{{/if}}">
<span class="title">{{title}}：</span>
{{name}}
</p>
<ul class="sub-classify" data-type={{dataType}}>
{{# subs}}
<li class="sub-item{{#if chosed}} chosed{{/if}}" data-id={{dataId}}>
<li class="sub-item{{#if chosed}} chosed{{/if}}" data-id={{dataId}} data-bp-id="filter_subclassify_{{name}}_true">
{{name}}
<i class="iconfont chosed-icon">&#xe617;</i>
</li>
... ...
{{#if .}} {{!-- 剔除值为false的项 --}}
<div class="good-info" data-id="{{id}}">
<div class="good-info" data-id="{{id}}" data-bp-id="guang_goodList_{{name}}_false">
<div class="tag-container clearfix">
{{# tags}}
{{# is_new}}
... ...
... ... @@ -3,13 +3,13 @@
<ul class="swiper-wrapper">
{{#each banner}}
{{#if @first}}
<li class="swiper-slide">
<li class="swiper-slide" data-bp-id="guang_swiper_one_false">
<a href="{{url}}">
<img src="{{img}}">
</a>
</li>
{{^}}
<li class="swiper-slide">
<li class="swiper-slide" data-bp-id="guang_swiper_two_false">
<a href="{{url}}">
<img class="swiper-lazy" data-src="{{img}}">
</a>
... ...
<ul class="head-tab">
{{#each headTab}}
<li {{#if cur}} class="cur" {{/if}}><a href="{{ url }}">{{ name }}</a></li>
<li {{#if cur}} class="cur" {{/if}} ><a href="{{ url }}" data-bp-id="guang_tab_{{name}}_false">{{ name }}</a></li>
{{/each}}
</ul>
\ No newline at end of file
</u>
\ No newline at end of file
... ...
... ... @@ -3,14 +3,14 @@
<div class="home-floor-collocation">
<ul class="collocation-big-img">
{{#each collocationBigImg}}
<li><a href="{{url}}"><img class="lazy" data-original="{{img}}"/></a></li>
<li data-bp-id="guang_collocation_one_false"><a href="{{url}}"><img class="lazy" data-original="{{img}}"/></a></li>
{{/each}}
</ul>
<div class="collocation-img">
<div class="collocation-swiper swiper-container">
<ul class="swiper-wrapper">
{{#each collocationList}}
<li class="swiper-slide">
<li class="swiper-slide" data-bp-id="guang_collocationswiper_one_false">
<a href="{{url}}">
<img class="swiper-lazy" data-src="{{img}}">
</a>
... ...
{{# starSubject}}
{{> home/floor_header_more}}
<div class="home-floor-subject">
<div class="home-floor-subject" data-bp-id="guang_subject_one_false">
{{# subjectBanner}}
<a href="{{url}}"><img class="lazy subject-banner" data-original="{{img}}" /></a>
{{/ subjectBanner}}
... ...
... ... @@ -3,13 +3,13 @@
<ul class="swiper-wrapper">
{{#each list}}
{{#if @first}}
<li class="swiper-slide">
<li class="swiper-slide" data-bp-id="shop_bannerarea_one_false">
<a href="{{url}}">
<img src="{{img}}">
</a>
</li>
{{^}}
<li class="swiper-slide">
<li class="swiper-slide" data-bp-id="shop_bannerarea_two_false">
<a href="{{url}}">
<img class="swiper-lazy" data-src="{{img}}">
</a>
... ...
... ... @@ -8,7 +8,7 @@
{{/ banner}}
<ul class="category-list clearfix">
{{# list}}
<li>
<li data-bp-id="shop_hotcategory_{{img}}_false">
<a href="{{url}}">
<div class="img-box">
<img class="lazy" data-original="{{img}}" alt="">
... ...
{{#pageHeader}}
<header id="yoho-header" class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}">
{{#navBack}}
<a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
<a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back" data-bp-id="page_header_back_false">&#xe610;</a>
{{/navBack}}
{{#navBtn}}
<span class="iconfont nav-home">&#xe638;</span>
... ...
<ul id="list-nav" class="home-sub-nav list-nav clearfix">
<li class="new active">
<li class="new active" data-bp-id="shop_listnav_one_true">
<a href="javascript:void(0);">
<span class="spanTest">最新</span>
<span class="iconfont cur">&#xe616;</span>
</a>
</li>
<li class="price">
<li class="price" data-bp-id="shop_listnav_two_true">
<a href="javascript:void(0);">
<span class="spanTest">价格</span>
<span class="icon">
... ... @@ -14,7 +14,7 @@
</span>
</a>
</li>
<li class="discount">
<li class="discount" data-bp-id="shop_listnav_three_true">
<a href="javascript:void(0);">
<span class="spanTest">折扣</span>
<span class="icon">
... ... @@ -23,7 +23,7 @@
</span>
</a>
</li>
<li class="filter">
<li class="filter" data-bp-id="shop_listnav_four_true">
<a href="javascript:void(0);">
<span class="spanTest">筛选</span>
<span class="iconfont cur">&#xe613;</span>
... ...
<div class="shop-foot-wrapper">
<ul{{#if brandList}} class="foot-list-3"{{/if}}>
<li>
<li data-bp-id="shop_footnav_one_true">
{{#if shopCategory.url}}
<a href="{{shopCategory.url}}">商品分类</a>
{{^}}
... ... @@ -8,7 +8,7 @@
<div class="sub-group hide">
<dl>
{{# shopCategory.list}}
<dd><a href="{{url}}">{{name}}</a></dd>
<dd data-bp-id="shop_subgroup_{{name}}_true"><a href="{{url}}">{{name}}</a></dd>
{{/ shopCategory.list}}
</dl>
<div class="sharp"></div>
... ... @@ -17,7 +17,7 @@
<div class="wall"></div>
</li>
{{#if brandList}}
<li>
<li data-bp-id="shop_footnav_two_true">
{{#if brandList.url}}
<a href="{{shopCategory.url}}">品牌一览</a>
{{^}}
... ... @@ -25,7 +25,7 @@
<div class="sub-group hide">
<dl>
{{# brandList.list}}
<dd><a href="{{url}}">{{brandName}}</a></dd>
<dd><a href="{{url}}" data-bp-id="shop_subgroup_{{brandName}}_true">{{brandName}}</a></dd>
{{/ brandList.list}}
</dl>
<div class="sharp"></div>
... ... @@ -34,7 +34,7 @@
<div class="wall"></div>
</li>
{{/if}}
<li>
<li data-bp-id="shop_footnav_three_true">
<a href="{{shopIntroHref}}">店铺简介</a>
</li>
</ul>
... ...