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

@@ -116,8 +116,6 @@ const getHomeActivity = (data) => {
     var params = {
     var params = {
         method: 'app.outlets.activityGet',
         method: 'app.outlets.activityGet',
         platform: 2,
         platform: 2,
-        sort: 2,
-        client_type: 'h5'
     };
     };
 
 
     return api.get('', sign.apiSign(_.assign(params, data))).then(res => {
     return api.get('', sign.apiSign(_.assign(params, data))).then(res => {
@@ -129,7 +127,7 @@ exports.getContent = (categoryId, channel, code) => {
     let floorsData = {},
     let floorsData = {},
         params = {
         params = {
             type: 0,
             type: 0,
-            id: 0
+            yh_channel: channel
         };
         };
 
 
     const p = [getNavData(categoryId), getOutletResource(channel, code), getHomeActivity(params)];
     const p = [getNavData(categoryId), getOutletResource(channel, code), getHomeActivity(params)];

-!function(e){function t(i){if(n[i])return n[i].exports;var r=n[i]={exports:{},id:i,loaded:!1};return e[i].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){var i=n(2),r=n(3),a=n(4),s=n(32),o=i(".cd-lite"),l=i(".outlet-category-nav a"),u=n(31),c=n(33);n(31),a(i("img.lazy")),o.length>0&&new s.Countdown({el:o}),i(".swiper-container .swiper-slide").length>1&&new r(".swiper-container",{lazyLoading:!0,lazyLoadingInPrevNext:!0,loop:!0,autoplay:3e3,autoplayDisableOnInteraction:!0,paginationClickable:!0,pagination:".banner-top .pagination-inner"}),l.on("click",function(e){var t=i(this).attr("href"),n=t.split("?")[1].split("&"),r={};i(".category a").removeClass("active"),i(this).addClass("active"),e.preventDefault(),n.forEach(function(e){var t=e.split("="),n=t[0],i=t[1];r[n]=i}),u.start({type:"category"},r)}),l.length>0&&l.eq(0).trigger("click"),i("#index_nav").length>0&&c({el:"#index_nav"})["goto"](i("#index_nav").find(".active").index()),i(".outlet-category-nav").length>0&&c({el:".outlet-category-nav"})["goto"](0),i(".back-ground-white").length>10&&(i(".more-activity").show(),i(".back-ground-white").each(function(e,t){console.log(e),e>9&&i(t).hide()})),i(".more-activity").click(function(){i(".more-activity").hide(),i(".back-ground-white").each(function(e,t){e>9&&i(t).show()})})},,function(e,t,n){var i,r;/*!
+!function(e){function t(i){if(n[i])return n[i].exports;var r=n[i]={exports:{},id:i,loaded:!1};return e[i].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){var i=n(2),r=n(3),a=n(4),s=n(32),o=i(".cd-lite"),l=i(".outlet-category-nav a"),u=n(31),c=n(33);n(31),a(i("img.lazy")),o.length>0&&new s.Countdown({el:o}),i(".swiper-container .swiper-slide").length>1&&new r(".swiper-container",{lazyLoading:!0,lazyLoadingInPrevNext:!0,loop:!0,autoplay:3e3,autoplayDisableOnInteraction:!0,paginationClickable:!0,pagination:".banner-top .pagination-inner"}),l.on("click",function(e){var t=i(this).attr("href"),n=t.split("?")[1].split("&"),r={};i(".category a").removeClass("active"),i(this).addClass("active"),e.preventDefault(),n.forEach(function(e){var t=e.split("="),n=t[0],i=t[1];r[n]=i}),u.start({type:"category"},r)}),l.length>0&&l.eq(0).trigger("click"),i("#index_nav").length>0&&c({el:"#index_nav"})["goto"](i("#index_nav").find(".active").index()),i("#list-nav").length>0&&c({el:"#list-nav"})["goto"](0),i(".back-ground-white").length>10&&(i(".more-activity").show(),i(".back-ground-white").each(function(e,t){e>9&&i(t).hide()})),i(".more-activity").click(function(){i(".more-activity").hide(),i(".back-ground-white").each(function(e,t){e>9&&i(t).show()})})},,function(e,t,n){var i,r;/*!
 	 * jQuery JavaScript Library v2.2.4
 	 * jQuery JavaScript Library v2.2.4
 	 * http://jquery.com/
 	 * http://jquery.com/
 	 *
 	 *

@@ -78,8 +78,7 @@ if ($('.outlet-category-nav').length > 0) {
 if ($('.back-ground-white').length > 10) {
 if ($('.back-ground-white').length > 10) {
     $('.more-activity').show();
     $('.more-activity').show();
     $('.back-ground-white').each(function(index, e) {
     $('.back-ground-white').each(function(index, e) {
-        console.log(index);
-        if (index > 9) {
+        if(index > 9) {
             $(e).hide();
             $(e).hide();
         }
         }
     });
     });

@@ -68,6 +68,9 @@
             text-align: center;
             text-align: center;
             font-size: 28px;
             font-size: 28px;
             font-weight: bold;
             font-weight: bold;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
         }
         }
 
 
         .time {
         .time {
@@ -140,6 +143,9 @@
             width: 200px;
             width: 200px;
             font-size: 28px;
             font-size: 28px;
             font-weight: bold;
             font-weight: bold;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
         }
         }
 
 
         .time {
         .time {