Merge branch 'master' into feature/shopseo

@@ -5,6 +5,10 @@
  */
 'use strict';
 
+if (process.env.USE_APM === '1' && process.env.NODE_ENV === 'production') {
+    require('oneapm');
+}
+
 const config = require('./config/common');
 
 global.Promise = require('bluebird');
@@ -76,7 +80,7 @@ app.use(session({
 app.use((req, res, next) => {
     req.user = {}; // 全局的用户数据
     req.yoho = {}; // req和res绑定yoho对象，用于传递全局数据, 如req.yoho.channel等
-    req.app.locals.wap = app.locals.wap; //zookeper对象赋值
+    req.app.locals.wap = app.locals.wap; // zookeper对象赋值
     if (!req.session.id) {
         req.session.id = uuid.v4();
     }

+/**
+ * Created by yoho on 2016/11/8.
+ */
+'use strict';
+const helpers = global.yoho.helpers;
+const crypto = global.yoho.crypto;
+
+exports.index = (req, res) => {
+    let quhUnion = crypto.encryption('', decodeURI(req.query._QYH_UNION));
+
+    res.cookie('_QYH_UNION', quhUnion, {
+        domain: 'yohobuy.com',
+        expires: new Date(Date.now() + 24 * 60 * 60 * 1000)
+    });
+
+    return res.redirect(req.query.target || helpers.urlFormat('/'));
+};

+/**
+ * sub app coupon
+ * @author: lixia.zhang<lixia.zhang@yoho.cn>
+ * @date: 2016/05/31
+ */
+
+var express = require('express'),
+    path = require('path'),
+    helpers = require(path.join(global.utils, 'helpers'));
+
+var app = express();
+
+// set view engin
+var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
+
+app.on('mount', function(parent) {
+    delete parent.locals.settings; // 不继承父 App 的设置
+    Object.assign(app.locals, parent.locals);
+});
+app.use(global.yoho.hbs({
+    extname: '.hbs',
+    defaultLayout: 'layout',
+    layoutsDir: doraemon,
+    partialsDir: path.join(__dirname, 'views/partial'),
+    views: path.join(__dirname, 'views/action'),
+    helpers: Object.assign({}, global.yoho.helpers, helpers)
+}));
+
+// router
+app.use(require('./router'));
+
+module.exports = app;

+/**
+ * router of sub app coupon
+ * @author: lixia.zhang<lixia.zhang@yoho.cn>
+ * @date: 2016/05/31
+ */
+
+'use strict';
+
+const router = require('express').Router(); // eslint-disable-line
+const cRoot = './controllers';
+const ads = require(`${cRoot}/ads`);
+
+// routers
+
+router.get('/ads', ads.index);
+
+module.exports = router;

@@ -7,8 +7,7 @@ const couponModel = require(`${mRoot}/coupon`); // 领取优惠券 model
 exports.index = (req, res, next) => {
     var renderData = {
             module: 'activity',
-            page: 'coupon',
-            appDownLoadLink: 'http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho'
+            page: 'coupon'
         },
         ordercode = req.query.ordercode,
         uid = req.query.uid,
@@ -28,7 +27,6 @@ exports.index = (req, res, next) => {
             // 获取信息成功
             couponData.ordercode = ordercode;
         }
-        couponData.appDownLoadLink = renderData.appDownLoadLink;
         res.render('coupon', {
             result: couponData,
             module: 'activity',
@@ -61,6 +59,7 @@ exports.getCoupon = (req, res, next) => {
             // 获取信息成功
             couponData.ordercode = ordercode;
         }
+
         // console.log(couponData);
         res.json({
             result: couponData
@@ -94,6 +93,7 @@ exports.verify = (req, res, next) => {
             // 获取信息成功
             couponData.ordercode = ordercode;
         }
+
         // console.log(couponData);
         res.json({
             result: couponData

@@ -7,6 +7,7 @@
 'use strict';
 
 const indexModel = require('../models/market');
+const _ = require('lodash');
 
 exports.index = (req, res, next) => {
 
@@ -21,3 +22,26 @@ exports.index = (req, res, 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);
     }).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});
+};
\ No newline at end of file

@@ -17,18 +17,21 @@ const getPageInfo = (pageInfo) => {
         dest.activityID = pageInfo.id;
         dest.title = pageInfo.data.h5Title;
         dest.activityDesc = pageInfo.data.activityDesc;
+        dest.formatActivityDesc = pageInfo.data.formatActivityDesc;
         dest.couponPic = pageInfo.data.couponPic;
         dest.oldUserCouponPic = pageInfo.data.oldUserCouponPic;
         dest.mobile = pageInfo.data.mobile;
         dest.wechatShare = true;
+        dest.secondScreenPic = pageInfo.data.secondScreenPic;
+        dest.activityEndPic = pageInfo.data.activityEndPic;
+        dest.buttonLink = pageInfo.data.buttonLink;
 
-        // 强制活动开始，活动上线产品要求这样设置
-        pageInfo.data.flag = 1;
-        if (pageInfo.data.flag === 1) {
-            dest.bgImg = pageInfo.data.activityNormalPic;
-        } else {
+        if (pageInfo.data.flag === 3 || pageInfo.data.flag === 4 || pageInfo.data.flag === 5) {
+            // flag为3 表示活动结束 , 4 表示未开始
             dest.bgImg = pageInfo.data.activityEndPic;
             dest.ended = true;
+        } else {
+            dest.bgImg = pageInfo.data.activityNormalPic;
         }
         dest.message = pageInfo.data.returnMsg;
     }
@@ -91,7 +94,7 @@ exports.getCoupon = (data) => {
             method: 'wap.order.drawOrderShareCoupon'
         },
 
-    // 处理完成后，发给后端
+        // 处理完成后，发给后端
         phoneData = Object.assign(defaultParam, data);
 
     return api.get('', phoneData).then(result => {
@@ -108,10 +111,10 @@ exports.registerAndSendCoupon = (data) => {
             method: 'wap.order.registerAndSendCoupon'
         },
 
-    // 处理完成后，发给后端
+        // 处理完成后，发给后端
         verifyData = Object.assign(defaultParam, data);
 
     return api.get('', verifyData).then(result => {
         return getUserStatus(result);
-    });  // 所有数据返回一个 Promise，方便 Promise.all 调用
+    }); // 所有数据返回一个 Promise，方便 Promise.all 调用
 };

@@ -71,6 +71,7 @@ router.get('/invite', invite.checkType, invite.index);
 router.get('/invite/index', invite.checkType, invite.index);
 
 router.get('/market', market.index); // 市场推广活动
+router.get('/market/v2', market.v2); // 市场推广活动升级版，自定义下载渠道
 
 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/isStudent', vipDay1028.beforeIn, vipDay1028.checkIsStudent);
 
+// 获取活动页传来的参数
+router.get('/wechat/1111', wechat.feature);
+
 module.exports = router;

@@ -2,6 +2,9 @@
 <div class="receive-coupon-page">
     <div class="bg-contain">
         <img src="{{image bgImg 640 1136}}">
+        {{#if secondScreenPic}}
+            <img src="{{image secondScreenPic}}">
+        {{/if}}
     </div>
     <p class="hidden" id="orderCode">{{ordercode}}</p>
     <p class="hidden" id="oldUserCouponPic">{{image oldUserCouponPic}}</p>
@@ -24,7 +27,7 @@
             <p>登录Yoho!Buy有货客户端即可使用</p>
 
             <div class="use-coupon-btn">
-                <a href="{{appDownLoadLink}}">马上去Yoho!Buy有货使用</a>
+                <a href="{{buttonLink}}">马上去Yoho!Buy有货使用</a>
             </div>
             <span class="description"></span>
         </div>
@@ -57,6 +60,7 @@
     </div>
     
     <div class="tip-wrap hidden">
+        <img src="{{image activityEndPic 640 1136}}">
         <div class="tip fail">
             <div class="header">
             </div>
@@ -78,7 +82,12 @@
     <div class="mask hidden"></div>
     <div class="dialog hidden" id="message">
         <span class="close"></span>
-        {{{activityDesc}}}
+        <div class="activity-message">
+            <h3>活动说明</h3>
+            <div class="message">
+                {{{formatActivityDesc}}}
+            </div>
+        </div>
     </div>
 
     

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

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

@@ -55,7 +55,8 @@ const _reviewStatus = (res, req, uid, status) => {
 
     } else if (status === '3') {
         return {
-            error: true
+            error: true,
+            failReason: '姓名、身份证、银行卡不匹配'
         };
     } else if (status === '4') {
         return {
@@ -63,6 +64,11 @@ const _reviewStatus = (res, req, uid, status) => {
                 url: jumpUrl
             }
         };
+    } else if (status === '5') {
+        return {
+            error: true,
+            failReason: '您的授信未通过,在有货更多的消费,增加信用度,会大大提升审核通过率奥。'
+        };
     }
 };
 
@@ -136,7 +142,7 @@ const index = (req, res) => {
 
                 return params;
             });
-        } else if (openStatus === '1' || openStatus === '3' || openStatus === '4') {
+        } else if (openStatus === '1' || openStatus === '3' || openStatus === '4' || openStatus === '5') {
             res.redirect('/home/installment/review?status=' + openStatus);
         }
     }).then((result) => {
@@ -326,6 +332,7 @@ const startingService = (req, res) => {
         page: 'installment.starting-service',
         title: '开通有货分期',
         navTitle: '开通有货分期',
+        isInstallmentPage: true,
         navBtn: false,
         banks: banks.join('、')
     });

@@ -290,7 +290,7 @@ const orderDetailData = (uid, orderCode) => {
             }
 
             if (orderDetail.invoice) {
-                orderDetail.invoice.type = orderDetail.invoice.type === '2';
+                orderDetail.invoice.type = (orderDetail.invoice.type + '' === '2');
             }
 
             // 取消订单原因列表

@@ -22,7 +22,7 @@
         <div class="error">
             <i class="error-icon"></i>
             <p class="error-txt1">审核未通过暂时无法授信</p>
-            <p class="error-txt2">可能原因：姓名、身份证、银行卡不匹配</p>
+            <p class="error-txt2">可能原因：{{failReason}}</p>
             <a href="/home/installment/starting-service" class="open-btn">重新申请</a>
         </div>
     {{/ error}}

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

@@ -25,106 +25,107 @@ const list = (req, res, next) => {
     let isQuerySecondClass = false; // 标识用户搜的是不是二级品类
     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) {
         params.shopId = params.shop_id;
     }
 
-    /* 判断是不是品牌, 是品牌跳到品牌列表页(显示搜索框),判断是不是品类, 是品类加导航标题(不显示搜索框) */
-    Promise.all([
-        searchModel.getAllBrandNames(),
-        searchModel.getClassNames()
-    ]).then(result => {
-        if (query) {
-            query = query.toLowerCase();
-            _.forEach(result[0], obj => {
-
-                if (query === obj.brandDomain) { // 精确查品牌域名
-                    domain = query;
-                    return false;
-                }
-
-                if (query === obj.brandName || query === obj.brandName || query === obj.brandName) { // 精确查品牌名称
-                    domain = obj.brandDomain;
-                    return false;
-                }
-
-                // if (obj.brandDomain.indexOf(query) > 0) { // 模糊查品牌域名
-                //     domain = obj.brandDomain;
-                //     return false;
-                // }
-            });
-
-            // 跳转到品牌商品列表页
-            if (domain !== null && !params.shop_id) {
-                let url = helpers.urlFormat('', {
-                    from: 'search',
-                    query: query
-
-                }, domain);
-
-                return res.redirect(url);
-            }
+    return searchModel.searchKeyActivity(params.query || '').then(activityResult => {
+        let activity = _.get(activityResult, 'urlobj.appUrl', '');
 
-            // 品类名称为空时跳出
-            if (!result[1]) {
-                return;
-            }
+        if (activity) {
+            return res.redirect(activity);
+        } else {
 
-            _.forEach(result[1].first, (obj) => {
-                // 精确查一级品类
-                if (obj === query) {
-                    isQueryFirstClass = true;
-                    return false;
+            /* 判断是不是品牌, 是品牌跳到品牌列表页(显示搜索框),判断是不是品类, 是品类加导航标题(不显示搜索框) */
+            return Promise.all([
+                searchModel.getAllBrandNames(),
+                searchModel.getClassNames()
+            ]).then(result => {
+                if (query) {
+                    query = query.toLowerCase();
+                    _.forEach(result[0], obj => {
+
+                        if (query === obj.brandDomain) { // 精确查品牌域名
+                            domain = query;
+                            return false;
+                        }
+
+                        if (query === obj.brandName || query === obj.brandName || query === obj.brandName) { // 精确查品牌名称
+                            domain = obj.brandDomain;
+                            return false;
+                        }
+
+                        // if (obj.brandDomain.indexOf(query) > 0) { // 模糊查品牌域名
+                        //     domain = obj.brandDomain;
+                        //     return false;
+                        // }
+                    });
+
+                    // 跳转到品牌商品列表页
+                    if (domain !== null && !params.shop_id) {
+                        let url = helpers.urlFormat('', {
+                            from: 'search',
+                            query: query
+
+                        }, domain);
+
+                        return res.redirect(url);
+                    }
+
+                    // 品类名称为空时跳出
+                    if (!result[1]) {
+                        return;
+                    }
+
+                    _.forEach(result[1].first, (obj) => {
+                        // 精确查一级品类
+                        if (obj === query) {
+                            isQueryFirstClass = true;
+                            return false;
+                        }
+                    });
+
+                    _.forEach(result[1].second, (obj) => {
+                        // 精确查二级品类
+                        if (obj === query) {
+                            isQuerySecondClass = true;
+                            return false;
+                        }
+                    });
+                } else {
+                    params.query = '';
                 }
-            });
 
-            _.forEach(result[1].second, (obj) => {
-                // 精确查二级品类
-                if (obj === query) {
-                    isQuerySecondClass = true;
-                    return false;
+                // 搜索是一级品类
+                if (isQueryFirstClass) {
+                    title = '全部' + query;
+                } else if (isQuerySecondClass) { // 搜索是二级品类
+                    title = query;
+                } else { // 搜索其它内容
+                    if (query || params.form) {
+                        params.search = {
+                            default: query === '' ? false : query,
+                            url: helpers.urlFormat('', null, 'search')
+                        };
+                    }
+                    title = '搜索';
                 }
-            });
-        } else {
-            params.query = '';
-        }
 
-        // 搜索是一级品类
-        if (isQueryFirstClass) {
-            title = '全部' + query;
-        } else if (isQuerySecondClass) { // 搜索是二级品类
-            title = query;
-        } else { // 搜索其它内容
-            if (query || params.form) {
-                params.search = {
-                    default: query === '' ? false : query,
-                    url: helpers.urlFormat('', null, 'search')
-                };
-            }
-            title = '搜索';
+                title = params.title ? params.title : title;
+
+                res.render('search/list', {
+                    module: 'product',
+                    page: 'search-list',
+                    pageHeader: headerModel.setNav({
+                        navTitle: title
+                    }),
+                    title: title,
+                    goodList: params,
+                    pageFooter: true
+                });
+            }).catch(next);
         }
-
-        title = params.title ? params.title : title;
-
-        res.render('search/list', {
-            module: 'product',
-            page: 'search-list',
-            pageHeader: headerModel.setNav({
-                navTitle: title
-            }),
-            title: title,
-            goodList: params,
-            pageFooter: true
-        });
-    }).catch(next);
+    });
 };
 
 /**
@@ -132,6 +133,7 @@ const list = (req, res, next) => {
  */
 const index = (req, res, next) => {
     let title = '搜索';
+
     ((render) => {
         if (_.get(req, 'app.locals.wap.search.removeHotSearch', false)) {
             render([]);
@@ -140,7 +142,7 @@ const index = (req, res, next) => {
                 render(result);
             }).catch(next);
         }
-        
+
     })((result) => {
         res.render('search/index', {
             module: 'product',
@@ -156,8 +158,8 @@ const index = (req, res, next) => {
             }
 
         });
-    })
-    
+    });
+
 };
 
 /**

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

@@ -16,15 +16,15 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     domains: {
-        // api: 'http://api-test3.yohops.com:9999/',
-        // service: 'http://service-test3.yohops.com:9999/',
-        // liveApi: 'http://testapi.live.yohops.com:9999/',
-        // singleApi: 'http://api-test3.yohops.com:9999/'
+        api: 'http://api-test3.yohops.com:9999/',
+        service: 'http://service-test3.yohops.com:9999/',
+        liveApi: 'http://testapi.live.yohops.com:9999/',
+        singleApi: 'http://api-test3.yohops.com:9999/'
 
-        api: 'http://api.yoho.cn/',
-        service: 'http://service.yoho.cn/',
-        liveApi: 'http://api.live.yoho.cn/',
-        singleApi: 'http://single.yoho.cn/'
+        // api: 'http://api.yoho.cn/',
+        // service: 'http://service.yoho.cn/',
+        // liveApi: 'http://api.live.yoho.cn/',
+        // singleApi: 'http://single.yoho.cn/'
     },
     subDomains: {
         host: '.m.yohobuy.com',

@@ -21,4 +21,7 @@ module.exports = app => {
 
     // 分期付款
     app.use('/home', require('./apps/home'));
+
+    // 第三方服务处理
+    app.use('/3party', require('./apps/3party'));
 };

@@ -14,6 +14,10 @@
         <link rel="dns-prefetch" href="//static.yohobuy.com">
         <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
         <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
+
+        <!-- oneapm agent -->
+        <script type='text/javascript'>window.BWEUM||(BWEUM={});BWEUM.info = {"stand":true,"agentType":"browser","agent":"bi-collector.oneapm.com/static/js/bw-send-411.4.9.js","beaconUrl":"bi-collector.oneapm.com/beacon","licenseKey":"NQVuf~6yrQbvJnqr","applicationID":2283639};</script><script type="text/javascript">/*!OneAPM-v411.4.9 */!function(){window.NREUM||(window.NREUM={}),window.BWEUM||(window.BWEUM=window.NREUM);var a;window.BWEUM.require=a,window.apmFirstbyte=window.apmUserFirstbyte||(new Date).getTime(),a=function b(c,d,e){function f(h,i){if(!d[h]){if(!c[h]){var j="function"==typeof a&&a;if(!i&&j)return j(h,!0);if(g)return g(h,!0);var k=new Error("Cannot find module '"+h+"'");throw k.code="MODULE_NOT_FOUND",k}var l=d[h]={exports:{}};c[h][0].call(l.exports,function(a){var b=c[h][1][a];return f(b?b:a)},l,l.exports,b,c,d,e)}return d[h].exports}for(var g="function"==typeof a&&a,h=0;h<e.length;h++)f(e[h]);return f}({38:[function(a,b){b.exports=function(a){var b=document.createElement("a"),c=window.location,d={};b.href=a,d.port=b.port;var e=b.href.split("://");return!d.port&&e[1]&&(d.port=e[1].split("/")[0].split(":")[1]),d.port&&"0"!==d.port||(d.port="https"===e[0]?"443":"80"),d.hostname=b.hostname||c.hostname,d.pathname=b.pathname,"/"!==d.pathname.charAt(0)&&(d.pathname="/"+d.pathname),d.sameOrigin=!b.hostname||b.hostname===document.domain&&b.port===c.port&&b.protocol===c.protocol,d}},{}],34:[function(a,b){function c(){var a=m.info=window.BWEUM.info;if(a&&a.agent&&a.licenseKey&&a.applicationID&&i&&i.body){m.proto="https"===l.split(":")[0]||a.sslForHttp?"https://":"http://",g("mark",["onload",f()]);var b=i.createElement("script");b.src=0==a.agent.indexOf("//")?a.agent:m.proto+a.agent,b.src+="?v=411.4.9 ",i.body.appendChild(b)}}function d(){o||"complete"===i.readyState&&e()}function e(){g("mark",["domContent",f()])}function f(){return(new Date).getTime()}var g=a("handle"),h=window,i=h.document,j="addEventListener",k="attachEvent",l=(""+location).split("?")[0],m=b.exports={offset:window.apmFirstbyte||f(),origin:l,features:{}};g("mark",["firstbyte",window.apmFirstbyte||f()]),"complete"===document.readyState?(e(),c()):i[j]?(i[j]("DOMContentLoaded",e,!1),h[j]("load",c,!1)):(i[k]("onreadystatechange",d),h[k]("onload",c));var n=!1,o=!1;try{n=null==window.frameElement&&document.documentElement}catch(m){}n&&n.doScroll&&!function p(){if(!o){try{n.doScroll("left")}catch(a){return setTimeout(p,50)}o=!0,e()}}()},{handle:33}],33:[function(a,b){function c(a,b,c){return d.listeners(a).length?d.emit(a,b,c):(e[a]||(e[a]=[]),void e[a].push(b))}var d=a("ee").create(),e={};b.exports=c,c.ee=d,d.q=e},{ee:31}],36:[function(a,b){function c(a,b,c){b||(b=0),"undefined"==typeof c&&(c=a?a.length:0);for(var d=-1,e=c-b||0,f=new Array(0>e?0:e);++d<e;)f[d]=a[b+d];return f}b.exports=c},{}],31:[function(a,b){function c(a){function b(b,c,g){a&&a(b,c,g),g||(g={});var i=h(b),j=i.length,k={};try{k=f(g,e,d)}catch(l){}for(var m=0;j>m;m++)i[m].apply(k,c);return k}function g(a,b){j[a]=h(a).concat(b)}function h(a){return j[a]||[]}function i(){return c(b)}var j={};return{on:g,emit:b,create:i,listeners:h,_events:j}}function d(){return{}}var e="bw@context",f=a("gos");b.exports=c()},{gos:32}],32:[function(a,b){function c(a,b,c){if(d.call(a,b))return a[b];var e=c();if(Object.defineProperty&&Object.keys)try{return Object.defineProperty(a,b,{value:e,writable:!0,enumerable:!1}),e}catch(f){}try{a[b]=e}catch(f){}return e}var d=Object.prototype.hasOwnProperty;b.exports=c},{}]},{},[]),a=function c(b,d,e){function f(h,i){if(!d[h]){if(!b[h]){var j="function"==typeof a&&a;if(!i&&j)return j(h,!0);if(g)return g(h,!0);var k=new Error("Cannot find module '"+h+"'");throw k.code="MODULE_NOT_FOUND",k}var l=d[h]={exports:{}};b[h][0].call(l.exports,function(a){var c=b[h][1][a];return f(c?c:a)},l,l.exports,c,b,d,e)}return d[h].exports}for(var g="function"==typeof a&&a,h=0;h<e.length;h++)f(e[h]);return f}({1:[function(a){a("loader"),a("errorload"),a("xhrload"),a("perfload")},{errorload:5,loader:34,perfload:6,xhrload:7}],7:[function(a){function b(a){if("string"==typeof a&&a.length)return a.length;if("object"!=typeof a)return void 0;if("undefined"!=typeof ArrayBuffer&&a instanceof ArrayBuffer&&a.byteLength)return a.byteLength;if("undefined"!=typeof Blob&&a instanceof Blob&&a.size)return a.size;if("undefined"!=typeof FormData&&a instanceof FormData)return void 0;try{return JSON.stringify(a).length}catch(b){return void 0}}function c(a,b){return b}function d(a){a.send=o.wrapOld(a.send,"send-xhr-",c),a.onreadystatechange=o.wrapOld(a.onreadystatechange,"iexhr-onreadystatechange-",c),a.onerror=o.wrapOld(a.onerror,"iexhr-onerror-",c)}function e(a){var c=this.params,d=this.metrics;if(!this.ended){if(this.ended=!0,a.removeEventListener)for(var e=0;m>e;e++)a.removeEventListener(l[e],this.listener,!1);if(!c.aborted){if(d.duration=(new Date).getTime()-this.startTime,4===a.readyState){c.status=a.status;var f=a.responseType,g="arraybuffer"===f||"blob"===f||"json"===f?a.response:a.responseText,h=b(g);h&&(d.rxSize=h)}else c.status=0;d.cbTime=this.cbTime,c&&c.pathname&&c.pathname.indexOf("beacon/resources")<0&&i("xhr",[c,d,this.startTime,this.creatType])}}}function f(a,b){var c=j(b),d=a.params;d.host=c.hostname+":"+c.port,d.pathname=c.pathname,a.sameOrigin=c.sameOrigin}var g=window,h=(g.performance,window.XMLHttpRequest);if(h&&h.prototype&&!/CriOS/.test(navigator.userAgent)){a("loader").features.xhr=!0;var i=a("handle"),j=a("parse-url"),k=a("ee"),l=["load","error","abort","timeout"],m=l.length,n=a("loader_id"),o=a("wrap-function")(k);a("wrap-events"),a("wrap-xhr"),k.on("new-xhr",function(){this.totalCbs=0,this.called=0,this.cbTime=0,this.end=e,this.ended=!1,this.xhrGuids={}}),k.on("open-xhr-start",function(a){this.params={method:a[0]},f(this,a[1]),this.metrics={}}),k.on("open-xhr-end",function(a,b){b.__oldie&&d(b)}),k.on("send-xhr-start",function(a,c){var d=this.metrics,e=a[0],f=this;if(d&&e){var g=b(e);g&&(d.txSize=g)}if(this.startTime=(new Date).getTime(),this.listener=function(a){try{"abort"===a.type&&(f.params.aborted=!0),("load"!==a.type||f.called===f.totalCbs&&(f.onloadCalled||"function"!=typeof c.onload))&&f.end&&f.end(c)}catch(b){try{k.emit("internal-error",[b])}catch(d){}}},c.addEventListener)for(var h=0;m>h;h++)c.addEventListener(l[h],this.listener,!1)}),k.on("iexhr-onreadystatechange-start",function(a,b){if(1==b.readyState){var d=b.onreadystatechange;setTimeout(function(){b.onreadystatechange!==d&&(b.onreadystatechange=o.wrapOld(b.onreadystatechange,"iexhr-onreadystatechange-",c))},0)}4==b.readyState&&(this.xhrCbStart=(new Date).getTime())}),k.on("iexhr-onreadystatechange-end",function(a,b){var c=this;this.xhrCbStart&&k.emit("xhr-cb-time",[(new Date).getTime()-this.xhrCbStart,this.onload,b],b),4==b.readyState&&c.end(b)}),k.on("xhr-cb-time",function(a,b,c){this.cbTime+=a,b?this.onloadCalled=!0:this.called+=1,this.called!==this.totalCbs||!this.onloadCalled&&"function"==typeof c.onload||this.end(c)}),k.on("xhr-load-added",function(a,b){var c=""+n(a)+!!b;this.xhrGuids&&!this.xhrGuids[c]&&(this.xhrGuids[c]=!0,this.totalCbs+=1)}),k.on("xhr-load-removed",function(a,b){var c=""+n(a)+!!b;this.xhrGuids&&this.xhrGuids[c]&&(delete this.xhrGuids[c],this.totalCbs-=1)}),k.on("addEventListener-end",function(a,b){b instanceof XMLHttpRequest&&"load"===a[0]&&k.emit("xhr-load-added",[a[1],a[2]],b)}),k.on("removeEventListener-end",function(a,b){b instanceof XMLHttpRequest&&"load"===a[0]&&k.emit("xhr-load-removed",[a[1],a[2]],b)}),k.on("fn-start",function(a,b,c){b instanceof XMLHttpRequest&&("onload"===c&&(this.onload=!0),("load"===(a[0]&&a[0].type)||this.onload)&&(this.xhrCbStart=(new Date).getTime()))}),k.on("fn-end",function(a,b){this.xhrCbStart&&k.emit("xhr-cb-time",[(new Date).getTime()-this.xhrCbStart,this.onload,b],b)})}},{ee:31,handle:33,loader:34,loader_id:35,"parse-url":38,"wrap-events":28,"wrap-function":39,"wrap-xhr":30}],35:[function(a,b){function c(a){var b=typeof a;return!a||"object"!==b&&"function"!==b?-1:a===window?0:f(a,e,function(){return d++})}var d=1,e="bw@id",f=a("gos");b.exports=c},{gos:32}],6:[function(a){var b=window.performance;if(b&&b.timing&&b.getEntriesByType){var c=a("ee"),d=a("handle"),e=(a("wrap-timer"),a("loader"));e.features.stn=!0,c.on("fn-start",function(a){var b=a[0];b instanceof Event&&(this.bstStart=Date.now())}),c.on("fn-end",function(a,b){var c=a[0];c instanceof Event&&d("bst",[c,b,this.bstStart,Date.now()])})}},{ee:31,handle:33,loader:34,"wrap-timer":29}],5:[function(a){function b(a,b,d,g,i){try{j?j-=1:e("err",[i||new c(a,b,d)])}catch(k){try{e("ierr",[k,(new Date).getTime(),!0])}catch(l){}}return"function"==typeof h?h.apply(this,f(arguments)):!1}function c(a,b,c){this.message=a||"Uncaught error with no additional information",this.sourceURL=b,this.line=c}function d(a){e("err",[a,(new Date).getTime()])}var e=a("handle"),f=a("lodash._slice"),g=a("ee"),h=window.onerror,i=!1,j=0;a("loader").features.err=!0,window.onerror=b,window.BWEUM.noticeError=d;var k=window.XMLHttpRequest;try{throw new Error}catch(l){"stack"in l&&(a("wrap-timer"),"addEventListener"in window&&a("wrap-events"),k&&k.prototype&&k.prototype.addEventListener&&a("wrap-xhr"),i=!0)}g.on("fn-start",function(){i&&(j+=1)}),g.on("fn-err",function(a,b,c){i&&(this.thrown=!0,d(c))}),g.on("fn-end",function(){i&&!this.thrown&&j>0&&(j-=1)}),g.on("internal-error",function(a){e("ierr",[a,(new Date).getTime(),!0])})},{ee:31,handle:33,loader:34,"lodash._slice":36,"wrap-events":28,"wrap-timer":29,"wrap-xhr":30}],30:[function(a,b){function c(){j.inPlace(this,m,"fn-")}function d(a,b){j.inPlace(b,["onreadystatechange"],"fn-")}function e(a){a.open=j.wrapOld(a.open,"open-xhr-",f)}function f(a,b){return b}var g=a("ee").create(),h=a("wrap-events"),i=a("wrap-function"),j=i(g),k=i(h),l=window.XMLHttpRequest,m=["onload","onerror","onabort","onloadstart","onloadend","onprogress","ontimeout"];b.exports=g,window._ApmXMLHttpRequest=window.XMLHttpRequest,window.XMLHttpRequest=function(a){var b=new l(a);try{g.emit("new-xhr",[],b),l.prototype.addEventListener?(k.inPlace(b,["addEventListener","removeEventListener"],"-",function(a,b){return b}),b.addEventListener("readystatechange",c,!1)):(b.__oldie=!0,e(b))}catch(d){try{g.emit("internal-error",[d])}catch(f){}}return b},window.XMLHttpRequest.prototype=l.prototype,j.inPlace(XMLHttpRequest.prototype,["open","send"],"-xhr-",f),g.on("send-xhr-start",d),g.on("open-xhr-start",d)},{ee:31,"wrap-events":28,"wrap-function":39}],29:[function(a,b){function c(a,b,c){var d=a[0];"string"==typeof d&&(d=new Function(d)),a[0]=e(d,"fn-",null,c)}var d=(a("lodash._slice"),a("ee").create()),e=a("wrap-function")(d);b.exports=d,e.inPlace(window,["setTimeout","setInterval","setImmediate"],"setTimer-"),d.on("setTimer-start",c)},{ee:31,"lodash._slice":36,"wrap-function":39}],28:[function(a,b){function c(a){f.inPlace(a,["addEventListener","removeEventListener"],"-",d)}function d(a){return a[1]}var e=(a("lodash._slice"),a("ee").create()),f=a("wrap-function")(e),g=a("gos");if(b.exports=e,c(window),"getPrototypeOf"in Object){for(var h=document;h&&!h.hasOwnProperty("addEventListener");)h=Object.getPrototypeOf(h);h&&c(h);for(var i=XMLHttpRequest.prototype;i&&!i.hasOwnProperty("addEventListener");)i=Object.getPrototypeOf(i);i&&c(i)}else Object.prototype.hasOwnProperty.call(XMLHttpRequest,"addEventListener")&&c(XMLHttpRequest.prototype);e.on("addEventListener-start",function(a){if(a[1]){var b=a[1];"function"==typeof b?this.wrapped=a[1]=g(b,"bw@wrapped",function(){return f(b,"fn-",null,b.name||"anonymous")}):"function"==typeof b.handleEvent&&f.inPlace(b,["handleEvent"],"fn-")}}),e.on("removeEventListener-start",function(a){var b=this.wrapped;b&&(a[1]=b)})},{ee:31,gos:32,"lodash._slice":36,"wrap-function":39}],39:[function(a,b){function c(a){return!(a&&"function"==typeof a&&a.apply&&!a[f])}var d=a("ee"),e=a("lodash._slice"),f="bw@wrapper",g=Object.prototype.hasOwnProperty;b.exports=function(a){function b(a,b,d,g,i){function j(){var c=this;return h(a,b,c,e(arguments),d,g,i)}if(c(a))return a;b||(b="");try{j[f]=!0}catch(k){}return l(a,j),j}function h(a,b,c,d,e,f){var d,c,g,h;try{g=e&&e(d,c)||{}}catch(i){m([i,"",[d,c,f],g])}_apmfnName=a.name||"",k(b+"start",[d,c,f,_apmfnName],g);try{return h=a.apply(c,d)}catch(j){var l=window.console;throw void 0!=l&&l.error&&l.log&&void 0!=j.stack&&(l.log("OneAPM catch error"),l.error(j.stack)),k(b+"err",[d,c,j],g),j}finally{k(b+"end",[d,c,h,_apmfnName],g)}}function i(a,b,c){var a=a||function(){},b=b||"-";return function(){var d=this;return h(a,b,d,e(arguments),c)}}function j(a,d,e,f){e||(e="");var g,h,i,j="-"===e.charAt(0);for(i=0;i<d.length;i++)h=d[i],g=a[h],c(g)||(a[h]=b(g,j?h+e:e,f,h,a))}function k(b,c,d){try{a.emit(b,c,d)}catch(e){m([e,b,c,d])}}function l(a,b){if(Object.defineProperty&&Object.keys)try{var c=Object.keys(a);return c.forEach(function(c){Object.defineProperty(b,c,{get:function(){return a[c]},set:function(b){return a[c]=b,b}})}),b}catch(d){m([d])}for(var e in a)g.call(a,e)&&(b[e]=a[e]);return b}function m(b){try{a.emit("internal-error",b)}catch(c){}}return a||(a=d),b.inPlace=j,b.flag=f,b.wrapOld=i,b}},{ee:31,"lodash._slice":36}]},{},[1]),window.BWEUM.require=a}();</script>
+
         {{#if width750}}
         <script type="text/javascript">
             (function(d,c){var e=d.documentElement,a="orientationchange" in window?"orientationchange":"resize",b=function(){var f=e.clientWidth;if(!f){return}if(f>=750){e.style.fontSize="40px"}else{e.style.fontSize=40*(f/750)+"px"}};if(!d.addEventListener){return}b();c.addEventListener(a,b,false);d.addEventListener("DOMContentLoaded",b,false)})(document,window);

+/**
+ * OneAPM agent configuration
+ */
+
+const commonConfig = require('./config/common');
+
+exports.config = {
+    app_name: [commonConfig.appName],
+    license_key: 'BwEGA1dRDlQ6357HHQ1AD1xJVkbc9fNfWRtQUwhQG41c5QFWGFIDSQoHc0e8AgMaUlcUVw0=',
+    logging: {
+        level: 'info'
+    },
+    transaction_events: {
+        enabled: true
+    }
+};

 {
   "name": "m-yohobuy-node",
-  "version": "5.1.8",
+  "version": "5.1.12",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {
@@ -12,7 +12,7 @@
     "dev": "nodemon -e js,hbs -i public/ app.js",
     "online": "NODE_ENV=\"production\" node app.js",
     "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js",
-    "lint-js": "eslint -c .eslintrc --cache --fix .",
+    "lint-js": "eslint -c .eslintrc --cache .",
     "lint-css": "stylelint --config .stylelintrc public/scss/**/*.css",
     "precommit": "node lint.js"
   },
@@ -30,6 +30,7 @@
     "md5": "^2.1.0",
     "moment": "^2.15.1",
     "morgan": "^1.7.0",
+    "oneapm": "^1.2.20",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-qq": "0.0.3",

@@ -329,14 +329,30 @@ $('.close').on('click', function() {
     $('.dialog').addClass('hidden');
     $('.mask').addClass('hidden');
     $('#dialog .content').html(' ');
+    $('body').css({
+        overflow: 'auto',
+        position: ''
+    });
+});
+$('.mask').on('touchmove', function() {
+    return false;
 });
+
 $('.coupon-description span').on('click', function() {
     $('#message').removeClass('hidden');
     $('.mask').removeClass('hidden');
+    $('body').css({
+        overflow: 'hidden',
+        position: 'fixed'
+    });
 });
 $('.description').on('click', function() {
     $('#message').removeClass('hidden');
     $('.mask').removeClass('hidden');
+    $('body').css({
+        overflow: 'hidden',
+        position: 'fixed'
+    });
 });
 
 $('.use-coupon-btn').on('click', function() {

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

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

@@ -4,8 +4,7 @@ var $ = require('yoho-jquery'),
     loading = require('../plugin/loading'),
     debounce = require('lodash/debounce');
 
-var plusstar = {},
-    $footer = $('#yoho-footer');
+var plusstar = {};
 
 var windowHeight = $(window).height();
 var scrollFn,
@@ -186,6 +185,9 @@ plusstar = {
                     return true;
                 }
 
+                // 固定底部去除
+                window.rePosFooter();
+
                 // 记录切换tab位置
                 $(document).scrollTop(window.cookie(code) || 0);
 
@@ -303,23 +305,17 @@ $(function() {
             apt: window.queryString.client_type || '',
             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({
             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();
 
     // 滚动翻页

@@ -14,6 +14,8 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var showErrTip = tip.show;
 
+require('../../common');
+
 api.bindEyesEvt({
     status: 'open' // 默认眼睛打开
 });
@@ -49,6 +51,16 @@ $btnSure.on('touchstart', function() {
                 var res = data.data;
 
                 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('注册成功');
 
                     location.href = res.href;

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

@@ -187,7 +187,7 @@
     .dialog {
         width: 84%;
         height: 410px;
-        position: absolute;
+        position: fixed;
         background: #fff;
         border-radius: 0.6rem;
         left: 8%;
@@ -232,7 +232,7 @@
     .activity-message {
         width: 100%;
         height: 410px;
-        overflow: scroll;
+        overflow: auto;
     }
 
     .activity-message h3 {
@@ -277,17 +277,20 @@
     .tip-wrap {
         width: 100%;
         height: 100%;
-        background: #9d1a15;
         position: fixed;
         top: 0;
         left: 0;
         z-index: 3;
+
+        img {
+            width: 100%;
+            height: 100%;
+        }
     }
 
     .tip {
         width: 100%;
         height: 100%;
-        background: #9d1a15;
         position: absolute;
         top: 0;
         left: 0;

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

@@ -207,6 +207,7 @@
             color: #bbb;
             line-height: 40px;
             margin: 30px 0 90px;
+            padding: 0 50px;
         }
     }
 
@@ -376,6 +377,10 @@
 
 .installment-body {
     background: #efefef;
+
+    .main-wrap {
+        max-width: 100%;
+    }
 }
 
 .installment-result-page .installment-only {

 .installment-starting-service-page {
     background: #fff;
+    height: calc(100vh);
 
     .exclamation {
         background-color: #ff7f7f;