Authored by htoooth

merge feature/searchTerms

... ... @@ -106,7 +106,7 @@
\{{#hotTerms}}
<li>
<a style="display: block;" href="\{{href}}" title="\{{content}}"
act="\{{href}}">
act="\{{href}}" target="_blank">
<span class="searchvalue">\{{content}}</span>
</a>
</li>
... ... @@ -114,7 +114,7 @@
\{{#guessTerms}}
<li>
<a style="display: block;" href="\{{href}}" title="\{{content}}"
act="\{{href}}">
act="\{{href}}" target="_blank">
<span class="searchvalue">\{{content}}</span>
</a>
</li>
... ...
... ... @@ -713,6 +713,8 @@ if ($miniCart && $miniCart.length) {
$goCart.hover(function() {
var data, _html = '';
$searchHistory.hide();
if ($goCart.hasClass('on-hover')) {
return;
}
... ... @@ -735,6 +737,8 @@ if ($miniCart && $miniCart.length) {
data = $dom.data(),
callback;
$searchHistory.hide();
if (data) {
callback = function() {
$dom.closest('.goods-item').remove();
... ... @@ -923,7 +927,7 @@ function actionAddKeyWords() {
function searchSuggestHistory() {
var param = {
return_type: 'jsonp',
query: encodeURIComponent($searchKey.val()) || ''
query: encodeURIComponent(window.queryString().query) || ''
};
$.getJSON('//search.yohobuy.com/product/search/history?callback=?', param, function(jsonData) {
... ... @@ -970,7 +974,7 @@ $searchKey.focus(function() {
});
/**
* 搜索 热门搜索和默认搜索 api
* 搜索 热门搜索 api
* @return {[type]} [description]
*/
function searchSuggestRecommend(channel, key) {
... ... @@ -995,6 +999,7 @@ function searchSuggestRecommend(channel, key) {
}
});
}
/**
... ... @@ -1003,8 +1008,10 @@ function searchSuggestRecommend(channel, key) {
*/
$(function() {
searchSuggestRecommend();
searchSuggestHistory();
});
actionCover();
actionAddKeyWords();
setTimeout(emailUserCertTip, 0);
... ...