Authored by ccbikai

取消搜索按钮

@@ -19,7 +19,6 @@ var searchH = $('.newbrand-search').outerHeight(), @@ -19,7 +19,6 @@ var searchH = $('.newbrand-search').outerHeight(),
19 19
20 var brandsData, 20 var brandsData,
21 $keyword, 21 $keyword,
22 - searchBtnHammer,  
23 clearTextHammer, 22 clearTextHammer,
24 removeHistory, 23 removeHistory,
25 searchList, 24 searchList,
@@ -167,13 +166,6 @@ if ($('.brand-search-page').length) { @@ -167,13 +166,6 @@ if ($('.brand-search-page').length) {
167 } 166 }
168 }).focus(); 167 }).focus();
169 168
170 -  
171 - searchBtnHammer = new Hammer($('.search-btn')[0]);  
172 - searchBtnHammer.on('tap', function(e) {  
173 - searchResult();  
174 - e.srcEvent.stopPropagation();  
175 - });  
176 -  
177 clearTextHammer = new Hammer($('.clear-text')[0]); 169 clearTextHammer = new Hammer($('.clear-text')[0]);
178 clearTextHammer.on('tap', function(e) { 170 clearTextHammer.on('tap', function(e) {
179 $('#keyword').val('').trigger('input'); 171 $('#keyword').val('').trigger('input');
@@ -186,7 +178,6 @@ if ($('.brand-search-page').length) { @@ -186,7 +178,6 @@ if ($('.brand-search-page').length) {
186 if (localStorage) { 178 if (localStorage) {
187 179
188 yohoHistory = $.parseJSON('[' + localStorage.getItem('yohoHistory') + ']'); 180 yohoHistory = $.parseJSON('[' + localStorage.getItem('yohoHistory') + ']');
189 - console.log(yohoHistory);  
190 if (yohoHistory) { 181 if (yohoHistory) {
191 $.each(yohoHistory, function(index, content) { 182 $.each(yohoHistory, function(index, content) {
192 $('<a href="' + content.searchHref + '">' + content.searchName + '</a>').appendTo('.historyList'); 183 $('<a href="' + content.searchHref + '">' + content.searchName + '</a>').appendTo('.historyList');
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <i class="search-icon iconfont">&#xe60f;</i> 6 <i class="search-icon iconfont">&#xe60f;</i>
7 <div class="search-action"> 7 <div class="search-action">
8 <span class="iconfont clear-text">&#xe623;</span> 8 <span class="iconfont clear-text">&#xe623;</span>
9 - <span class="search-btn">搜索</span> 9 + <a class="cancel-btn" href="javascript: history.go(-1);">取消</span>
10 </div> 10 </div>
11 </form> 11 </form>
12 </div> 12 </div>