fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by 梁志锋
Commit fd6b8e7d7fa5a46a6b25b80a1474bb852ff54d6e 2 parents 452e6f42 5b211afe

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 2 changed files with 8 additions and 5 deletions
framework @ 75bbc3b0
1 -Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05 1 +Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
@@ -10,6 +10,8 @@ var $ = require('jquery'), @@ -10,6 +10,8 @@ var $ = require('jquery'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
12 var swiper, 12 var swiper,
  13 + $brandText,
  14 + $brandHref,
13 $brandList = $('.brand-list'); 15 $brandList = $('.brand-list');
14 16
15 var searchH = $('.newbrand-search').outerHeight(), 17 var searchH = $('.newbrand-search').outerHeight(),
@@ -137,14 +139,15 @@ function searchResult() { @@ -137,14 +139,15 @@ function searchResult() {
137 $('.search-result .brand-list p').each(function (index) { 139 $('.search-result .brand-list p').each(function (index) {
138 searchList = new Hammer($('.search-result .brand-list p').eq(index)[0]); 140 searchList = new Hammer($('.search-result .brand-list p').eq(index)[0]);
139 searchList.on('tap', function() { 141 searchList.on('tap', function() {
  142 + $brandText = $('.search-result .brand-list p').eq(index).find('a').html();
  143 + $brandHref = $('.search-result .brand-list p').eq(index).find('a').attr('href');
140 if (localStorage.getItem('yohoHistory')) { 144 if (localStorage.getItem('yohoHistory')) {
141 yohoHistory = localStorage.getItem('yohoHistory'); 145 yohoHistory = localStorage.getItem('yohoHistory');
142 searchArray.push(yohoHistory); 146 searchArray.push(yohoHistory);
143 } 147 }
144 - searchArray.push('{"searchName":"' +  
145 - $('.search-result .brand-list p').eq(index).find('a').html() +  
146 - '","searchHref":"' + $('.search-result .brand-list p')  
147 - .eq(index).find('a').attr('href') + '"}'); 148 + if (searchArray.toString().split($brandText).length < 2) {
  149 + searchArray.push('{"searchName":"' + $brandText + '","searchHref":"' + $brandText + '"}');
  150 + }
148 localStorage.setItem('yohoHistory', searchArray); 151 localStorage.setItem('yohoHistory', searchArray);
149 }); 152 });
150 }); 153 });