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

@@ -11,8 +11,6 @@ var $ = require('jquery'),
 
 
 var swiper,
 var swiper,
     $fixTitleBar,
     $fixTitleBar,
-    $brandText,
-    $brandHref,
     $brandList = $('.brand-list');
     $brandList = $('.brand-list');
 var $icon = $('.search-icon');
 var $icon = $('.search-icon');
 
 
@@ -21,10 +19,6 @@ var searchH = $('.newbrand-search').outerHeight(),
     brandSwipe = parseInt(searchH) + parseInt(headerH) - 1,
     brandSwipe = parseInt(searchH) + parseInt(headerH) - 1,
     minBrandListTop,
     minBrandListTop,
     searchArray = [],
     searchArray = [],
-    clearTextHammer,
-    removeHistory,
-    searchList,
-    yohoHistory,
     minBrandListTop;
     minBrandListTop;
 
 
 var brandsData,
 var brandsData,
@@ -118,21 +112,6 @@ function searchResult() {
 
 
     // 插入 dom，绑定事件
     // 插入 dom，绑定事件
     $('.search-result').html(html);
     $('.search-result').html(html);
-    $('.search-result .brand-list p').each(function (index) {
-        searchList = new Hammer($('.search-result .brand-list p').eq(index)[0]);
-        searchList.on('tap', function() {
-            $brandText = $('.search-result .brand-list p').eq(index).find('a').html();
-            $brandHref = $('.search-result .brand-list p').eq(index).find('a').attr('href');
-            if (localStorage.getItem('yohoHistory')) {
-                yohoHistory = localStorage.getItem('yohoHistory');
-                searchArray.push(yohoHistory);
-            }
-            if (searchArray.toString().split($brandText).length < 2) {
-                searchArray.push('{"searchName":"' + $brandText + '","searchHref":"' + $brandText + '"}');
-            }
-            localStorage.setItem('yohoHistory', searchArray);
-        });
-    });
 }
 }
 
 
 if ($('.brand-search-page').length) {
 if ($('.brand-search-page').length) {
@@ -156,7 +135,6 @@ if ($('.brand-search-page').length) {
     clearTextHammer = new Hammer($('.clear-text')[0]);
     clearTextHammer = new Hammer($('.clear-text')[0]);
     clearTextHammer.on('tap', function(e) {
     clearTextHammer.on('tap', function(e) {
         e.preventDefault();
         e.preventDefault();
-        $('.search-result').html('');
         $('#keyword').val('').trigger('input');
         $('#keyword').val('').trigger('input');
         e.srcEvent.stopPropagation();
         e.srcEvent.stopPropagation();
     });
     });
@@ -164,20 +142,4 @@ if ($('.brand-search-page').length) {
     $('form.search-box').on('submit', function() {
     $('form.search-box').on('submit', function() {
         return false;
         return false;
     });
     });
-    if (localStorage && localStorage.getItem('yohoHistory')) {
-        yohoHistory = $.parseJSON('[' + localStorage.getItem('yohoHistory') + ']');
-        if (yohoHistory) {
-            $.each(yohoHistory, function(index, content) {
-                $('<a href="' + content.searchHref + '">' + content.searchName + '</a>').appendTo('.historyList');
-            });
-        }
-    } else {
-        $('.history').css('display', 'none');
-    }
-
-    removeHistory = new Hammer($('.removeHistory')[0]);
-    removeHistory.on('tap', function(e) {
-        $('.historyList').html(' ');
-        localStorage.clear();
-    });
 }
 }

@@ -196,50 +196,4 @@
     .search-result {
     .search-result {
         padding-top: 176rem / $pxConvertRem;
         padding-top: 176rem / $pxConvertRem;
     }
     }
-     .history{
-        width: 100%;
-        height: auto;
-        overflow: hidden;
-        position: absolute;
-        left: 0;
-        top: 176rem / $pxConvertRem;
-            > h6{
-            width: 100%;
-            height: 88rem / $pxConvertRem;
-            line-height: 88rem / $pxConvertRem;
-            color: #999;
-            text-indent: .6rem;
-            font-size: 36em / $pxConvertRem;
-            }
-        .historyList{
-            width: 100%;
-            height: auto;
-            overflow: hidden;
-            display: block;
-                > a{
-                width: auto;
-                height: 58rem / $pxConvertRem;
-                overflow: hidden;
-                line-height: 58rem / $pxConvertRem;
-                margin: 0 0 20rem / $pxConvertRem .6rem;
-                padding: 0 20rem / $pxConvertRem;
-                float: left;
-                background-color:#f8f8f8;
-                color: #444;
-                }
-        }
-        > span{
-            width: auto;
-            height: 68rem / $pxConvertRem;
-            overflow: hidden;
-            display: inline-block;
-             line-height: 68rem / $pxConvertRem;
-            border:1px solid #e6e6e6;
-            padding: 0 28rem / $pxConvertRem;
-            font-size: 48em / $pxConvertRem;
-            margin-left: .6rem;
-            color: #000;
-            }
-        }    
-
 }
 }

@@ -10,11 +10,6 @@
             </div>
             </div>
         </form>
         </form>
     </div>
     </div>
-    <div class="history">
-        <h6>历史纪录</h6>
-        <div class="historyList"></div>
-        <span class='removeHistory'>清空搜索历史</span>
-    </div>
     <div class="search-result">
     <div class="search-result">
     </div>
     </div>
 </div>
 </div>