Authored by 陈峰

Merge branch 'release/0606' into 'gray'

Release/0606



See merge request !1430
... ... @@ -39,7 +39,7 @@ const _err510 = (req, res, code, err) => {
page: 'error',
title: '服务器繁忙 | Yoho!Buy有货 | 潮流购物逛不停',
pageHeader: headerModel.setNav({
navTitle: '服务器繁忙请稍后重试!'
navTitle: err.message || '服务器繁忙请稍后重试!'
}),
pageFooter: true,
isErr: true
... ...
{
"name": "yohobuywap-node",
"version": "6.6.11",
"version": "6.6.12",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ... @@ -86,7 +86,7 @@
"xml2js": "^0.4.19",
"yoho-express-session": "^2.0.0",
"yoho-md5": "^2.0.0",
"yoho-node-lib": "=0.6.15",
"yoho-node-lib": "=0.6.16",
"yoho-zookeeper": "^1.0.9"
},
"devDependencies": {
... ...
... ... @@ -64,11 +64,14 @@ class GoodsShowYasRpter {
this.lastShowSkns = cacheTheShowSkns;
if (typeof _yas !== 'undefined' && this.reportParams.DATA && this.reportParams.DATA.length) {
window._yas.sendCustomInfo({
op: 'YB_SHOW_EVENT',
appop: 'YB_SHOW_EVENT',
param: JSON.stringify(this.reportParams)
}, true);
setTimeout(function() {
window._yas.sendCustomInfo && window._yas.sendCustomInfo({
op: 'YB_SHOW_EVENT',
appop: 'YB_SHOW_EVENT',
param: JSON.stringify(this.reportParams)
}, true);
}, 1000);
}
}
... ...