Authored by 郭成尧

buynow

@@ -2,11 +2,13 @@ @@ -2,11 +2,13 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-06-21 10:15:38 3 * @Date: 2017-06-21 10:15:38
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-06-21 15:57:27 5 + * @Last Modified time: 2017-06-21 16:20:42
6 */ 6 */
7 const co = require('bluebird').coroutine; 7 const co = require('bluebird').coroutine;
8 const headerModel = require('../../../doraemon/models/header'); 8 const headerModel = require('../../../doraemon/models/header');
9 const BuyNowModel = require('../models/BuyNowModel'); 9 const BuyNowModel = require('../models/BuyNowModel');
  10 +const utils = '../../../utils';
  11 +const paymentProcess = require(`${utils}/payment-process`);
10 12
11 class BuyNowController { 13 class BuyNowController {
12 /** 14 /**
@@ -29,10 +31,10 @@ class BuyNowController { @@ -29,10 +31,10 @@ class BuyNowController {
29 31
30 return res.render('order-ensure', { 32 return res.render('order-ensure', {
31 pageHeader: headerData, 33 pageHeader: headerData,
32 - module: 'easypay', 34 + module: 'buynow',
33 page: 'order-ensure', 35 page: 'order-ensure',
34 title: '确认订单', 36 title: '确认订单',
35 - orderEnsure: result.data 37 + orderEnsure: paymentProcess.tranformPayment(result.data)
36 }); 38 });
37 39
38 })().catch(next); 40 })().catch(next);
@@ -62,9 +62,9 @@ router.post('/index/new/giftinfo', indexController.giftinfo); // 获取购物车 @@ -62,9 +62,9 @@ router.post('/index/new/giftinfo', indexController.giftinfo); // 获取购物车
62 router.post('/index/new/incrbundle', indexController.incrBundle); // 购物车增加套餐数量 62 router.post('/index/new/incrbundle', indexController.incrBundle); // 购物车增加套餐数量
63 router.post('/index/new/decrbundle', indexController.decrBundle); // 购物车减少加套餐数量 63 router.post('/index/new/decrbundle', indexController.decrBundle); // 购物车减少加套餐数量
64 64
65 -router.get('/easypay/orderensure', authMW, BuyNowController.orderEnsure); // 立即购买订单确认页面  
66 -router.post('/easypay/ordercompute', authMW, BuyNowController.orderCompute); // 立即购买订单重新计算  
67 -router.post('/easypay/ordersub', authMW, BuyNowController.orderSub); // 立即购买订单提交 65 +router.get('/buynow/orderensure', authMW, BuyNowController.orderEnsure); // 立即购买订单确认页面
  66 +router.post('/buynow/ordercompute', authMW, BuyNowController.orderCompute); // 立即购买订单重新计算
  67 +router.post('/buynow/ordersub', authMW, BuyNowController.orderSub); // 立即购买订单提交
68 68
69 // 支付中心 URL,由于微信安全限制,在现有 URL 后追加 new ,通过 subDomain 中间件转发到此 69 // 支付中心 URL,由于微信安全限制,在现有 URL 后追加 new ,通过 subDomain 中间件转发到此
70 router.get('/home/orders/paynew', authMW, payController.payCenter); 70 router.get('/home/orders/paynew', authMW, payController.payCenter);
@@ -2,6 +2,9 @@ @@ -2,6 +2,9 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-06-21 10:30:21 3 * @Date: 2017-06-21 10:30:21
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-06-21 10:33:20 5 + * @Last Modified time: 2017-06-21 16:32:13
6 */ 6 */
7 -require('easypay/order-ensure.page.css'); 7 +require('buynow/order-ensure.page.css');
  8 +const lazyLoad = require('yoho-jquery-lazyload');
  9 +
  10 +lazyLoad($('img.lazy'));
1 -  
2 require('./order-ensure'); 1 require('./order-ensure');