Merge branch 'release/5.8.1' of git.yoho.cn:fe/yohobuywap-node into release/5.8.1

@@ -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-26 16:21:29
  */
  */
 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');
@@ -41,8 +41,9 @@ class BuyNowController {
         }
         }
 
 
         let product_sku = req.query.product_sku;
         let product_sku = req.query.product_sku;
+        let buy_number = req.query.buy_number;
 
 
-        if (!product_sku) {
+        if (!product_sku || !buy_number) {
             return next();
             return next();
         }
         }
 
 
@@ -51,20 +52,20 @@ class BuyNowController {
                 uid: req.user.uid,
                 uid: req.user.uid,
                 product_sku: product_sku,
                 product_sku: product_sku,
                 sku_type: req.query.sku_type,
                 sku_type: req.query.sku_type,
-                buy_number: req.query.buy_number,
+                buy_number: buy_number,
             });
             });
             let computeData = yield req.ctx(BuyNowModel).compute({
             let computeData = yield req.ctx(BuyNowModel).compute({
                 uid: req.user.uid,
                 uid: req.user.uid,
                 product_sku: product_sku,
                 product_sku: product_sku,
                 sku_type: req.query.sku_type,
                 sku_type: req.query.sku_type,
-                buy_number: req.query.buy_number,
+                buy_number: buy_number,
                 use_yoho_coin: parseInt(orderInfo.use_yoho_coin, 10)
                 use_yoho_coin: parseInt(orderInfo.use_yoho_coin, 10)
             });
             });
             let validCouponCount = yield req.ctx(BuyNowModel).countUsableCoupon({
             let validCouponCount = yield req.ctx(BuyNowModel).countUsableCoupon({
                 uid: req.user.uid,
                 uid: req.user.uid,
                 product_sku: req.query.product_sku,
                 product_sku: req.query.product_sku,
                 sku_type: req.query.sku_type,
                 sku_type: req.query.sku_type,
-                buy_number: req.query.buy_number
+                buy_number: buy_number
             });
             });
             let headerData = headerModel.setNav({
             let headerData = headerModel.setNav({
                 navTitle: '确认订单',
                 navTitle: '确认订单',
@@ -77,11 +78,17 @@ class BuyNowController {
                 page: 'order-ensure',
                 page: 'order-ensure',
                 title: '确认订单',
                 title: '确认订单',
                 width750: true,
                 width750: true,
+                localCss: true,
                 product_sku: product_sku,
                 product_sku: product_sku,
                 orderEnsure: _.assign(
                 orderEnsure: _.assign(
                     paymentProcess.tranformPayment(result.data, orderInfo, null, null, computeData.data),
                     paymentProcess.tranformPayment(result.data, orderInfo, null, null, computeData.data),
                     {
                     {
-                        coupon: paymentProcess.coupon(_.get(validCouponCount, 'data.count', 0), orderInfo, computeData)
+                        coupon: paymentProcess.coupon(_.get(validCouponCount, 'data.count', 0), orderInfo, computeData),
+                        selectAddressUrl: helpers.urlFormat('/cart/index/buynow/selectAddress', {
+                            product_sku: product_sku,
+                            buy_number: buy_number
+                        }),
+                        isOrdinaryCart: true
                     }
                     }
                 )
                 )
             });
             });
@@ -170,10 +177,14 @@ class BuyNowController {
     selectAddress(req, res, next) {
     selectAddress(req, res, next) {
         let uid = req.user.uid;
         let uid = req.user.uid;
         let product_sku = req.query.product_sku;
         let product_sku = req.query.product_sku;
+        let buy_number = req.query.buy_number;
 
 
         co(function * () {
         co(function * () {
             let address = yield addressModel.addressData(uid);
             let address = yield addressModel.addressData(uid);
-            let moreUrl = helpers.urlFormat('/cart/index/buynow/orderEnsure', {product_sku: product_sku});
+            let moreUrl = helpers.urlFormat('/cart/index/buynow/orderensure', {
+                product_sku: product_sku,
+                buy_number: buy_number
+            });
 
 
             address = address.data;
             address = address.data;
 
 
@@ -203,6 +214,7 @@ class BuyNowController {
      */
      */
     selectInvoice(req, res, next) {
     selectInvoice(req, res, next) {
         let product_sku = req.query.product_sku;
         let product_sku = req.query.product_sku;
+        let buy_number = req.query.buy_number;
         let uid = req.user.uid;
         let uid = req.user.uid;
         let orderInfo;
         let orderInfo;
 
 
@@ -228,7 +240,10 @@ class BuyNowController {
                 module: 'buynow',
                 module: 'buynow',
                 page: 'select-invoice',
                 page: 'select-invoice',
                 localCss: true,
                 localCss: true,
-                addressMore: helpers.urlFormat('/cart/index/buynow/orderEnsure', {product_sku: product_sku})
+                addressMore: helpers.urlFormat('/cart/index/buynow/orderensure', {
+                    product_sku: product_sku,
+                    buy_number: buy_number
+                })
             }));
             }));
         })().catch(next);
         })().catch(next);
     }
     }

@@ -127,6 +127,7 @@ exports.orderEnsure = (req, res, next) => {
             module: 'cart',
             module: 'cart',
             page: 'order-ensure',
             page: 'order-ensure',
             width750: true,
             width750: true,
+            localCss: true,
             title: '确认订单'
             title: '确认订单'
         };
         };
 
 

@@ -59,6 +59,8 @@ exports.ensure = (req, res, next) => {
             return res.render('order-ensure', Object.assign({
             return res.render('order-ensure', Object.assign({
                 module: 'cart',
                 module: 'cart',
                 page: 'seckill',
                 page: 'seckill',
+                width750: true,
+                localCss: true,
                 pageHeader: headerModel.setNav({
                 pageHeader: headerModel.setNav({
                     navTitle: '确认订单',
                     navTitle: '确认订单',
                     backUrl: '/product/' + skn + '.html' // 商品url改版
                     backUrl: '/product/' + skn + '.html' // 商品url改版
@@ -108,6 +110,8 @@ exports.ensure = (req, res, next) => {
                 navTitle: '确认订单',
                 navTitle: '确认订单',
                 backUrl: '/product/' + skn + '.html' // 商品url改版
                 backUrl: '/product/' + skn + '.html' // 商品url改版
             }),
             }),
+            width750: true,
+            localCss: true,
             cartToken: crypto.encryption(SLAT, [sku, activityId].join(''))
             cartToken: crypto.encryption(SLAT, [sku, activityId].join(''))
         }, view));
         }, view));
     })().catch(next);
     })().catch(next);

@@ -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);

@@ -6,15 +6,15 @@
         <div class="info">
         <div class="info">
             <span class="info-name">{{name}}</span>
             <span class="info-name">{{name}}</span>
             <span class="info-phone">{{phoneNum}}</span>
             <span class="info-phone">{{phoneNum}}</span>
-            <a href="/cart/index/buynow/selectAddress?product_sku={{@root.product_sku}}"><span class="info-address">{{addressInfo}}</span></a>
+            <a href="{{selectAddressUrl}}"><span class="info-address">{{addressInfo}}</span></a>
             <i class="iconfont">&#xe637;</i>
             <i class="iconfont">&#xe637;</i>
         </div>
         </div>
-        <a class="rest" href="/cart/index/buynow/selectAddress?product_sku={{@root.product_sku}}">其他地址<span class="iconfont">&#xe614;</span></a>
+        <a class="rest" href="{{selectAddressUrl}}">其他地址<span class="iconfont">&#xe614;</span></a>
     </div>
     </div>
     {{else}}
     {{else}}
         <div class="address block address-wrap not-address">
         <div class="address block address-wrap not-address">
             <i class="iconfont">&#xe637;</i>
             <i class="iconfont">&#xe637;</i>
-            <a class="choose" href="/cart/index/buynow/selectAddress?product_sku={{@root.product_sku}}">请选择收货地址<span class="iconfont">&#xe614;</span></a>
+            <a class="choose" href="{{selectAddressUrl}}">请选择收货地址<span class="iconfont">&#xe614;</span></a>
         </div>
         </div>
     {{/if}}
     {{/if}}
     <section class="dispatch block">
     <section class="dispatch block">

@@ -108,10 +108,6 @@
                     <span>发票抬头</span>
                     <span>发票抬头</span>
                     <span class="invoice-fr invoice-title">{{title}}</span>
                     <span class="invoice-fr invoice-title">{{title}}</span>
                 </li>
                 </li>
-                <li>
-                    <span>发票内容</span>
-                    <span class="invoice-fr">{{contentValue}}</span>
-                </li>
                 {{#if pdfUrl}}
                 {{#if pdfUrl}}
                     <li>
                     <li>
                         <a href="{{pdfUrl}}"><span class="invoice-fr invoice-see">点击下载PDF发票</span></a>
                         <a href="{{pdfUrl}}"><span class="invoice-fr invoice-see">点击下载PDF发票</span></a>

@@ -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();
 }
 }
 
 

-'use strict';
-
 require('./seckill/order-ensure');
 require('./seckill/order-ensure');

@@ -4,7 +4,7 @@
  * @author: xuqi<qi.xu@yoho.cn>
  * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2015/11/12
  * @date: 2015/11/12
  */
  */
-
+require('cart/order-ensure.page.css');
 require('common.js');
 require('common.js');
 
 
 let lazyLoad = require('yoho-jquery-lazyload'),
 let lazyLoad = require('yoho-jquery-lazyload'),

@@ -52,7 +52,9 @@ $selectBtn.on('touchend', function() {
         chosePanel.show({
         chosePanel.show({
             data,
             data,
             disableNum: true,
             disableNum: true,
-            buttonText: '确认'
+            buttonText: {
+                text: '确认'
+            }
         }).then(result => {
         }).then(result => {
             if (result && result.sku) {
             if (result && result.sku) {
                 let product = $('#gskn-' + self.data('skn'));
                 let product = $('#gskn-' + self.data('skn'));
@@ -109,6 +111,7 @@ $('.bundle-tabs').on('click', '.swiper-slide', (e) => {
 
 
 /**
 /**
  * 立即购买
  * 立即购买
+ * 大概 4 月份改成了加入购物车
  */
  */
 $buyNowBtn.on('touchstart', function() {
 $buyNowBtn.on('touchstart', function() {
     let bundleGoods = [],
     let bundleGoods = [],

@@ -74,6 +74,8 @@
             height: 80px;
             height: 80px;
             font-size: 28px;
             font-size: 28px;
             width: 440px;
             width: 440px;
+            background-color: #fff;
+            border: none;
         }
         }
 
 
         .tel-area {
         .tel-area {