Merge branch 'master' into translate/cart

@@ -5,6 +5,10 @@
  */
  */
 'use strict';
 'use strict';
 
 
+if (process.env.USE_APM === '1' && process.env.NODE_ENV === 'production') {
+    require('oneapm');
+}
+
 const config = require('./config/common');
 const config = require('./config/common');
 
 
 global.Promise = require('bluebird');
 global.Promise = require('bluebird');

+/**
+ * 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,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);
+
+};

@@ -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);
 
 

@@ -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 {
             // 渲染
             // 渲染

@@ -7,7 +7,7 @@ const paymentProcess = require(global.utils + '/payment-process');
 
 
 /**
 /**
  * 购物车结算
  * 购物车结算
- *
+ * doc: http://git.yoho.cn/yoho-documents/api-interfaces/blob/master/订单/shopping.md
  * @param int $uid 用户ID
  * @param int $uid 用户ID
  * @param string $cartType 购物车类型，ordinary表示普通购物车
  * @param string $cartType 购物车类型，ordinary表示普通购物车
  * @param int $isUseYohoCoin 是否使用有货币，0不使用, 1使用
  * @param int $isUseYohoCoin 是否使用有货币，0不使用, 1使用
@@ -33,8 +33,46 @@ function cartPayAPI(uid, cartType, isUseYohoCoin, skuList) {
 
 
 
 
 /**
 /**
+ * 购物车结算--支付方式和配送方式选择以及是否使用有货币接口返回的数据处理
+ * doc: http://git.yoho.cn/yoho-documents/api-interfaces/blob/master/订单/shopping.md
+ * @param int $uid 用户ID
+ * @param string $cartType 购物车类型，ordinary表示普通购物车
+ * @param int $deliveryWay 配送方式，1表示普通快递，2表示顺丰速运
+ * @param int $paymentType 支付方式，1表示在线支付，2表示货到付款
+ * @param string $couponCode 优惠券码
+ * @param mixed $yohoCoin 使用的有货币数量
+ * @param string $skuList 购买限购商品时需要传递的参数
+ * @return array 接口返回的数据
+ */
+function orderComputeAPI(uid, cartType, deliveWay, paymentType, couponCode, yohoCoin, skuList) {
+    let param = {
+        method: 'app.Shopping.compute',
+        cart_type: cartType,
+        delive_way: deliveWay,
+        payment_type: paymentType
+    };
+
+    if (couponCode) {
+        param.coupon_code = couponCode;
+    }
+
+    if (yohoCoin) {
+        param.use_yoho_coin = yohoCoin;
+    }
+
+    if (!_.isEmpty(skuList)) {
+        param.product_sku_list = skuList;
+    }
+
+    return api.get('', param);
+}
+
+
+/**
  * 调用购物车结算接口返回的数据处理
  * 调用购物车结算接口返回的数据处理
  *
  *
+ *
+ *
  * @param int $uid 用户ID
  * @param int $uid 用户ID
  * @param string $cartType 购物车类型，ordinary表示普通购物车
  * @param string $cartType 购物车类型，ordinary表示普通购物车
  * @param array $orderInfo cookie中记录的一些订单有关数据
  * @param array $orderInfo cookie中记录的一些订单有关数据
@@ -49,21 +87,35 @@ exports.cartPay = (uid, cartType, orderInfo, limitProductCode, sku, skn, buyNumb
     isAjax = isAjax || false;
     isAjax = isAjax || false;
 
 
     let result = {};
     let result = {};
-    let skuList = null;
+    let skuList = [];
     let isLimitGoods = skn && sku && buyNumber; // 存在sku, skn 和buyNumber时为限购商品
     let isLimitGoods = skn && sku && buyNumber; // 存在sku, skn 和buyNumber时为限购商品
+    let orderCompute;
 
 
     if (isLimitGoods) {
     if (isLimitGoods) {
-        skuList = {
+        skuList.push({
             type: 'limitcode',
             type: 'limitcode',
             limitproductcode: limitProductCode,
             limitproductcode: limitProductCode,
             buy_number: buyNumber,
             buy_number: buyNumber,
             skn,
             skn,
             sku
             sku
-        };
+        });
 
 
         result.isLimit = true;
         result.isLimit = true;
     }
     }
 
 
+    // cookie保存的数据
+    if (!_.isEmpty(orderInfo)) {
+        orderInfo.paymentType = orderInfo.paymentType ? orderInfo.paymentType : '';
+        orderCompute = orderComputeAPI(
+            uid,
+            cartType,
+            orderInfo.deliveryId,
+            orderInfo.paymentType,
+            orderInfo.couponCode,
+            orderInfo.yohoCoin, skuList
+        );
+    }
+
     return cartPayAPI(uid, cartType, 0, skuList)
     return cartPayAPI(uid, cartType, 0, skuList)
         .then(pay => {
         .then(pay => {
             let goodsList = _.get(pay, 'data.goods_list', []);
             let goodsList = _.get(pay, 'data.goods_list', []);

@@ -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-->

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

@@ -25,20 +25,19 @@ 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;
     }
     }
 
 
+    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 +124,8 @@ const list = (req, res, next) => {
                     pageFooter: true
                     pageFooter: true
                 });
                 });
             }).catch(next);
             }).catch(next);
+        }
+    });
 };
 };
 
 
 /**
 /**
@@ -132,6 +133,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 +158,7 @@ const index = (req, res, next) => {
             }
             }
 
 
         });
         });
-    })
+    });
 
 
 };
 };
 
 

@@ -21,4 +21,7 @@ module.exports = app => {
 
 
     // 分期付款
     // 分期付款
     app.use('/home', require('./apps/home'));
     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="//static.yohobuy.com">
         <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
         <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
         <link rel="dns-prefetch" href="//img13.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}}
         {{#if width750}}
         <script type="text/javascript">
         <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);
             (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",
   "name": "m-yohobuy-node",
-  "version": "5.1.9",
+  "version": "5.1.10",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -12,7 +12,7 @@
     "dev": "nodemon -e js,hbs -i public/ app.js",
     "dev": "nodemon -e js,hbs -i public/ app.js",
     "online": "NODE_ENV=\"production\" node app.js",
     "online": "NODE_ENV=\"production\" node app.js",
     "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ 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",
     "lint-css": "stylelint --config .stylelintrc public/scss/**/*.css",
     "precommit": "node lint.js"
     "precommit": "node lint.js"
   },
   },
@@ -30,6 +30,7 @@
     "md5": "^2.1.0",
     "md5": "^2.1.0",
     "moment": "^2.15.1",
     "moment": "^2.15.1",
     "morgan": "^1.7.0",
     "morgan": "^1.7.0",
+    "oneapm": "^1.2.20",
     "passport": "^0.3.2",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-local": "^1.0.0",
     "passport-qq": "0.0.3",
     "passport-qq": "0.0.3",

@@ -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();
 
 
     // 滚动翻页
     // 滚动翻页

@@ -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;