merge

@@ -2,12 +2,12 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-06-21 10:15:38
  * @Date: 2017-06-21 10:15:38
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-06-23 17:53:27
+ * @Last Modified time: 2017-06-23 18:09:26
  */
  */
 const _ = require('lodash');
 const _ = require('lodash');
 const co = require('bluebird').coroutine;
 const co = require('bluebird').coroutine;
 const headerModel = require('../../../doraemon/models/header');
 const headerModel = require('../../../doraemon/models/header');
-const BuyNowModel = require('../models/BuyNowModel');
+const BuyNowModel = require('../models/buy-now-model');
 const addressModel = require('../models/address');
 const addressModel = require('../models/address');
 const userModel = require('../models/user');
 const userModel = require('../models/user');
 const orderModel = require('../models/order');
 const orderModel = require('../models/order');

@@ -16,7 +16,7 @@ const countController = require(`${cRoot}/count`);
 const payController = require(`${cRoot}/pay`);
 const payController = require(`${cRoot}/pay`);
 const indexController = require(`${cRoot}/index`);
 const indexController = require(`${cRoot}/index`);
 const ticketsConfirmController = require(`${cRoot}/ticketsConfirm`);
 const ticketsConfirmController = require(`${cRoot}/ticketsConfirm`);
-const BuyNowController = require(`${cRoot}/BuyNowController`);
+const BuyNowController = require(`${cRoot}/buy-now-controller`);
 
 
 // Your controller here
 // Your controller here
 router.all('/index/seckill/', authMW);
 router.all('/index/seckill/', authMW);

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-06-21 10:30:21
  * @Date: 2017-06-21 10:30:21
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-06-23 17:12:13
+ * @Last Modified time: 2017-06-23 18:04:49
  */
  */
 require('buynow/order-ensure.page.css');
 require('buynow/order-ensure.page.css');
 const $ = require('yoho-jquery');
 const $ = require('yoho-jquery');
@@ -341,7 +341,7 @@ if (!orderInfo('address_id')) {
 }
 }
 
 
 $('.delivery-id').on('touchend', 'li', function() {
 $('.delivery-id').on('touchend', 'li', function() {
-    orderInfo('deliveryId', $(this).data('id'));
+    orderInfo('delivery_way', $(this).data('id'));
 
 
     // 实付金额发生变化，使用有货币为0
     // 实付金额发生变化，使用有货币为0
     orderInfo('use_yoho_coin', 0);
     orderInfo('use_yoho_coin', 0);
@@ -491,7 +491,7 @@ function phoneHidden(phone) {
 $('.info-phone').html(phoneHidden($('.info-phone').html()));
 $('.info-phone').html(phoneHidden($('.info-phone').html()));
 
 
 if (orderInfo('address') && orderInfo('address').is_support === 'N') {
 if (orderInfo('address') && orderInfo('address').is_support === 'N') {
-    orderInfo('deliveryId', $('.delivery-id .icon-cb-radio').data('id'));
+    orderInfo('delivery_way', $('.delivery-id .icon-cb-radio').data('id'));
     orderCompute();
     orderCompute();
 }
 }