Authored by 郭成尧

Merge branch 'feature/buynow' into release/5.8.1

... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-06-21 10:30:21
* @Last Modified by: Targaryen
* @Last Modified time: 2017-06-23 18:04:49
* @Last Modified time: 2017-06-26 17:51:50
*/
require('buynow/order-ensure.page.css');
const $ = require('yoho-jquery');
... ... @@ -41,6 +41,18 @@ require('common');
lazyLoad();
/**
* Cookie Init
*/
function orderInfoInit() {
let product_sku = qs.product_sku;
if (orderInfo('product_sku') !== product_sku) {
cookie.remove(['buynow_info']);
orderInfo('product_sku', product_sku);
}
}
function getQueryParam() {
let queryArray = location.search.substr(1).split('&'),
i,
... ... @@ -520,4 +532,4 @@ $(window).scroll(function() {
$('.address-bottom').hide();
}
});
orderInfoInit();
... ...
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-06-22 13:51:16
* @Last Modified by: Targaryen
* @Last Modified time: 2017-06-23 14:51:56
* @Last Modified time: 2017-06-26 17:47:49
*/
require('common');
let info = window.cookie('buynow_info');
... ... @@ -14,6 +14,7 @@ let actCkOpthn = {
function init() {
info = {
product_sku: null,
uid: window.getUid(),
delivery_way: $('.dispatch-mode .chosed').data('id') || 1,
delivery_time: 1,
... ...