Authored by 郭成尧

Merge branch 'feature/buynow' into release/5.8.1

... ... @@ -59,6 +59,8 @@ exports.ensure = (req, res, next) => {
return res.render('order-ensure', Object.assign({
module: 'cart',
page: 'seckill',
width750: true,
localCss: true,
pageHeader: headerModel.setNav({
navTitle: '确认订单',
backUrl: '/product/' + skn + '.html' // 商品url改版
... ... @@ -108,6 +110,8 @@ exports.ensure = (req, res, next) => {
navTitle: '确认订单',
backUrl: '/product/' + skn + '.html' // 商品url改版
}),
width750: true,
localCss: true,
cartToken: crypto.encryption(SLAT, [sku, activityId].join(''))
}, view));
})().catch(next);
... ...
'use strict';
require('./seckill/order-ensure');
... ...
... ... @@ -4,7 +4,7 @@
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2015/11/12
*/
require('cart/order-ensure.page.css');
require('common.js');
let lazyLoad = require('yoho-jquery-lazyload'),
... ...