Merge branch 'hotfix/channel'

@@ -155,7 +155,7 @@ let collocationList = (req, res, next) => {
  * @return {[type]}
  * @return {[type]}
  */
  */
 let setFavorite = (req, res, next) => {
 let setFavorite = (req, res, next) => {
-    let uid = req.body.uid || 0; // 客户端访问，不能使用 cookie
+    let uid = req.cookies.guangStarUid || 0;
     let params = {
     let params = {
         articleId: req.body.articleId,
         articleId: req.body.articleId,
         type: req.body.type
         type: req.body.type

@@ -11,6 +11,7 @@ const isTest = process.env.NODE_ENV === 'test';
 
 
 module.exports = {
 module.exports = {
     app: 'h5',
     app: 'h5',
+    appVersion: '4.6.0', // 调用api的版本
     port: 6001,
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     domains: {
     domains: {
@@ -78,7 +79,7 @@ if (isProduction) {
     Object.assign(module.exports, {
     Object.assign(module.exports, {
         appName: 'm.yohobuy.com for test',
         appName: 'm.yohobuy.com for test',
         domains: {
         domains: {
-            api: 'http://devapi.yoho.cn:58078/',
+            api: 'http://testapi.yoho.cn:28078/',
             service: 'http://testservice.yoho.cn:28077/'
             service: 'http://testservice.yoho.cn:28077/'
         },
         },
         memcache: {
         memcache: {

 <div class="icons-wrapper">
 <div class="icons-wrapper">
     <ul class="icons-list clearfix">
     <ul class="icons-list clearfix">
         {{#data}}
         {{#data}}
-        <li class="icons-item item-{{../data.length}}"><a href="{{url}}" class="imagebar"><img src="{{image src 98 98}}" alt=""></a><a href="{{url}}" class="linkbar">{{title}}</a></li>
+        <li class="icons-item item-{{../number}}"><a href="{{url}}" class="imagebar"><img src="{{image src 98 98}}" alt=""></a><a href="{{url}}" class="linkbar">{{title}}</a></li>
         {{/data}}
         {{/data}}
     </ul>
     </ul>
 </div>
 </div>

@@ -55,8 +55,8 @@
     "serve-favicon": "^2.3.0",
     "serve-favicon": "^2.3.0",
     "uuid": "^2.0.2",
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
     "winston": "^2.2.0",
-    "yoho-node-lib": "0.0.8",
-    "winston-daily-rotate-file": "^1.1.4"
+    "winston-daily-rotate-file": "^1.1.4",
+    "yoho-node-lib": "0.0.11"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.6",
     "autoprefixer": "^6.3.6",

@@ -7,6 +7,7 @@
 module.exports = function(specificGender) {
 module.exports = function(specificGender) {
     var $ = require('yoho-jquery'),
     var $ = require('yoho-jquery'),
         Hammer = require('yoho-hammer'),
         Hammer = require('yoho-hammer'),
+        ellipsis = require('yoho-mlellipsis'),
         tip = require('../plugin/tip'),
         tip = require('../plugin/tip'),
         loading = require('../plugin/loading'),
         loading = require('../plugin/loading'),
         lazyLoad = require('yoho-jquery-lazyload');
         lazyLoad = require('yoho-jquery-lazyload');
@@ -33,6 +34,8 @@ module.exports = function(specificGender) {
 
 
     var bottomBannerLoaded;
     var bottomBannerLoaded;
 
 
+    ellipsis.init();
+
     // ajax url
     // ajax url
     if (kidsType) {
     if (kidsType) {
         url = '/product/recom/maylikekids';
         url = '/product/recom/maylikekids';
@@ -42,7 +45,7 @@ module.exports = function(specificGender) {
         url = specificGender === 'lifestyle' ? '/product/recom/maylike?gender=1,3' : '/product/recom/maylikelife';
         url = specificGender === 'lifestyle' ? '/product/recom/maylike?gender=1,3' : '/product/recom/maylikelife';
     } else {
     } else {
         gender = (specificGender === 'boys' || $('.mobile-wrap').hasClass('boys-wrap')) ?
         gender = (specificGender === 'boys' || $('.mobile-wrap').hasClass('boys-wrap')) ?
-                 'boys' : 'girls';
+                 '1,3' : '2,3';
         url = '/product/recom/maylike?gender=' + gender;
         url = '/product/recom/maylike?gender=' + gender;
     }
     }
 
 
@@ -148,6 +151,13 @@ module.exports = function(specificGender) {
 
 
                 loading.hideLoadingMask();
                 loading.hideLoadingMask();
                 page++;
                 page++;
+
+                $('.good-detail-text .name').each(function() {
+                    var $this = $(this),
+                        $title = $this.find('a');
+
+                    $title[0].mlellipsis(2);
+                });
             },
             },
             error: function() {
             error: function() {
                 tip.show('网络断开连接了~');
                 tip.show('网络断开连接了~');

@@ -106,7 +106,7 @@ function setIndexAction() {
     if (bannerLen > 1) {
     if (bannerLen > 1) {
         avatarSwiper = new Swiper('.avatar-1', {
         avatarSwiper = new Swiper('.avatar-1', {
             loop: true,
             loop: true,
-            initialSlide: 0,
+            initialSlide: 2,
             centeredSlides: true,
             centeredSlides: true,
             slidesPerView: 'auto',
             slidesPerView: 'auto',
             loopedSlides: bannerLen,
             loopedSlides: bannerLen,
@@ -160,12 +160,6 @@ function setIndexAction() {
         setAvatar($(item));
         setAvatar($(item));
     });
     });
 
 
-    $('.star').each(function(key, item) {
-        if ($(item).attr('src') === '') {
-            $(item).addClass('default-avater');
-        }
-    });
-
     $('#yoho-header, .head-tab').on('touchmove', function() {
     $('#yoho-header, .head-tab').on('touchmove', function() {
         return false;
         return false;
     });
     });

@@ -11,9 +11,13 @@
         height: 146px;
         height: 146px;
         text-align: center;
         text-align: center;
 
 
-        &.item-8 {
+        &.item-4 {
             width: 25%;
             width: 25%;
         }
         }
+
+        &.item-5 {
+            width: 20%;
+        }
     }
     }
 
 
     .imagebar {
     .imagebar {