fe / YOHOBUYWAP · Commits

Go to a project

Authored by rqq
Commit edb30ca59fc0a5133c9c82a0749db186dc07e7d4 2 parents a9c062be 00660c25

Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

Inline Side-by-side
Showing 11 changed files with 332 additions and 108 deletions
... ... @@ -221,15 +221,21 @@ function reMarginFooter(fixedElement) {
if (window._yas) {
window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', uid, '', '');
$('.buriedpoint').click(function(e) {
var bpIdArr = $(this).attr('data-bp-id').split('_');
var jsonData = {
page: bpIdArr[0],
floor: bpIdArr[1],
data: bpIdArr[2]
};
console.log(jsonData);
console.log(Boolean(parseInt(bpIdArr[3])));
var $aTag = $(this).find('a'),
bpIdArr = $(this).attr('data-bp-id').split('_'),
jsonData = {
page: bpIdArr[0],
floor: bpIdArr[1],
data: bpIdArr[2]
};
if ($aTag.length > 0) {
e.preventDefault();
}
window._yas.sendCustomInfo(jsonData, Boolean(parseInt(bpIdArr[3])));
if ($aTag.length > 0) {
window.location.href = $aTag.attr('href');
}
});
}
}());
... ... @@ -463,7 +469,7 @@ var $ = require("jquery"),
lazyLoad = require("lazyload");
var ranToken = ' ??++ ';
var ranToken2 = ' ???+++ ';
var ranToken2 = ' ???--- ';
var swiper,
$fixTitleBar,
... ... @@ -477,6 +483,7 @@ var swiper,
$homebuttom = $('.homebuttom'),
$genderNav = $('.genderNav'),
$newSearch = $('.newbrand-search'),
$netHistory = $('.net-history'),
$navBtn = $('.nav-home'),
hotBrandsSwiper;
... ... @@ -489,7 +496,7 @@ var brandsData,
$keyword,
clearTextHammer;
var $history = $('.history');
var $history = $('.local-history');
var $searchPage = $('.search-brand-page');
var $historySearch = $('.history-search');
var $hotSearch = $('.hot-search');
... ... @@ -559,29 +566,33 @@ $fixTitleBar.css({
minBrandListTop = brandSwipe + $('.hot-brands').outerHeight() + $('.banner-top').outerHeight();
$brandList.last().append($fixTitleBar);
function scrollHandler() {
var scrTop = $(window).scrollTop();
if ($('.brand-index-page').length > 0) {
function scrollHandler() {
var scrTop = $(window).scrollTop();
if ($brandList.eq(0).offset().top < minBrandListTop) {
$fixTitleBar.hide();
}
if ($brandList.eq(0).offset().top < minBrandListTop) {
$fixTitleBar.hide();
}
$brandList.each(function() {
var offTop = $(this).offset().top - brandSwipe;
$brandList.each(function() {
var offTop = $(this).offset().top - brandSwipe;
if (scrTop >= offTop) {
$fixTitleBar.css({
display: 'block'
}).find('h2').html($(this).find('.title-bar').text());
}
if (scrTop >= offTop) {
$fixTitleBar.css({
display: 'block'
}).find('h2').html($(this).find('.title-bar').text());
}
});
}
//srcoll to load more
$(window).scroll(function() {
window.requestAnimationFrame(scrollHandler);
});
}
//srcoll to load more
$(window).scroll(function() {
window.requestAnimationFrame(scrollHandler);
});
function changeBackground() {
... ... @@ -654,15 +665,15 @@ function searchResult() {
// 插入 dom，绑定事件
$('.search-result').html(html);
changeBackground();
bindWirteLocal($('.brand-list'));
bindWirteLocal($('.brand-list'), true);
}
if ($('.history-search').length > 0) {
bindWirteLocal($('.history-search'));
bindWirteLocal($('.history-search'), false);
}
if ($('.hot-search').length > 0) {
bindWirteLocal($('.hot-search'));
bindWirteLocal($('.hot-search'), false);
}
if ($('.brand-search-page').length > 0) {
... ... @@ -773,11 +784,11 @@ function removeHistory() {
/**
* 增加单条记录
*/
function addHistory(brandName, brandId, brandDomain) {
function addHistory(brandName) {
$.ajax({
type: 'GET',
url: '/brands/addBrandSearch',
data: 'brandName=' + brandName + '&brandId=' + brandId + '&brandDomain=' + brandDomain,
data: 'brandName=' + brandName,
success: function(data) {
},
error: function() {
... ... @@ -785,6 +796,17 @@ function addHistory(brandName, brandId, brandDomain) {
});
}
//比较大小
function sequence(a, b) {
if (a.time > b.time) {
return 1;
} else if (a.time < b.time) {
return -1;
} else {
return 0;
}
}
//初始化历史搜索的内容
if ($('.brand-search-page').length > 0) {
... ... @@ -811,14 +833,32 @@ if ($('.brand-search-page').length > 0) {
history,
historys, i,
localHistory,
brand,url;
brand,data,brandName,
time,netArr,dict,dictc,localArr,
combinArr,key,date,temp;
localArr = [];
combinArr = [];
netArr = [];
$netHistory.find('li').each(function() {
brand = $(this).find('a').attr('brandName');
time = $(this).find('a').attr('collectTime');
dict = {
brand: brand,
time: time
};
netArr.push(dict);
});
if (localStorage) {
historys = localStorage.getItem('historys-brand');
if (historys && historys.length > 0) {
historys = historys.split(ranToken);
for (i = (historys.length >= 10) ? 10 : historys.length; i > 0; i--) {
for (i = historys.length; i > 0; i--) {
history = historys[i - 1];
if (history === '') {
... ... @@ -827,33 +867,95 @@ if ($('.brand-search-page').length > 0) {
localHistory = history.split(ranToken2);
brand = localHistory[0];
url = localHistory[1];
time = localHistory[1];
dict = {
brand: brand,
time: time
}
localArr.push(dict);
}
}
}
if (localArr.length === 0 && netArr.length === 0) {
$historySearch.addClass('hide');
return;
}
date = {};
temp = {};
if (localArr.length > 0) {
for (dictc in localArr) {
temp = localArr[dictc];
if (!date[temp.brand] || date[temp.brand] < temp.time) {
date[temp.brand] = temp.time;
}
}
}
if (netArr.length > 0 ) {
for (dict in netArr) {
temp = netArr[dict];
if (!date[temp.brand] || date[temp.brand] < temp.time) {
date[temp.brand] = temp.time;
}
}
}
html += '<li><a href="' + url + '" brandName = "' + brand +
'">' + brand + '</li>';
$historySearch.removeClass('hide');
data = {};
for (key in date) {
if (date.hasOwnProperty(key)) {
data = {
brand: key,
time: date[key]
}
combinArr.push(data);
}
}
combinArr.sort(sequence);
if (combinArr.length > 0) {
for (i = combinArr.length - 1 ; i >= (combinArr.length > 10) ? (combinArr.length - 10) : 0; i--) {
brand = combinArr[i].brand;
time = combinArr[i].time;
html += '<li><a brandName = "' + brand +
'">' + brand + '</li>';
$history.removeClass('hide');
$history.html(html);
$clearHistory.removeClass('hide');
$hotSearch.removeClass('hide');
window.rePosFooter();
}
} else {
$history.addClass('hide');
}
}());
}
//绑定提交前的存local操作
function bindWirteLocal($brandList) {
$brandList.on('click', 'p , li', function(e) {
$keyword = $('#keyword');
function bindWirteLocal($brandList,list) {
$brandList.on('click', 'p , li' , function(e) {
var brandName, brandId, brandDomain, url;
var a = $(this).find('a');
var query = a.attr('brandName') + ranToken2 + a.attr('href'),
var myDate = new Date();
var query = a.attr('brandName') + ranToken2 + myDate,
historys;
$keyword = $('#keyword');
brandName = a.attr('brandName');
brandId = a.attr('brandId');
... ... @@ -864,19 +966,28 @@ function bindWirteLocal($brandList) {
e.preventDefault();
if ($('.net-history').length > 0) {
addHistory(brandName, brandId, brandDomain);
if ($netHistory.length > 0) {
addHistory(brandName);
if (list) {
location.href = url;
return;
}
$keyword.val(brandName);
searchInput();
return;
}
if (localStorage) {
historys = localStorage.getItem('historys-brand');
historys = historys ? historys : '';
if (historys.indexOf(ranToken + query + ranToken) > -1) {
$keyword.val(brandName);
searchInput();
return;
... ... @@ -891,10 +1002,16 @@ function bindWirteLocal($brandList) {
localStorage.setItem('historys-brand', historys);
}
if (list) {
location.href = url;
return;
}
$keyword.val(brandName);
searchInput();
});
}
});
define("js/plugin/loading", ["jquery"], function(require, exports, module){
/**
... ... @@ -10026,26 +10143,27 @@ function downCount(options) {
_minute = _second * 60,
_hour = _minute * 60,
_day = _hour * 24,
days,
hours,
minutes,
seconds;
// calculate dates
days = Math.floor(difference / _day),
hours = Math.floor((difference % _day) / _hour),
minutes = Math.floor((difference % _hour) / _minute),
seconds = Math.floor((difference % _minute) / _second);
// fix dates so that it will show two digets
days = (String(days).length >= 2) ? days : '0' + days;
hours = (String(hours).length >= 2) ? hours : '0' + hours;
minutes = (String(minutes).length >= 2) ? minutes : '0' + minutes;
seconds = (String(seconds).length >= 2) ? seconds : '0' + seconds;
// set to DOM
$countdownContainer.removeClass('hide');
$countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
if (hours === 0) {
$countDownHours.text('剩余' + minutes + ':' + seconds);
} else {
$countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
}
difference -= 1000;
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.

21.3 KB | W: | H:

21.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

22.8 KB | W: | H:

22.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

8.77 KB | W: | H:

8.82 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -11,7 +11,7 @@ var $ = require('jquery'),
lazyLoad = require('yoho.lazyload');
var ranToken = ' ??++ ';
var ranToken2 = ' ???+++ ';
var ranToken2 = ' ???--- ';
var swiper,
$fixTitleBar,
... ... @@ -25,6 +25,7 @@ var swiper,
$homebuttom = $('.homebuttom'),
$genderNav = $('.genderNav'),
$newSearch = $('.newbrand-search'),
$netHistory = $('.net-history'),
$navBtn = $('.nav-home'),
hotBrandsSwiper;
... ... @@ -37,7 +38,7 @@ var brandsData,
$keyword,
clearTextHammer;
var $history = $('.history');
var $history = $('.local-history');
var $searchPage = $('.search-brand-page');
var $historySearch = $('.history-search');
var $hotSearch = $('.hot-search');
... ... @@ -107,29 +108,33 @@ $fixTitleBar.css({
minBrandListTop = brandSwipe + $('.hot-brands').outerHeight() + $('.banner-top').outerHeight();
$brandList.last().append($fixTitleBar);
function scrollHandler() {
var scrTop = $(window).scrollTop();
if ($('.brand-index-page').length > 0) {
function scrollHandler() {
var scrTop = $(window).scrollTop();
if ($brandList.eq(0).offset().top < minBrandListTop) {
$fixTitleBar.hide();
}
if ($brandList.eq(0).offset().top < minBrandListTop) {
$fixTitleBar.hide();
}
$brandList.each(function() {
var offTop = $(this).offset().top - brandSwipe;
$brandList.each(function() {
var offTop = $(this).offset().top - brandSwipe;
if (scrTop >= offTop) {
$fixTitleBar.css({
display: 'block'
}).find('h2').html($(this).find('.title-bar').text());
}
if (scrTop >= offTop) {
$fixTitleBar.css({
display: 'block'
}).find('h2').html($(this).find('.title-bar').text());
}
});
}
//srcoll to load more
$(window).scroll(function() {
window.requestAnimationFrame(scrollHandler);
});
}
//srcoll to load more
$(window).scroll(function() {
window.requestAnimationFrame(scrollHandler);
});
function changeBackground() {
... ... @@ -202,15 +207,15 @@ function searchResult() {
// 插入 dom，绑定事件
$('.search-result').html(html);
changeBackground();
bindWirteLocal($('.brand-list'));
bindWirteLocal($('.brand-list'), true);
}
if ($('.history-search').length > 0) {
bindWirteLocal($('.history-search'));
bindWirteLocal($('.history-search'), false);
}
if ($('.hot-search').length > 0) {
bindWirteLocal($('.hot-search'));
bindWirteLocal($('.hot-search'), false);
}
if ($('.brand-search-page').length > 0) {
... ... @@ -321,11 +326,11 @@ function removeHistory() {
/**
* 增加单条记录
*/
function addHistory(brandName, brandId, brandDomain) {
function addHistory(brandName) {
$.ajax({
type: 'GET',
url: '/brands/addBrandSearch',
data: 'brandName=' + brandName + '&brandId=' + brandId + '&brandDomain=' + brandDomain,
data: 'brandName=' + brandName,
success: function(data) {
},
error: function() {
... ... @@ -333,6 +338,17 @@ function addHistory(brandName, brandId, brandDomain) {
});
}
//比较大小
function sequence(a, b) {
if (a.time > b.time) {
return 1;
} else if (a.time < b.time) {
return -1;
} else {
return 0;
}
}
//初始化历史搜索的内容
if ($('.brand-search-page').length > 0) {
... ... @@ -359,14 +375,32 @@ if ($('.brand-search-page').length > 0) {
history,
historys, i,
localHistory,
brand,url;
brand,data,brandName,
time,netArr,dict,dictc,localArr,
combinArr,key,date,temp;
localArr = [];
combinArr = [];
netArr = [];
$netHistory.find('li').each(function() {
brand = $(this).find('a').attr('brandName');
time = $(this).find('a').attr('collectTime');
dict = {
brand: brand,
time: time
};
netArr.push(dict);
});
if (localStorage) {
historys = localStorage.getItem('historys-brand');
if (historys && historys.length > 0) {
historys = historys.split(ranToken);
for (i = (historys.length >= 10) ? 10 : historys.length; i > 0; i--) {
for (i = historys.length; i > 0; i--) {
history = historys[i - 1];
if (history === '') {
... ... @@ -375,33 +409,95 @@ if ($('.brand-search-page').length > 0) {
localHistory = history.split(ranToken2);
brand = localHistory[0];
url = localHistory[1];
time = localHistory[1];
dict = {
brand: brand,
time: time
}
localArr.push(dict);
}
}
}
if (localArr.length === 0 && netArr.length === 0) {
$historySearch.addClass('hide');
return;
}
date = {};
temp = {};
if (localArr.length > 0) {
for (dictc in localArr) {
temp = localArr[dictc];
if (!date[temp.brand] || date[temp.brand] < temp.time) {
date[temp.brand] = temp.time;
}
}
}
if (netArr.length > 0 ) {
for (dict in netArr) {
temp = netArr[dict];
if (!date[temp.brand] || date[temp.brand] < temp.time) {
date[temp.brand] = temp.time;
}
}
}
html += '<li><a href="' + url + '" brandName = "' + brand +
'">' + brand + '</li>';
$historySearch.removeClass('hide');
data = {};
for (key in date) {
if (date.hasOwnProperty(key)) {
data = {
brand: key,
time: date[key]
}
combinArr.push(data);
}
}
combinArr.sort(sequence);
if (combinArr.length > 0) {
for (i = combinArr.length - 1 ; i >= (combinArr.length > 10) ? (combinArr.length - 10) : 0; i--) {
brand = combinArr[i].brand;
time = combinArr[i].time;
html += '<li><a brandName = "' + brand +
'">' + brand + '</li>';
$history.removeClass('hide');
$history.html(html);
$clearHistory.removeClass('hide');
$hotSearch.removeClass('hide');
window.rePosFooter();
}
} else {
$history.addClass('hide');
}
}());
}
//绑定提交前的存local操作
function bindWirteLocal($brandList) {
$brandList.on('click', 'p , li', function(e) {
$keyword = $('#keyword');
function bindWirteLocal($brandList,list) {
$brandList.on('click', 'p , li' , function(e) {
var brandName, brandId, brandDomain, url;
var a = $(this).find('a');
var query = a.attr('brandName') + ranToken2 + a.attr('href'),
var myDate = new Date();
var query = a.attr('brandName') + ranToken2 + myDate,
historys;
$keyword = $('#keyword');
brandName = a.attr('brandName');
brandId = a.attr('brandId');
... ... @@ -412,19 +508,28 @@ function bindWirteLocal($brandList) {
e.preventDefault();
if ($('.net-history').length > 0) {
addHistory(brandName, brandId, brandDomain);
if ($netHistory.length > 0) {
addHistory(brandName);
if (list) {
location.href = url;
return;
}
$keyword.val(brandName);
searchInput();
return;
}
if (localStorage) {
historys = localStorage.getItem('historys-brand');
historys = historys ? historys : '';
if (historys.indexOf(ranToken + query + ranToken) > -1) {
$keyword.val(brandName);
searchInput();
return;
... ... @@ -439,7 +544,12 @@ function bindWirteLocal($brandList) {
localStorage.setItem('historys-brand', historys);
}
if (list) {
location.href = url;
return;
}
$keyword.val(brandName);
searchInput();
});
}
\ No newline at end of file
}
... ...
... ... @@ -318,8 +318,8 @@
text-align: center;
vertical-align: middle;
font-size: 24px;
line-height: 70px;
height: 70px;
line-height: 40px;
height: 40px;
overflow:hidden;
color: #b8b8b8;
}
... ...
{{> layout/header}}
<div class="brand-page yoho-page">
<div class="brand-page yoho-page brand-index-page">
{{# channel}}
<div class="genderNav">
... ...
... ... @@ -17,35 +17,31 @@
<div class="search-brand-page">
<div class="search-items">
{{#if history}}
<div class="net-history">
<div class="history-search net-search">
<h3><span class="iconfont">&#xe64a;</span>最近搜索
<button id="clear-history" class="clear-icon iconfont">&#xe64c;</button>
</h3>
<ul class="history clearfix">
{{# history}}
<li>
<a href="{{url}}" brandName="{{name}}" brandId="{{brandId}}" brandDomain="{{brandDomain}}">{{name}}</a>
</li>
{{/ history}}
</ul>
</div>
</div>
{{else}}
<div class="history-search local-search hide">
<h3><span class="iconfont">&#xe64a;</span>最近搜索
<button id="clear-history" class="clear-icon iconfont hide">&#xe64c;</button>
</h3>
<ul class="history clearfix">
</ul>
<div class="net-history hide">
<div class="history-search net-search hide">
<ul class="history clearfix net">
{{# history}}
<li>
<a href="{{url}}" brandName="{{name}}" collectTime="{{searchTime}}">{{name}}</a>
</li>
{{/ history}}
</ul>
</div>
</div>
{{/if}}
<div class="history-search local-search">
<h3><span class="iconfont">&#xe64a;</span>最近搜索
<button id="clear-history" class="clear-icon iconfont">&#xe64c;</button>
</h3>
<ul class="history clearfix local-history">
</ul>
</div>
<div class="hot-search">
<h3><span class="iconfont">&#xe64b;</span>热门搜索</h3>
<ul class="hot clearfix">
{{# hot}}
<li>
<a href="{{url}}" brandName="{{name}}" brandId="{{brandId}}" brandDomain="{{brandDomain}}">{{name}}</a>
<a href="{{url}}" brandName="{{name}}"">{{name}}</a>
</li>
{{/ hot}}
</ul>
... ...