Authored by zhangxiaoru

address

@@ -14187,7 +14187,9 @@ var $invoice = $('.invoice'), @@ -14187,7 +14187,9 @@ var $invoice = $('.invoice'),
14187 total, 14187 total,
14188 isTickets = $('#ticketsPage').val(), 14188 isTickets = $('#ticketsPage').val(),
14189 productSku = $('#productSku').val(), 14189 productSku = $('#productSku').val(),
14190 - buyNumber = $('#buyNumber').val(); 14190 + buyNumber = $('#buyNumber').val(),
  14191 + headerTop = $("#yoho-header").outerHeight(),
  14192 + addressTop = $(".address-wrap").outerHeight();
14191 14193
14192 var orderCont = window.cookie('order-info') && JSON.parse(window.cookie('order-info')); 14194 var orderCont = window.cookie('order-info') && JSON.parse(window.cookie('order-info'));
14193 var invoiceCont = { 14195 var invoiceCont = {
@@ -14346,6 +14348,7 @@ function orderCompute() { @@ -14346,6 +14348,7 @@ function orderCompute() {
14346 yohoCoin: yohoCoin, 14348 yohoCoin: yohoCoin,
14347 skuList: isLimitGood() ? orderInfo('skuList') : undefined 14349 skuList: isLimitGood() ? orderInfo('skuList') : undefined
14348 }; 14350 };
  14351 +
14349 //门票 14352 //门票
14350 if (isTickets) { 14353 if (isTickets) {
14351 data = { 14354 data = {
@@ -14574,6 +14577,7 @@ $('.bill a').on('touchstart', function() { @@ -14574,6 +14577,7 @@ $('.bill a').on('touchstart', function() {
14574 if (isTickets) { 14577 if (isTickets) {
14575 ticketsConfirm(); 14578 ticketsConfirm();
14576 return ; 14579 return ;
  14580 +
14577 } 14581 }
14578 orderInfo('paymentTypeId', $('.delivery-id .icon-cb-radio').data('id')); 14582 orderInfo('paymentTypeId', $('.delivery-id .icon-cb-radio').data('id'));
14579 orderInfo('paymentType', $('.payment-type .icon-cb-radio').data('id')); 14583 orderInfo('paymentType', $('.payment-type .icon-cb-radio').data('id'));
@@ -14593,6 +14597,7 @@ if (orderInfo('address') && orderInfo('address').is_support === 'N') { @@ -14593,6 +14597,7 @@ if (orderInfo('address') && orderInfo('address').is_support === 'N') {
14593 orderInfo('deliveryId', $('.delivery-id .icon-cb-radio').data('id')); 14597 orderInfo('deliveryId', $('.delivery-id .icon-cb-radio').data('id'));
14594 orderCompute(); 14598 orderCompute();
14595 } 14599 }
  14600 +
14596 //电子票下单 14601 //电子票下单
14597 function ticketsConfirm () { 14602 function ticketsConfirm () {
14598 14603
@@ -14600,6 +14605,7 @@ function ticketsConfirm () { @@ -14600,6 +14605,7 @@ function ticketsConfirm () {
14600 tip.show('手机号必填'); 14605 tip.show('手机号必填');
14601 return; 14606 return;
14602 } 14607 }
  14608 +
14603 var data = { 14609 var data = {
14604 productSku: productSku, 14610 productSku: productSku,
14605 buyNumber: buyNumber, 14611 buyNumber: buyNumber,
@@ -14613,6 +14619,7 @@ function ticketsConfirm () { @@ -14613,6 +14619,7 @@ function ticketsConfirm () {
14613 dataType: 'json', 14619 dataType: 'json',
14614 data: data, 14620 data: data,
14615 success: function(ticket) { 14621 success: function(ticket) {
  14622 +
14616 //下单成功调整支付页面 14623 //下单成功调整支付页面
14617 if (ticket.code === 200) { 14624 if (ticket.code === 200) {
14618 window.location.href = '/home/orders/pay?order_code=' + ticket.data.order_code 14625 window.location.href = '/home/orders/pay?order_code=' + ticket.data.order_code
@@ -14637,6 +14644,16 @@ $ticketsMobile.blur(function function_name (e) { @@ -14637,6 +14644,16 @@ $ticketsMobile.blur(function function_name (e) {
14637 }) 14644 })
14638 // 初始化发票信息内容 14645 // 初始化发票信息内容
14639 invoiceInit(); 14646 invoiceInit();
  14647 +
  14648 +$(window).scroll(function() {
  14649 +
  14650 + if ($(this).scrollTop() >= (headerTop + addressTop)) {
  14651 + $('.address-bottom').show();
  14652 + } else {
  14653 + $('.address-bottom').hide();
  14654 + }
  14655 +});
  14656 +
14640 }); 14657 });
14641 define("js/cart/order-info", ["jquery","hammer"], function(require, exports, module){ 14658 define("js/cart/order-info", ["jquery","hammer"], function(require, exports, module){
14642 /** 14659 /**
@@ -15074,7 +15091,7 @@ var $confim = $('.confim-mask'), @@ -15074,7 +15091,7 @@ var $confim = $('.confim-mask'),
15074 15091
15075 require("js/common"); 15092 require("js/common");
15076 15093
15077 -$('.address-item').on('touchend', function() { 15094 +$('.address-item').on('click', function() {
15078 var $this = $(this); 15095 var $this = $(this);
15079 var addressId = $this.data('address-id'); 15096 var addressId = $this.data('address-id');
15080 var address = { 15097 var address = {
@@ -15088,14 +15105,15 @@ $('.address-item').on('touchend', function() { @@ -15088,14 +15105,15 @@ $('.address-item').on('touchend', function() {
15088 orderInfo('addressId', addressId); 15105 orderInfo('addressId', addressId);
15089 orderInfo('address', address); 15106 orderInfo('address', address);
15090 window.location.href = $this.data('href') + (orderInfo('limitUrlSufix') || ''); 15107 window.location.href = $this.data('href') + (orderInfo('limitUrlSufix') || '');
15091 -}).on('touchend', '.edit', function() { 15108 +
  15109 +}).on('click', '.edit', function() {
15092 window.location.href = $(this).data('href'); 15110 window.location.href = $(this).data('href');
15093 return false; 15111 return false;
15094 -}).on('touchstart', '.del', function() { 15112 +}).on('click', '.del', function() {
15095 deleteId = $(this).data('id'); 15113 deleteId = $(this).data('id');
15096 }); 15114 });
15097 15115
15098 -$confim.on('touchend', '.confim', function() { 15116 +$confim.on('click', '.confim', function() {
15099 if (orderInfo('addressId') === deleteId) { 15117 if (orderInfo('addressId') === deleteId) {
15100 orderInfo('addressId', null); 15118 orderInfo('addressId', null);
15101 orderInfo('address', null); 15119 orderInfo('address', null);
This diff could not be displayed because it is too large.

24.7 KB | W: | H:

19.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin