Merge remote-tracking branch 'remotes/origin/master' into feature/unionpromotion

@@ -7,6 +7,7 @@
 'use strict';
 'use strict';
 
 
 const indexModel = require('../models/market');
 const indexModel = require('../models/market');
+const _ = require('lodash');
 
 
 exports.index = (req, res, next) => {
 exports.index = (req, res, next) => {
 
 
@@ -21,3 +22,26 @@ exports.index = (req, res, next) => {
     }).catch(next);
     }).catch(next);
 
 
 };
 };
+
+/**
+ * 市场推广活动升级版，自定义下载渠道
+ * @param req
+ * @param res
+ * @param next
+ */
+exports.v2 = (req, res, next) => {
+
+    indexModel.index({
+
+    }).then((result) => {
+        if (_.has(result, 'download[0].url') && req.query.union_type) {
+            result.download[0].url = result.download[0].url.split('?')[0] +
+                '?union_type=' + req.query.union_type;
+        }
+        res.render('market/market', Object.assign(result, {
+            title: 'Yoho!Buy 有货'
+        }));
+
+    }).catch(next);
+
+};

@@ -12,3 +12,27 @@ exports.wechatShare = (req, res, next) => {
         res.jsonp(result);
         res.jsonp(result);
     }).catch(next);
     }).catch(next);
 };
 };
+
+/**
+ * 活动页<http://feature.yoho.cn/1101/1101ITEMBOY/index.html?title=%E7%94%B7%E7%94%9F%E5%88%86%E4%BC%9A%E5%9C%BA&share_id=814&mkt_code=1011111#a_01>
+ * <xiaoxiao.hao@yoho.cn>
+ * 2016/07/13
+ */
+
+// 活动页保存相应cookie的值
+exports.feature = (req, res) => {
+    let mktCode = req.query.mkt_code || false;
+
+    // 下载浮层，下载按钮会用到该参数
+    if (mktCode) {
+        res.cookie('mkt_code', mktCode, {
+            domain: '.yohobuy.com',
+            path: '/'
+        });
+        res.cookie('unionTypeYas', mktCode, {
+            path: '/'
+        });
+    }
+
+    res.json({mktCode: mktCode});
+};

@@ -71,6 +71,7 @@ router.get('/invite', invite.checkType, invite.index);
 router.get('/invite/index', invite.checkType, invite.index);
 router.get('/invite/index', invite.checkType, invite.index);
 
 
 router.get('/market', market.index); // 市场推广活动
 router.get('/market', market.index); // 市场推广活动
+router.get('/market/v2', market.v2); // 市场推广活动升级版，自定义下载渠道
 
 
 router.get(/\/invite\/share_([\d]+)_([\d]+)_([\d]+).html/, invite.checkType, invite.share);
 router.get(/\/invite\/share_([\d]+)_([\d]+)_([\d]+).html/, invite.checkType, invite.share);
 
 
@@ -116,4 +117,7 @@ router.get('/vip-day1028/crazy-luck', vipDay1028.beforeIn, vipDay1028.crazyLuck)
 router.post('/vip-day1028/signin.json', vipDay1028.beforeIn, vipDay1028.signin);
 router.post('/vip-day1028/signin.json', vipDay1028.beforeIn, vipDay1028.signin);
 router.post('/vip-day1028/isStudent', vipDay1028.beforeIn, vipDay1028.checkIsStudent);
 router.post('/vip-day1028/isStudent', vipDay1028.beforeIn, vipDay1028.checkIsStudent);
 
 
+// 获取活动页传来的参数
+router.get('/wechat/1111', wechat.feature);
+
 module.exports = router;
 module.exports = router;

@@ -60,13 +60,14 @@ exports.ensure = (req, res, next) => {
         let view;
         let view;
 
 
         if (paymentInfo.code !== 200) {
         if (paymentInfo.code !== 200) {
-            if (paymentInfo.message) {
             view = {
             view = {
                 orderEnsure: false,
                 orderEnsure: false,
                 message: paymentInfo.message
                 message: paymentInfo.message
             };
             };
-            } else {
-                return Promise.reject(paymentInfo);
+
+            // hotfix: nginx 接口限流, code:9999991时没message 信息
+            if (!view.message) {
+                view.message = '挤爆啦,系统繁忙';
             }
             }
         } else {
         } else {
             // 渲染
             // 渲染

@@ -12,10 +12,6 @@
 	{{/if}}
 	{{/if}}
 	<!--/tab-nav-->
 	<!--/tab-nav-->
 
 
-	{{#if isApp}}
-		<div class='empty-height'></div>
-	{{/if}}
-
     <div class="plusstar-resources">
     <div class="plusstar-resources">
     	<!--资源位数据模板-->
     	<!--资源位数据模板-->
 	</div><!--/plusstar-resources-->
 	</div><!--/plusstar-resources-->

@@ -136,7 +136,7 @@ const _shop = (req, res, shopId) => {
                 _.forEach(result.hotList, (value, key) => {
                 _.forEach(result.hotList, (value, key) => {
                     result.hotList[key].tags = {};
                     result.hotList[key].tags = {};
                     result.hotList[key].is_soon_sold_out = false;
                     result.hotList[key].is_soon_sold_out = false;
-                    result.hotList[key].tags.isHot = true;
+                    result.hotList[key].tags.is_hot = true;
                 });
                 });
 
 
                 // 有领券功能，不缓存
                 // 有领券功能，不缓存
@@ -495,6 +495,9 @@ const userCoupon = (req, res, next) => {
         }
         }
     }
     }
 
 
+    cryptCouponId = parseInt(cryptCouponId, 10);
+    uid = parseInt(uid, 10);
+
     if (uid) {
     if (uid) {
         listModel.receiveCoupon(
         listModel.receiveCoupon(
             uid,
             uid,

@@ -25,20 +25,20 @@ const list = (req, res, next) => {
     let isQuerySecondClass = false; // 标识用户搜的是不是二级品类
     let isQuerySecondClass = false; // 标识用户搜的是不是二级品类
     let domain = null;
     let domain = null;
 
 
-    if (params.query) {
-        let activity = _.get(searchModel.searchKeyActivity(params.query), 'data.urlobj.appUrl', '');
-
-        if (activity) {
-            res.redirect(activity);
-        }
-    }
-
     if (params.shop_id) {
     if (params.shop_id) {
         params.shopId = params.shop_id;
         params.shopId = params.shop_id;
     }
     }
 
 
+    if (params.query) {
+        return searchModel.searchKeyActivity(params.query).then(activityResult => {
+            let activity = _.get(activityResult, 'urlobj.appUrl', '');
+
+            if (activity) {
+                return res.redirect(activity);
+            } else {
+
                 /* 判断是不是品牌, 是品牌跳到品牌列表页(显示搜索框),判断是不是品类, 是品类加导航标题(不显示搜索框) */
                 /* 判断是不是品牌, 是品牌跳到品牌列表页(显示搜索框),判断是不是品类, 是品类加导航标题(不显示搜索框) */
-    Promise.all([
+                return Promise.all([
                     searchModel.getAllBrandNames(),
                     searchModel.getAllBrandNames(),
                     searchModel.getClassNames()
                     searchModel.getClassNames()
                 ]).then(result => {
                 ]).then(result => {
@@ -125,6 +125,9 @@ const list = (req, res, next) => {
                         pageFooter: true
                         pageFooter: true
                     });
                     });
                 }).catch(next);
                 }).catch(next);
+            }
+        });
+    }
 };
 };
 
 
 /**
 /**
@@ -132,6 +135,7 @@ const list = (req, res, next) => {
  */
  */
 const index = (req, res, next) => {
 const index = (req, res, next) => {
     let title = '搜索';
     let title = '搜索';
+
     ((render) => {
     ((render) => {
         if (_.get(req, 'app.locals.wap.search.removeHotSearch', false)) {
         if (_.get(req, 'app.locals.wap.search.removeHotSearch', false)) {
             render([]);
             render([]);
@@ -156,7 +160,7 @@ const index = (req, res, next) => {
             }
             }
 
 
         });
         });
-    })
+    });
 
 
 };
 };
 
 

-
 'use strict';
 'use strict';
 
 
 const SECOND = 1;
 const SECOND = 1;
@@ -43,6 +42,7 @@ const cachePage = {
 
 
     // 秒杀列表
     // 秒杀列表
     '/product/seckill': 30 * SECOND,
     '/product/seckill': 30 * SECOND,
+    '/product/seckill/list': 30 * SECOND,
 
 
     // 秒杀详情
     // 秒杀详情
     '/product/^\\/seckill\\/pro_([\\d]+)_([\\d]+)/': 30 * MINUTE,
     '/product/^\\/seckill\\/pro_([\\d]+)_([\\d]+)/': 30 * MINUTE,
@@ -64,10 +64,17 @@ const cachePage = {
     '/brands': 5 * MINUTE,
     '/brands': 5 * MINUTE,
     '/brands/search': 1 * MINUTE,
     '/brands/search': 1 * MINUTE,
 
 
-    //活动
+    // 直播活动
+    '/activity/live': 1 * MINUTE,
+
+    // 单品日
     '/activity/single-day': 1 * MINUTE,
     '/activity/single-day': 1 * MINUTE,
+    '/activity/single-day/getSingleData': 30 * SECOND,
+    '/activity/single-day/getProductData': 30 * SECOND,
+
+    // 店铺收藏
     '/activity/shopCollect': 1 * MINUTE,
     '/activity/shopCollect': 1 * MINUTE,
-    '/activity/live': 1 * MINUTE
+    '/activity/shopNav': 30 * SECOND
 
 
 };
 };
 
 

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

@@ -127,6 +127,8 @@ var singleDay = {
                     $swiperTab.on('click', function() {
                     $swiperTab.on('click', function() {
                         var index = $(this).index();
                         var index = $(this).index();
 
 
+                        $('body').scrollTop(0);
+
                         $swiperTab.removeClass('active').eq(index).addClass('active');
                         $swiperTab.removeClass('active').eq(index).addClass('active');
 
 
                         if (self.$productTab.eq(index).find('li').length > 0) {
                         if (self.$productTab.eq(index).find('li').length > 0) {

@@ -398,6 +398,8 @@ function givePoint(parameter) {
                 }
                 }
                 break;
                 break;
         }
         }
+    } else {
+        header.removeClass('girls', 'life-style', 'kids').addClass('boys');
     }
     }
 }());
 }());
 
 

@@ -4,8 +4,7 @@ var $ = require('yoho-jquery'),
     loading = require('../plugin/loading'),
     loading = require('../plugin/loading'),
     debounce = require('lodash/debounce');
     debounce = require('lodash/debounce');
 
 
-var plusstar = {},
-    $footer = $('#yoho-footer');
+var plusstar = {};
 
 
 var windowHeight = $(window).height();
 var windowHeight = $(window).height();
 var scrollFn,
 var scrollFn,
@@ -186,6 +185,9 @@ plusstar = {
                     return true;
                     return true;
                 }
                 }
 
 
+                // 固定底部去除
+                window.rePosFooter();
+
                 // 记录切换tab位置
                 // 记录切换tab位置
                 $(document).scrollTop(window.cookie(code) || 0);
                 $(document).scrollTop(window.cookie(code) || 0);
 
 
@@ -303,23 +305,17 @@ $(function() {
             apt: window.queryString.client_type || '',
             apt: window.queryString.client_type || '',
             sid: window.queryString.session_id || '',
             sid: window.queryString.session_id || '',
         };
         };
-    }
-
-    // 男:1，女:2，潮童:3，创意生活:4
-    speckParamApp.CID = window.queryString.yh_channel || window._ChannelVary[window.cookie('_Channel')] || 1;
 
 
-    if (!isApp) {
+        $('.plusstar-resources').css({'margin-top': $('.tab-nav').height()});
+    } else {
         $('.tab-nav').css({
         $('.tab-nav').css({
             position: 'relative'
             position: 'relative'
         });
         });
-
-        $footer.css({
-            'max-width': '650px'
-        }).before(
-            '<div style="height: ' + parseInt($footer.css('height'), 0) + 'px"></div>'
-        );
     }
     }
 
 
+    // 男:1，女:2，潮童:3，创意生活:4
+    speckParamApp.CID = window.queryString.yh_channel || window._ChannelVary[window.cookie('_Channel')] || 1;
+
     plusstar.init();
     plusstar.init();
 
 
     // 滚动翻页
     // 滚动翻页

@@ -14,6 +14,8 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var trim = $.trim;
 var showErrTip = tip.show;
 var showErrTip = tip.show;
 
 
+require('../../common');
+
 api.bindEyesEvt({
 api.bindEyesEvt({
     status: 'open' // 默认眼睛打开
     status: 'open' // 默认眼睛打开
 });
 });
@@ -49,6 +51,16 @@ $btnSure.on('touchstart', function() {
                 var res = data.data;
                 var res = data.data;
 
 
                 if (data.code === 200) {
                 if (data.code === 200) {
+                    // 统计代码：用于统计从哪个渠道注册成功的
+                    if (window._yas && window._yas.sendCustomInfo) {
+                        window._yas.sendCustomInfo({
+                            op: 'YB_REGISTER_SUCCESS_L',
+                            param: JSON.stringify({
+                                C_ID: window._ChannelVary[window.cookie('_Channel')] || 1,
+                                UNION_TYPE: window.queryString.union_type || window.cookie('unionTypeYas') || false
+                            })
+                        }, true);
+                    }
                     showErrTip('注册成功');
                     showErrTip('注册成功');
 
 
                     location.href = res.href;
                     location.href = res.href;

@@ -127,7 +127,7 @@ function render(data) {
             $('#limitProductCode').val(data.cartInfo.limitProductCode).removeClass(dbClass);
             $('#limitProductCode').val(data.cartInfo.limitProductCode).removeClass(dbClass);
         }
         }
     }
     }
-    if (data.isCollect) {
+    if (data.isCollect === true) {
         $('#likeBtn').addClass('liked');
         $('#likeBtn').addClass('liked');
     }
     }
     if (data.tickets) {
     if (data.tickets) {

@@ -242,6 +242,7 @@ seckillObj = {
                 data = $.extend(data, {isApp: yoho.isApp});
                 data = $.extend(data, {isApp: yoho.isApp});
                 $('.product-list').html(self.listTemplate(data));
                 $('.product-list').html(self.listTemplate(data));
                 lazyload('img.lazy');
                 lazyload('img.lazy');
+                window.scrollTo(0, 0);
                 window.rePosFooter();
                 window.rePosFooter();
             },
             },
             error: function(data) {
             error: function(data) {

@@ -199,7 +199,7 @@ function getPageGoods(info) {
         url: info.url,
         url: info.url,
         data: info.data,
         data: info.data,
         success: function(data) {
         success: function(data) {
-            if (data === ' ') {
+            if (data === '') {
                 nav.end = true;
                 nav.end = true;
             }
             }
 
 
@@ -325,6 +325,7 @@ var theY;
  */
  */
 function reNav1Pos() {
 function reNav1Pos() {
     var sTop = theY ? theY : 0;
     var sTop = theY ? theY : 0;
+
     if (sTop < imgH + main1oH + nav1H) {
     if (sTop < imgH + main1oH + nav1H) {
         if ($nav1.hasClass('hide')) {
         if ($nav1.hasClass('hide')) {
             $nav1.removeClass('hide');
             $nav1.removeClass('hide');
@@ -385,6 +386,7 @@ function scrollHandler() {
     if (sTop + winH * 2 > scH) {
     if (sTop + winH * 2 > scH) {
         scrollCall = function() {
         scrollCall = function() {
             var translate = 'translate3d(0, ' + (-scH) + 'px, 0)';
             var translate = 'translate3d(0, ' + (-scH) + 'px, 0)';
+
             $nav1.css({
             $nav1.css({
                 transform: translate,
                 transform: translate,
                 '-moz-transform': translate,
                 '-moz-transform': translate,
@@ -681,7 +683,7 @@ function search(opt) {
                     break;
                     break;
             }
             }
 
 
-            if (data === ' ') {
+            if (data === '') {
                 nav.end = true;
                 nav.end = true;
 
 
                 if (nav.reload) {
                 if (nav.reload) {
@@ -929,6 +931,7 @@ $nav2.on('touchstart', 'li', function(e) {
 
 
 $('.shop-foot-wrapper .buriedpoint').click(function() {
 $('.shop-foot-wrapper .buriedpoint').click(function() {
     var subGroup = $(this).find('.sub-group');
     var subGroup = $(this).find('.sub-group');
+
     if (subGroup.hasClass('hide')) {
     if (subGroup.hasClass('hide')) {
         subGroup.removeClass('hide');
         subGroup.removeClass('hide');
     } else {
     } else {

@@ -18,12 +18,13 @@
         position: fixed;
         position: fixed;
         z-index: 10;
         z-index: 10;
         background-color: #fff;
         background-color: #fff;
+        top: 0;
 
 
         li {
         li {
             display: block;
             display: block;
             float: left;
             float: left;
             height: 100%;
             height: 100%;
-            width: 33.33%;
+            width: 50%;
             line-height: 60px;
             line-height: 60px;
             color: #999;
             color: #999;
             white-space: nowrap;
             white-space: nowrap;