cookie-handle

@@ -13,9 +13,7 @@ const logger = global.yoho.logger;
 
 
 // cookie 参数
 // cookie 参数
 const actCkOpthn = {
 const actCkOpthn = {
-    expires: 0,
-    path: '/cart/index',
-    domain: 'm.yohobuy.com'
+    path: '/cart/index'
 };
 };
 
 
 exports.orderEnsure = (req, res, next) => {
 exports.orderEnsure = (req, res, next) => {
@@ -34,7 +32,7 @@ exports.orderEnsure = (req, res, next) => {
     } catch (e) {
     } catch (e) {
         logger.info(`orderEnsure: get orderInfo from cookie error:${JSON.stringify(e)}`);
         logger.info(`orderEnsure: get orderInfo from cookie error:${JSON.stringify(e)}`);
         orderInfo = {};
         orderInfo = {};
-        res.cookie('order-info', null, actCkOpthn);
+        res.clearCookie('order-info', actCkOpthn);
     }
     }
 
 
     if (!cartType) {
     if (!cartType) {
@@ -63,7 +61,7 @@ exports.orderEnsure = (req, res, next) => {
         }
         }
         let activityInfo = JSON.parse(req.cookies['activity-info']);
         let activityInfo = JSON.parse(req.cookies['activity-info']);
 
 
-        orderPromise = cartModel.cartPay(uid, cartType, null, null, sku, skn, buyNumber, activityInfo);
+        orderPromise = cartModel.cartPay(uid, cartType, orderInfo, null, sku, skn, buyNumber, activityInfo);
     } else {
     } else {
         orderPromise = cartModel.cartPay(uid, cartType, orderInfo, sku, skn, buyNumber);
         orderPromise = cartModel.cartPay(uid, cartType, orderInfo, sku, skn, buyNumber);
     }
     }

@@ -48,13 +48,6 @@ var invoiceCont = {
         2: '电子'
         2: '电子'
     };
     };
 
 
-    // cookie 参数
-var actCkOpthn = {
-    expires: 'Session',
-    path: '/cart/index',
-    domain: 'm.yohobuy.com'
-};
-
 require('../common');
 require('../common');
 
 
 lazyLoad();
 lazyLoad();
@@ -334,12 +327,7 @@ function submitOrder() {
                 }, true);
                 }, true);
             }
             }
 
 
-            cookie.set('order-info', '', actCkOpthn);
-            cookie.set('activity-info', '', {
-                expires: 'Session',
-                path: '/',
-                domain: 'm.yohobuy.com'
-            });
+            cookie.remove(['order-info', 'activity-info']);
             window.location.href = url;
             window.location.href = url;
         } else if (res.code === 409) {
         } else if (res.code === 409) {
             richTip.show(res.message, res.buttons);
             richTip.show(res.message, res.buttons);

@@ -8,9 +8,7 @@ var info = window.cookie('order-info');
 
 
 // cookie 参数
 // cookie 参数
 var actCkOpthn = {
 var actCkOpthn = {
-    expires: 'Session',
-    path: '/cart/index',
-    domain: 'm.yohobuy.com'
+    path: '/cart/index'
 };
 };
 
 
 function init() {
 function init() {

@@ -2,7 +2,6 @@
  * Created by targaryen on 2016/11/28.
  * Created by targaryen on 2016/11/28.
  */
  */
 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
-    cookie = require('yoho-cookie'),
     tip = require('../plugin/tip');
     tip = require('../plugin/tip');
 
 
 require('../common');
 require('../common');
@@ -11,15 +10,15 @@ var chosePanelRender = require('../common/chose-panel'),
     chosePanel = require('./bundle/chose-pannel');
     chosePanel = require('./bundle/chose-pannel');
 
 
 var $selectBtn = $('.select-btn'),
 var $selectBtn = $('.select-btn'),
-    $buyNowBtn = $('#bundle-buy-now'),
-    actCkOpthn = {
-        expires: 'Session',
-        path: '/',
-        domain: 'm.yohobuy.com'
-    };
+    $buyNowBtn = $('#bundle-buy-now');
+
+// cookie 参数
+var actCkOpthn = {
+    path: '/cart/index'
+};
 
 
 $(function() {
 $(function() {
-    cookie.set('activity-info', '', actCkOpthn);
+    window.setCookie('activity-info', '', actCkOpthn);
 });
 });
 
 
 /**
 /**
@@ -100,8 +99,8 @@ $buyNowBtn.on('click', function() {
     }
     }
 
 
     if (gsknSelected) {
     if (gsknSelected) {
-        cookie.set('_cartType', 'bundle', actCkOpthn);
-        cookie.set('activity-info', JSON.stringify({
+        window.setCookie('_cartType', 'bundle', actCkOpthn);
+        window.setCookie('activity-info', JSON.stringify({
             product_sku_list: bundleGoods,
             product_sku_list: bundleGoods,
             activity_id: bundleId
             activity_id: bundleId
         }), actCkOpthn);
         }), actCkOpthn);