folder-modified

@@ -110,8 +110,8 @@ class BuyNowController {
 
 
             return res.render('buynow/order-ensure', {
             return res.render('buynow/order-ensure', {
                 pageHeader: headerData,
                 pageHeader: headerData,
-                module: 'buynow',
-                page: 'order-ensure',
+                module: 'cart',
+                page: 'buynow-order-ensure',
                 title: '确认订单',
                 title: '确认订单',
                 width750: true,
                 width750: true,
                 localCss: true,
                 localCss: true,
@@ -232,8 +232,8 @@ class BuyNowController {
             });
             });
 
 
             res.render('select-address', {
             res.render('select-address', {
-                module: 'buynow',
-                page: 'select-address',
+                module: 'cart',
+                page: 'buynow-select-address',
                 pageHeader: headerData,
                 pageHeader: headerData,
                 pageFooter: true,
                 pageFooter: true,
                 moreUrl,
                 moreUrl,
@@ -274,8 +274,8 @@ class BuyNowController {
 
 
             res.render('select-invoice', _.assign(returnData, {
             res.render('select-invoice', _.assign(returnData, {
                 pageHeader: headerData,
                 pageHeader: headerData,
-                module: 'buynow',
-                page: 'select-invoice',
+                module: 'cart',
+                page: 'buynow-select-invoice',
                 localCss: true,
                 localCss: true,
                 addressMore: helpers.urlFormat('/cart/index/buynow/orderensure', {
                 addressMore: helpers.urlFormat('/cart/index/buynow/orderensure', {
                     product_sku: product_sku,
                     product_sku: product_sku,
@@ -295,8 +295,8 @@ class BuyNowController {
         });
         });
 
 
         res.render('select-coupon', {
         res.render('select-coupon', {
-            module: 'buynow',
-            page: 'select-coupon',
+            module: 'cart',
+            page: 'buynow-select-coupon',
             title: '选择优惠券',
             title: '选择优惠券',
             selectCouponPage: true,
             selectCouponPage: true,
             pageHeader: headerData,
             pageHeader: headerData,

@@ -11,7 +11,7 @@ const qs = require('yoho-qs');
 
 
 let tip = require('plugin/tip'),
 let tip = require('plugin/tip'),
     loading = require('plugin/loading'),
     loading = require('plugin/loading'),
-    order = require('./order-info'),
+    order = require('cart/buynow/order-info'),
     richTip = require('plugin/rich-tip');
     richTip = require('plugin/rich-tip');
 
 
 let $invoice = $('.invoice'),
 let $invoice = $('.invoice'),

 /*
 /*
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-06-23 11:43:18
  * @Date: 2017-06-23 11:43:18
- * @Last Modified by:   Targaryen
- * @Last Modified time: 2017-06-23 11:43:18
+ * @Last Modified by: Targaryen
+ * @Last Modified time: 2017-07-21 11:06:16
  */
  */
 
 
 require('cart/select-address.page.css');
 require('cart/select-address.page.css');
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
-    orderInfo = require('./order-info').orderInfo;
+    orderInfo = require('cart/buynow/order-info').orderInfo;
 
 
 let $confim = $('.confim-mask'),
 let $confim = $('.confim-mask'),
     deleteId;
     deleteId;

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-06-23 11:43:44
  * @Date: 2017-06-23 11:43:44
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-06-27 14:58:41
+ * @Last Modified time: 2017-07-21 11:06:22
  */
  */
 require('cart/select-coupon.page.css');
 require('cart/select-coupon.page.css');
 const qs = require('yoho-qs');
 const qs = require('yoho-qs');
@@ -12,7 +12,7 @@ let $ = require('yoho-jquery'),
     tip = require('plugin/tip'),
     tip = require('plugin/tip'),
     conponTmpl = require('cart/select-coupon/coupon.hbs'),
     conponTmpl = require('cart/select-coupon/coupon.hbs'),
     conponNotAvaliableTmpl = require('cart/select-coupon/coupon-not-avaliable.hbs'),
     conponNotAvaliableTmpl = require('cart/select-coupon/coupon-not-avaliable.hbs'),
-    orderInfo = require('./order-info').orderInfo;
+    orderInfo = require('cart/buynow/order-info').orderInfo;
 
 
 let isGetData;
 let isGetData;
 
 

@@ -8,7 +8,7 @@ require('cart/select-invoice.page.css');
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     tip = require('plugin/tip'),
     tip = require('plugin/tip'),
     dialog = require('plugin/dialog'),
     dialog = require('plugin/dialog'),
-    order = require('./order-info');
+    order = require('cart/buynow/order-info');
 
 
 let $invoiceNotice = $('.invoice-notice'),
 let $invoiceNotice = $('.invoice-notice'),
     $taxNumber = $('.tax-number'),
     $taxNumber = $('.tax-number'),
@@ -26,7 +26,7 @@ let isModifyTel = false;
 let C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
 let C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
 
 
 require('common');
 require('common');
-require('cartbuynow/select-invoice');
+require('cart/cartbuynow/select-invoice');
 
 
 if (window.getUid() !== orderInfo('uid')) {
 if (window.getUid() !== orderInfo('uid')) {
     order.init();
     order.init();

@@ -26,7 +26,7 @@ let isModifyTel = false;
 let C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
 let C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
 
 
 require('common');
 require('common');
-require('cartbuynow/select-invoice');
+require('cart/cartbuynow/select-invoice');
 
 
 if (window.getUid() !== orderInfo('uid')) {
 if (window.getUid() !== orderInfo('uid')) {
     order.init();
     order.init();