Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

@@ -150,6 +150,7 @@ class SearchData
         $param['status'] = 1; // 是否上架，1表示在架，2表示不在
         $param['sales'] = 'Y'; // 只搜索销售的产品
         $param['stocknumber'] = 1; // 过滤掉已售罄的商品
+        $param['attribute_not'] = '2'; //过滤掉赠品
         // $param['needFilter'] = 1; // 是否需要返回筛选条件
         if (!isset($condition['order'])) {
             $param['order'] = $orderMaps['s_t_desc'];

@@ -209,7 +209,7 @@ function reMarginFooter(fixedElement) {
     a.async = 1;
     a.src = j;
     m.parentNode.insertBefore(a, m);
-})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.14/yas.js', '_yas');
+})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.15/yas.js', '_yas');
 
 (function() {
     var uid = getUid();
@@ -219,7 +219,7 @@ function reMarginFooter(fixedElement) {
     window._ozuid = uid;//暴露ozuid
 
     if (window._yas) {
-        window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', uid, '', '');
+        window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', uid, '', '');
     }
 }());
 
@@ -6655,15 +6655,15 @@ function search(opt) {
             if (window._yas) {
                 switch (navType) {
                     case 'newest':
-                        window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', window._ozuid,
+                        window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
                                 '', $('.new-goods .good-info .good-detail-img .good-thumb'));
                         break;
                     case 'price':
-                        window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', window._ozuid,
+                        window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
                                 '', $('.price-goods .good-info .good-detail-img .good-thumb'));
                         break;
                     case 'discount':
-                        window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', window._ozuid,
+                        window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
                                 '', $('.discount-goods .good-info .good-detail-img .good-thumb'));
                         break;
                 }
@@ -8610,7 +8610,7 @@ function newData(callback) {
         type: 'newest',
         order: '1',
         page: navInfo.new.page,
-        shop_id: shopId,
+        shop_id: shopId
     };
     req.callBack = function(data) {
         $('#new-arrival').append(data);
@@ -8632,7 +8632,7 @@ function hotData(callback) {
         type: 'hot',
         order: '1',
         page: navInfo.hot.page,
-        shop_id: shopId,
+        shop_id: shopId
     };
     req.callBack = function(data) {
         $('#popularity').append(data);
@@ -8971,7 +8971,7 @@ $.ajax({
     type: 'GET',
     url: '/search/filter',
     data: {
-        shop_id: shopId,
+        shop_id: shopId
     },
     success: function(data) {
         $goodsContainer.append(data);
@@ -9062,6 +9062,23 @@ $subNav.on('touchend touchcancel', function(e) {
                 $pre = $this; //更新pre为当前项
                 nav.reload = true; //重置reload,HTML会被替换为逆序的HTML
                 nav.order = nav.order === 0 ? 1 : 0; //切换排序
+
+                $goodsContainer.children('.container:not(.hide)').addClass('hide');
+
+                switch (navType) {
+                    case 'newest':
+                        $ngc.removeClass('hide');
+                        break;
+
+                    case 'price':
+                        $pgc.removeClass('hide');
+                        break;
+
+                    case 'discount':
+                        $dgc.removeClass('hide');
+                        break;
+                }
+
             }
         } else {
             $active = $subNav.find('.active');