Authored by 郭成尧

Merge branch 'release/newSearch'

@@ -121,7 +121,7 @@ const _searchGoods = (params) => { @@ -121,7 +121,7 @@ const _searchGoods = (params) => {
121 const getSearchData = (params) => { 121 const getSearchData = (params) => {
122 return _searchGoods(params).then((result) => { 122 return _searchGoods(params).then((result) => {
123 if (result && result.code === 200) { 123 if (result && result.code === 200) {
124 - return productProcess.processProductList(result.data.product_list || []); 124 + return productProcess.processProductList(result.data.product_list || [], {isApp: params.appVersion});
125 } else { 125 } else {
126 logger.error('get product search api return code is not 200'); 126 logger.error('get product search api return code is not 200');
127 return []; 127 return [];
@@ -228,7 +228,7 @@ function newData(callback) { @@ -228,7 +228,7 @@ function newData(callback) {
228 req.url = location.protocol + '//m.yohobuy.com/product/search/search'; 228 req.url = location.protocol + '//m.yohobuy.com/product/search/search';
229 req.data = { 229 req.data = {
230 type: 'new', 230 type: 'new',
231 - order: '1', 231 + order: '0',
232 page: navInfo.new.page, 232 page: navInfo.new.page,
233 tagNew: '1' 233 tagNew: '1'
234 }; 234 };
@@ -643,7 +643,8 @@ function search(opt) { @@ -643,7 +643,8 @@ function search(opt) {
643 $.extend(setting, defaultOpt, { 643 $.extend(setting, defaultOpt, {
644 type: navType, 644 type: navType,
645 order: nav.order, 645 order: nav.order,
646 - page: page 646 + page: page,
  647 + appVersion: appVersion
647 }); 648 });
648 649
649 if (brand) { 650 if (brand) {
@@ -857,6 +858,7 @@ $subNav.on('touchend touchcancel', function(e) { @@ -857,6 +858,7 @@ $subNav.on('touchend touchcancel', function(e) {
857 type: 'shop_id', 858 type: 'shop_id',
858 id: shopId, 859 id: shopId,
859 brand: brand, 860 brand: brand,
  861 + appVersion: appVersion,
860 url: location.protocol + '//m.yohobuy.com/product/search/search', 862 url: location.protocol + '//m.yohobuy.com/product/search/search',
861 nextPage: false 863 nextPage: false
862 }); 864 });