Authored by zhangxiaoru

merge

const qs = require('querystring');
exports.index = (req, res) => {
res.redirect('http://ad.yoho.cn/html5/2016/12/redbag');
res.redirect('http://ad.yoho.cn/html5/2016/12/redbag/?' + qs.stringify(req.query));
};
... ...
... ... @@ -18,7 +18,7 @@ exports.handleOrderList = (data, w, h) => {
return img.replace(/(\{width\}|\{height\})/g, function($0) {
const dict = {
'{width}': w,
'{height}': h,
'{height}': h
};
return dict[$0];
... ...
... ... @@ -650,8 +650,7 @@ var chat = {
$chatHeader.find('.js-service-txt').text('YOHO客服');
$chat.append(time(Date.now()).show());
sysInfo(chatMessage.content);
sysInfo();
sysInfo(`${chatMessage.content || ''}您可以选择<span class="blue" data-trigger="leave-msg">留言</span>`);
}
// state 1: 排队中
... ...