Merge branch 'release/5.4' into gray

@@ -148,9 +148,10 @@ const _proListHandler = (data, params) => {
  */
  */
 const index = (req) => {
 const index = (req) => {
 
 
-    let channel = req.query.channel || req.cookies._Channel || 'boys';
+    let channel = req.yoho.channel;
     let params = {
     let params = {
         yh_channel: channelMap[channel].yh_channel,
         yh_channel: channelMap[channel].yh_channel,
+        channel: channel,
         uid: req.user.uid || ''
         uid: req.user.uid || ''
     };
     };
 
 
@@ -317,10 +318,11 @@ const index = (req) => {
  * @returns {Promise.<TResult>}
  * @returns {Promise.<TResult>}
  */
  */
 const getRecList = (req) => {
 const getRecList = (req) => {
-    let channel = req.query.channel || req.cookies._Channel || 'boys';
+    let channel = req.yoho.channel;
 
 
     let params = {
     let params = {
         yh_channel: channelMap[channel].yh_channel,
         yh_channel: channelMap[channel].yh_channel,
+        channel: channel,
         uid: req.user.uid || ''
         uid: req.user.uid || ''
     };
     };
 
 

@@ -183,7 +183,7 @@ $(document).pjax('.foot-pager .pager > a, .catagory-navs li.active > a', '#pjax-
 });
 });
 
 
 $(document).pjax('.catagory-navs li:not(.active) > a', '#pjax-container', {
 $(document).pjax('.catagory-navs li:not(.active) > a', '#pjax-container', {
-    url: '?',
+    url: '?channel=' + window.queryString().channel,
     timeout: 2000
     timeout: 2000
 });
 });