Merge branch 'gray' into release/6.0.2

@@ -54,13 +54,3 @@ _fxcmd.push(['trackOrder', {
     unid : "{{uid}}"
 }]);
 </script>
-{{!--<script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script>
-<script type="text/javascript">
-window.criteo_q = window.criteo_q || [];
-window.criteo_q.push( 
-{ event: "setAccount", account: [21397] },
-{ event: "setHashedEmail", email: "" },
-{ event: "setSiteType", type: "m" },
-{ event: "trackTransaction" , id: "{{orderCode}}", currency: "CNY", item: ""}
-);
-</script>--}}

@@ -30,8 +30,7 @@ let _renderData = {
 let _channelPage = (req, res, data) => {
     return channelModel.getChannelData({
         gender: data.gender,
-        uid: req.user.uid,
-        limit: 6// 首屏先获取前6个楼层，其余用ajax获取
+        uid: req.user.uid
     }).then(result => {
         _renderData.homeHeader.defaultTerms = result.defaultTerms;
 
@@ -39,6 +38,10 @@ let _channelPage = (req, res, data) => {
             res.set('Cache-Control', 'no-cache');
         }
 
+        if (result && result.content && result.content.length) {
+            result.content.length = 6; // 首屏先获取前6个楼层，其余用ajax获取
+        }
+
         // result.content = [{
         //     seckill: true,
         //     data: {

@@ -116,7 +116,7 @@ const _processSideBar = (list, choosed) => {
  */
 const getChannelResource = (params) => {
     params.gender = params.gender || 'boys';
-    params.limit = params.limit || 30;
+    params.limit = params.limit || 100;
 
     params = Object.assign(params, {
         gender: genderData[params.gender] || '1,2,3',

@@ -151,20 +151,15 @@ class favoriteIndexModel extends global.yoho.BaseModel {
                         let obj = {
                             productList: []
                         };
+                        let shopOrBrandLink;
 
-                        // if (empty(val.productSkn)) {
-                        //     continue;
-                        // }
-                        if (val.brandOrShopType === 'brandOrShopType') {
-                            obj = _.assign(obj, {
-                                link: helpers.urlFormat('/product/index/brand', {
-                                    shop_id: val.shopId
-                                })
+                        if (val.brandOrShopType === 'brand') {
+                            shopOrBrandLink = helpers.urlFormat('/product/shop', {
+                                brand_id: val.brandId
                             });
                         } else {
-                            obj = _.assign(obj, {
-                                link: helpers.urlFormat('', {}, val.brandDomain)
-
+                            shopOrBrandLink = helpers.urlFormat('/product/shop', {
+                                shop_id: val.shopId
                             });
                         }
 
@@ -175,9 +170,7 @@ class favoriteIndexModel extends global.yoho.BaseModel {
                             discount: val.productDiscountNum,
                             brandImg: val.brandIco,
                             update: val.newProductNum,
-                            link: helpers.urlFormat('/product/shop', {
-                                shop_id: val.shopId
-                            })
+                            link: shopOrBrandLink
                         });
 
                         _.forEach(val.newProduct, function(data, key) {

@@ -23,13 +23,3 @@
         unid: "{{uid}}"
     }]);
 </script>
-<script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script>
-<script type="text/javascript">
-    window.criteo_q = window.criteo_q || [];
-    window.criteo_q.push(
-        {event: "setAccount", account: [21397]},
-        {event: "setHashedEmail", email: ""},
-        {event: "setSiteType", type: "m"},
-        {event: "trackTransaction", id: "{{orderCode}}", currency: "CNY", item: ""}
-    );
-</script>

 {
   "name": "m-yohobuy-node",
-  "version": "6.0.10",
+  "version": "6.0.11",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -176,6 +176,10 @@ class RegisterNew {
                             }, true);
                         }
 
+                        let _fxcmd = window._fxcmd || [];
+
+                        _fxcmd.push(['trackEvent', 'event', 'reg', '注册', '1']);
+
                         setTimeout(function() {
                             location.href = res.href;
                         }, 1500);