Authored by hf

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

... ... @@ -14,6 +14,8 @@ var $ = require('jquery'),
var $page = $('.gift-advance-page'),
queryString = $.queryString();
require('../common');
lazyLoad($('.lazy'));
function getProductInfo(skn, promotionId) {
... ...
... ... @@ -26,6 +26,8 @@ var dispatchModeHammer,
orderInfo = order.orderInfo,
isSubmiting;
require('../common');
lazyLoad();
if (window.getUid() !== orderInfo('uid')) {
... ...
... ... @@ -6,6 +6,8 @@
var $ = require('jquery');
var info = window.cookie('order-info');
require('../common');
function init() {
info = {
uid: window.getUid(),
... ...
... ... @@ -10,6 +10,8 @@ var $ = require('jquery'),
var $confim = $('.confim-mask'),
deleteId;
require('../common');
$('.address-item').on('touchend', function() {
var $this = $(this);
var addressId = $this.data('address-id');
... ... @@ -19,6 +21,7 @@ $('.address-item').on('touchend', function() {
mobile: $this.find('.tel').text(),
address_info: $this.find('.address-info').text()
};
orderInfo('addressId', addressId);
orderInfo('address', address);
}).on('touchend', '.edit', function() {
... ...
... ... @@ -21,6 +21,8 @@ var conponTmpl = Handlebars.compile($('#tmpl-coupon').html()),
var winH = $(window).height();
require('../common');
// conponNotAvaliableTmpl = Handlebars.compile($('#tmpl-coupon-not-avaliable').html()),
function fixedLayOut() {
... ... @@ -77,6 +79,7 @@ $('#coupon-list').on('touchend', '.employ-main', function() {
}
}).then(function(res) {
if (res.code === 200) {
//tip.show('优惠券可用');
orderInfo('couponCode', res.data.coupon_code);
orderInfo('couponName', res.data.coupon_title);
... ...