Merge branch 'release/4.6' of http://git.yoho.cn/fe/yohobuywap-node into release/4.6

@@ -14,15 +14,15 @@ const helpers = require(`${library}/helpers`);
 
 
 const headTab = [
 const headTab = [
     {
     {
-        url: '/guang/star',
+        url: '/guang/star?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star","param":{}}}', // eslint-disable-line
         name: '全部'
         name: '全部'
     },
     },
     {
     {
-        url: '/guang/star/special',
+        url: '/guang/star/special?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/special","param":{}}}', // eslint-disable-line
         name: '星专题'
         name: '星专题'
     },
     },
     {
     {
-        url: '/guang/star/collocation',
+        url: '/guang/star/collocation?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/collocation","param":{}}}', // eslint-disable-line
         name: '星搭配'
         name: '星搭配'
     }
     }
 ];
 ];
@@ -36,7 +36,7 @@ const processPublicData = (req, title, navBtn) => {
         pageHeader: headerData
         pageHeader: headerData
     };
     };
 
 
-    if (req.query.appVersion) {
+    if (req.query.app_version || req.query.appVersion) {
         renderData.pageHeader = false;
         renderData.pageHeader = false;
     }
     }
 
 
@@ -128,7 +128,7 @@ exports.collocationList = (req, res) => {
             layout: false,
             layout: false,
             params: params,
             params: params,
             list: result,
             list: result,
-            isApp: req.query.appVersion || false
+            isApp: req.query.app_version || req.query.appVersion || false
         }));
         }));
     });
     });
 };
 };
@@ -142,7 +142,7 @@ exports.collocationList = (req, res) => {
 exports.setFavorite = (req, res) => {
 exports.setFavorite = (req, res) => {
     let params = req.body;
     let params = req.body;
     let uid = req.user.uid || 0;
     let uid = req.user.uid || 0;
-    let isApp = req.query.appVersion || false;
+    let isApp = req.query.app_version || req.query.appVersion || false;
     let url = '/guang/star/collocation';
     let url = '/guang/star/collocation';
     let urlEncode = '';
     let urlEncode = '';
 
 
@@ -188,7 +188,7 @@ exports.detailList = (req, res) => {
             layout: false,
             layout: false,
             params: params,
             params: params,
             list: result,
             list: result,
-            isApp: req.query.appVersion || false
+            isApp: req.query.app_version || req.query.appVersion || false
         }));
         }));
     });
     });
 };
 };

@@ -100,7 +100,7 @@ class Star {
         // 首页明星头像数据处理
         // 首页明星头像数据处理
         if (list.tags) {
         if (list.tags) {
             _.forEach(list.tags, (data) => {
             _.forEach(list.tags, (data) => {
-                let url = `/guang/star/detail?tag=${data.tagName}`;
+                let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/detail?tag=${data.tagName}","param":{}}}`; // eslint-disable-line
 
 
                 formatData.starAvatar.push({
                 formatData.starAvatar.push({
                     url: url,
                     url: url,

@@ -35,7 +35,8 @@ const channelType = {
     boys: '1',
     boys: '1',
     girls: '2',
     girls: '2',
     kids: '3',
     kids: '3',
-    lifeStyle: '4'
+    lifeStyle: '4',
+    all: '1,2,3,4'
 };
 };
 
 
 /**
 /**
@@ -155,7 +156,7 @@ class Sale {
         params.yh_channel = channelType[params.yh_channel];
         params.yh_channel = channelType[params.yh_channel];
 
 
         if (params.outlets) {
         if (params.outlets) {
-            method = 'app.search.li';
+            method = 'app.search.category';
         }
         }
 
 
         params = Object.assign({
         params = Object.assign({

@@ -23,6 +23,7 @@ var winH = $(window).height(),
 
 
 // 默认筛选条件
 // 默认筛选条件
 var defaultOpt = require('../../common/query-param');
 var defaultOpt = require('../../common/query-param');
+var defaultParams;
 
 
 var $listNav = $('#list-nav'),
 var $listNav = $('#list-nav'),
 
 
@@ -93,7 +94,7 @@ function getUrlParam(name) {
 
 
 // 获取频道
 // 获取频道
 $.extend(defaultOpt, {
 $.extend(defaultOpt, {
-    yh_channel: getUrlParam('channel') || 'boys'
+    yh_channel: getUrlParam('channel') || 'all'
 });
 });
 
 
 // 判断导航类型
 // 判断导航类型
@@ -216,12 +217,14 @@ function search(opt, params) {
     }
     }
 
 
     if (params) {
     if (params) {
+        defaultParams = params;
         $.extend(setting, params, {
         $.extend(setting, params, {
             type: navType,
             type: navType,
             order: nav.order,
             order: nav.order,
             page: page
             page: page
         });
         });
     } else {
     } else {
+        defaultParams = null;
         $.extend(setting, defaultOpt, {
         $.extend(setting, defaultOpt, {
             type: navType,
             type: navType,
             order: nav.order,
             order: nav.order,
@@ -456,7 +459,11 @@ function scrollHandler() {
     if ($(window).scrollTop() + winH >
     if ($(window).scrollTop() + winH >
         $(document).height() - 0.25 * $goodsContainer.height() - 50) {
         $(document).height() - 0.25 * $goodsContainer.height() - 50) {
         if (typeof $pre !== 'undefined') {
         if (typeof $pre !== 'undefined') {
-            search();
+            if (defaultParams) {
+                search({type: 'category'}, defaultParams);
+            } else {
+                search();
+            }
         }
         }
     }
     }
 }
 }