Authored by 徐炜

Merge branch 'feature/prod-list-opt' into release/wap-optim

@@ -21,6 +21,7 @@ var tip = require('../../plugin/tip'); @@ -21,6 +21,7 @@ var tip = require('../../plugin/tip');
21 var loading = require('../../plugin/loading'); 21 var loading = require('../../plugin/loading');
22 22
23 var $goodsContainer = $('#goods-container'), 23 var $goodsContainer = $('#goods-container'),
  24 + $fsgc = $goodsContainer.children('.firstscreen-goods'),
24 $defaultgc = $goodsContainer.children('.default-goods'), 25 $defaultgc = $goodsContainer.children('.default-goods'),
25 $ngc = $goodsContainer.children('.new-goods'), 26 $ngc = $goodsContainer.children('.new-goods'),
26 $sgc = $goodsContainer.children('.sale-goods'), 27 $sgc = $goodsContainer.children('.sale-goods'),
@@ -29,7 +30,7 @@ var $goodsContainer = $('#goods-container'), @@ -29,7 +30,7 @@ var $goodsContainer = $('#goods-container'),
29 $newList = $('.new-list'); 30 $newList = $('.new-list');
30 31
31 var winH = $(window).height(); 32 var winH = $(window).height();
32 - 33 +window.$ = $;
33 var $input = $('#search-input input'), 34 var $input = $('#search-input input'),
34 $clear = $('#search-input .clear-input'), 35 $clear = $('#search-input .clear-input'),
35 $buriedpoint = $('.buriedpoint'), 36 $buriedpoint = $('.buriedpoint'),
@@ -640,7 +641,7 @@ function search(opt) { @@ -640,7 +641,7 @@ function search(opt) {
640 break; 641 break;
641 case 'default': 642 case 'default':
642 window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid, 643 window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
643 - '', $('.default-goods .good-info .good-detail-img .good-thumb')); 644 + '', $('.firstscreen-goods .default-goods .good-info .good-detail-img .good-thumb'));
644 break; 645 break;
645 case 'sale': 646 case 'sale':
646 window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid, 647 window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
@@ -836,6 +837,7 @@ $newList.on('touchstart', 'li', function(e) { @@ -836,6 +837,7 @@ $newList.on('touchstart', 'li', function(e) {
836 837
837 case 'default': 838 case 'default':
838 $defaultgc.removeClass('hide'); 839 $defaultgc.removeClass('hide');
  840 + $fsgc.removeClass('hide');
839 break; 841 break;
840 842
841 case 'sale': 843 case 'sale':
@@ -957,6 +959,7 @@ $listNav.on('touchend touchcancel', function(e) { @@ -957,6 +959,7 @@ $listNav.on('touchend touchcancel', function(e) {
957 959
958 case 'default': 960 case 'default':
959 $defaultgc.removeClass('hide'); 961 $defaultgc.removeClass('hide');
  962 + $fsgc.removeClass('hide');
960 break; 963 break;
961 964
962 case 'sale': 965 case 'sale':