Merge remote-tracking branch 'origin/feature/hotWordSearch' into release/5.5

@@ -170,10 +170,10 @@ const _getLeftNav = (choosed) => {
 /**
 /**
  * 获取热门搜索
  * 获取热门搜索
  **/
  **/
-const _getSearchIndex = () => {
-    return API.get('', {
+const _getSearchIndex = (params) => {
+    return API.get('', _.assign({
         method: 'app.search.getTerms'
         method: 'app.search.getTerms'
-    }, {
+    }, params), {
         cache: true
         cache: true
     }).then((result) => {
     }).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
@@ -270,10 +270,11 @@ let getChannelData = (params) => {
     var channelData = {};
     var channelData = {};
     let navGender = _.cloneDeep(params.gender);
     let navGender = _.cloneDeep(params.gender);
 
 
-    return Promise.all([getChannelResource(params), _getLeftNav(navGender), _getSearchIndex()]).then((data) => {
+    return Promise.all([getChannelResource(params), _getLeftNav(navGender), _getSearchIndex(params)]).then((data) => {
         channelData.content = data[0] || []; // 资源位数据
         channelData.content = data[0] || []; // 资源位数据
         channelData.sideNav = data[1] || []; // 侧边栏数据
         channelData.sideNav = data[1] || []; // 侧边栏数据
-        channelData.defaultTerms = (data[2] && data[2].defaultTerms && data[2].defaultTerms.length !== 0) ? data[2].defaultTerms[0].content : '搜索商品、品牌';
+        channelData.defaultTerms = (data[2] && data[2].defaultTerms && data[2].defaultTerms.length) ?
+            data[2].defaultTerms[0].content : '搜索商品、品牌';
         return channelData;
         return channelData;
     });
     });
 };
 };

@@ -157,7 +157,11 @@ const index = (req, res, next) => {
         if (_.get(req, 'app.locals.wap.search.removeHotSearch', false)) {
         if (_.get(req, 'app.locals.wap.search.removeHotSearch', false)) {
             render([]);
             render([]);
         } else {
         } else {
-            searchModel.getSearchIndex(uid).then((result) => {
+
+            searchModel.getSearchIndex({
+                gender: req.yoho.channel || 'boys',
+                uid: uid
+            }).then((result) => {
                 render(result);
                 render(result);
             }).catch(next);
             }).catch(next);
         }
         }
@@ -172,9 +176,8 @@ const index = (req, res, next) => {
             pageFooter: true,
             pageFooter: true,
             width750: true,
             width750: true,
             search: {
             search: {
-                defaultTerms: (result && result.hotTerms &&
-                    result.hotTerms.defaultTerms && result.hotTerms.defaultTerms.length !== 0) ?
-                    result.hotTerms.defaultTerms[0].content : '',
+                defaultTerms: (result && result.defaultTerms && result.defaultTerms.length) ?
+                    result.defaultTerms[0].content : '',
                 url: helpers.urlFormat('', null, 'search'),
                 url: helpers.urlFormat('', null, 'search'),
                 hotTerms: result.hotTerms,
                 hotTerms: result.hotTerms,
                 wantTerms: result.guessTerms
                 wantTerms: result.guessTerms

@@ -300,11 +300,22 @@ const getAllBrandNames = () => {
 /**
 /**
  * 搜索主页
  * 搜索主页
  */
  */
-const getSearchIndex = (uid) => {
-    return api.get('', {
-        method: 'app.search.getTerms',
-        uid: uid
-    }, {
+const getSearchIndex = (params) => {
+    let channels = {
+        boys: 1,
+        girl: 2,
+        kids: 3,
+        lifestyle: 4
+    };
+
+    if (params.gender && channels[params.gender]) {
+        params.yh_channel = channels[params.gender];
+        delete params.gender;
+    }
+
+    return api.get('', _.assign({
+        method: 'app.search.getTerms'
+    }, params), {
         cache: true
         cache: true
     }).then((result) => {
     }).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {

@@ -15,15 +15,9 @@ const domains = {
     liveApi: 'http://testapi.live.yohops.com:9999/',
     liveApi: 'http://testapi.live.yohops.com:9999/',
     singleApi: 'http://api-test3.yohops.com:9999/',
     singleApi: 'http://api-test3.yohops.com:9999/',
 
 
-    // api: 'http://api.yoho.yohoops.org/',
-    // service: 'http://service.yoho.yohoops.org/',
-    // liveApi: 'http://api.live.yoho.cn/',
-    // singleApi: 'http://single.yoho.cn/',
-
-    imSocket: 'wss://imsocket.yohobuy.com:443',
-    imCs: 'https://imhttp.yohobuy.com/api',
-    imServer: 'https://imhttp.yohobuy.com/server'
-
+    imSocket: 'ws://socket.yohobuy.com:10240',
+    imCs: 'https://im.yohobuy.com/api',
+    imServer: 'https://im.yohobuy.com/server'
 };
 };
 
 
 module.exports = {
 module.exports = {