Merge branch 'hotfix/couponselect' into 'master'

Hotfix/couponselect



See merge request !1090

@@ -50,6 +50,7 @@ class BuyNowController {
 
         if (product_sku !== orderInfo.product_sku) {
             orderInfo = {};
+            res.clearCookie('buynow_info', actCkOpthn);
         }
 
         co(function * () {

@@ -11,6 +11,11 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
 
 const cartModel = require('../models/index');
 
+// cookie 参数
+const actCkOpthn = {
+    path: '/cart/index'
+};
+
 /**
  * [购物车首页]
  */
@@ -23,10 +28,13 @@ const index = (req, res) => {
             })
         };
 
+    // 标识是从普通购物车进的提交订单页面，普通购物车进入提交订单页面默认不使用优惠券
+    res.cookie('ensure_from', 'cart', actCkOpthn);
+
     // 唤起 APP 的路径
     res.locals.appPath = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.shopcart","params":{}}';
 
-    res.render('index', Object.assign(pageData, {
+    res.render('cart-index', Object.assign(pageData, {
         title: '购物车',
         module: 'cart',
         page: 'index',

@@ -9,7 +9,7 @@
 const router = require('express').Router(); //eslint-disable-line
 const cRoot = './controllers';
 const authMW = require('../../doraemon/middleware/auth');
-
+const disableBFCache = require('../../doraemon/middleware/disable-BFCache');
 const seckill = require(cRoot + '/seckill');
 const order = require(cRoot + '/order');
 const countController = require(`${cRoot}/count`);
@@ -33,7 +33,7 @@ router.get('/shopping/pay/payZero', payController.payZero);// 支付成功，支
 router.get('/index/new/pay', authMW, payController.pay);// 统一支付 URL，支持微信，支付宝
 router.get('/index/new/pay/alipayresult', authMW, payController.payAli);// 支付宝付款支付成功
 
-router.get('/index/new/orderEnsure', authMW, order.orderEnsure); // 订单结算
+router.get('/index/new/orderEnsure', authMW, disableBFCache, order.orderEnsure); // 订单结算
 router.post('/index/new/orderCompute', authMW, order.orderCompute); // 结算页参数改变，重新运算
 router.post('/index/new/orderSub', authMW, order.orderSub); // 订单提交
 router.get('/index/new/selectCoupon', authMW, order.selectCoupon); // 选择优惠券 页面
@@ -64,7 +64,7 @@ router.post('/index/new/giftinfo', indexController.giftinfo); // 获取购物车
 router.post('/index/new/incrbundle', indexController.incrBundle); // 购物车增加套餐数量
 router.post('/index/new/decrbundle', indexController.decrBundle); // 购物车减少加套餐数量
 
-router.get('/index/buynow/orderensure', authMW, BuyNowController.orderEnsure); // 立即购买订单确认页面
+router.get('/index/buynow/orderensure', authMW, disableBFCache, BuyNowController.orderEnsure); // 立即购买订单确认页面
 router.post('/index/buynow/ordercompute', authMW, BuyNowController.orderCompute); // 立即购买订单重新计算
 router.post('/index/buynow/ordersub', authMW, BuyNowController.orderSub); // 立即购买订单提交
 router.get('/index/buynow/selectAddress', authMW, BuyNowController.selectAddress); // 选择地址

 {
   "name": "yohobuywap-node",
-  "version": "6.2.30",
+  "version": "6.2.32",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -15,8 +15,7 @@ let $ = require('yoho-jquery'),
 
 let isGetData;
 
-let $newCoupon = $('#new-coupon'),
-    linkUrl = document.referrer;
+let $newCoupon = $('#new-coupon');
 let $couponAvailable = $('#couponAvailable');
 let $couponUnavailable = $('#couponUnavailable');
 let $useCoupon = $('#useCoupon');
@@ -44,11 +43,7 @@ function fixedLayOut() {
 ellipsis.init();
 
 function goToBack() {
-    if (linkUrl) {
-        window.location.href = linkUrl;
-    } else {
-        history.go(-1);
-    }
+    history.go(-1);
 }
 
 /**

@@ -40,6 +40,11 @@ let $invoice = $('.invoice'),
 
 const orderEnsure = new OrderEnsure(order);
 
+// cookie 参数
+const actCkOpthn = {
+    path: '/cart/index'
+};
+
 require('common');
 
 lazyLoad();
@@ -49,12 +54,16 @@ function isLimitGood() {
 }
 
 // 来自购物车的链接默认不使用优惠券
-if (document.referrer && document.referrer.indexOf('/cart/index/index') !== -1) {
+if (cookie.get('ensure_from') === 'cart') {
     orderInfo('couponCode', null);
     orderInfo('usable_usual_code', null);
     orderInfo('usable_free_code', null);
+    cookie.removeSpecific('ensure_from', actCkOpthn);
 }
 
+// 清除立即购买的 cookie，以免优惠券数据冲突
+cookie.removeSpecific('buynow_info', actCkOpthn);
+
 isLimitGood() && (function() {
     let a = [];
 

@@ -14,8 +14,7 @@ let $ = require('yoho-jquery'),
 
 let isGetData;
 
-let $newCoupon = $('#new-coupon'),
-    linkUrl = document.referrer;
+let $newCoupon = $('#new-coupon');
 let $couponAvailable = $('#couponAvailable');
 let $couponUnavailable = $('#couponUnavailable');
 let $useCoupon = $('#useCoupon');
@@ -43,11 +42,7 @@ function fixedLayOut() {
 ellipsis.init();
 
 function goToBack() {
-    if (linkUrl) {
-        window.location.href = linkUrl;
-    } else {
-        history.go(-1);
-    }
+    history.go(-1);
 }
 
 /**