fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 3ac0e6aab7127c5cf2eb61ccb11781ad854de11b 1 parent 91e7f184

link-to-new-order-ensure-pay-center

Inline Side-by-side
Showing 4 changed files with 22 additions and 19 deletions
@@ -73,11 +73,13 @@ const processInvoiceData = (orderInfo, mobile, addresslist) => { @@ -73,11 +73,13 @@ const processInvoiceData = (orderInfo, mobile, addresslist) => {
73 id: 11, 73 id: 11,
74 text: '日用品' 74 text: '日用品'
75 }, 75 },
76 - {  
77 - choosed: invoiceType === 3,  
78 - id: 3,  
79 - text: '办公用品'  
80 - }, 76 +
  77 + // 暂停办公用品开票
  78 + // {
  79 + // choosed: invoiceType === 3,
  80 + // id: 3,
  81 + // text: '办公用品'
  82 + // },
81 { 83 {
82 choosed: invoiceType === 6, 84 choosed: invoiceType === 6,
83 id: 6, 85 id: 6,
@@ -6,15 +6,15 @@ @@ -6,15 +6,15 @@
6 <div class="info"> 6 <div class="info">
7 <span class="info-name">{{name}}</span> 7 <span class="info-name">{{name}}</span>
8 <span class="info-phone">{{phoneNum}}</span> 8 <span class="info-phone">{{phoneNum}}</span>
9 - <a href="/cart/index/selectAddress"><span class="info-address">{{addressInfo}}</span></a> 9 + <a href="/cart/index/new/selectAddress"><span class="info-address">{{addressInfo}}</span></a>
10 <i class="iconfont">&#xe637;</i> 10 <i class="iconfont">&#xe637;</i>
11 </div> 11 </div>
12 - <a class="rest" href="/cart/index/selectAddress">其他地址<span class="iconfont">&#xe614;</span></a> 12 + <a class="rest" href="/cart/index/new/selectAddress">其他地址<span class="iconfont">&#xe614;</span></a>
13 </div> 13 </div>
14 {{else}} 14 {{else}}
15 <div class="address block address-wrap not-address"> 15 <div class="address block address-wrap not-address">
16 <i class="iconfont">&#xe637;</i> 16 <i class="iconfont">&#xe637;</i>
17 - <a class="choose" href="/cart/index/selectAddress">请选择收货地址<span class="iconfont">&#xe614;</span></a> 17 + <a class="choose" href="/cart/index/new/selectAddress">请选择收货地址<span class="iconfont">&#xe614;</span></a>
18 </div> 18 </div>
19 {{/if}} 19 {{/if}}
20 <section class="dispatch block"> 20 <section class="dispatch block">
@@ -26,9 +26,9 @@ var $invoice = $('.invoice'), @@ -26,9 +26,9 @@ var $invoice = $('.invoice'),
26 isTickets = $('#ticketsPage').val(), 26 isTickets = $('#ticketsPage').val(),
27 productSku = $('#productSku').val(), 27 productSku = $('#productSku').val(),
28 buyNumber = $('#buyNumber').val(), 28 buyNumber = $('#buyNumber').val(),
29 - headerTop = $("#yoho-header").outerHeight(),  
30 - isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, //判断有货币是否可以单击  
31 - addressTop = $(".address-wrap").outerHeight(); 29 + headerTop = $('#yoho-header').outerHeight(),
  30 + isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击
  31 + addressTop = $('.address-wrap').outerHeight();
32 32
33 var orderCont = window.cookie('order-info') && JSON.parse(window.cookie('order-info')); 33 var orderCont = window.cookie('order-info') && JSON.parse(window.cookie('order-info'));
34 var invoiceCont = { 34 var invoiceCont = {
@@ -55,7 +55,8 @@ function invoiceInit() { @@ -55,7 +55,8 @@ function invoiceInit() {
55 $('.invoice-type').text(invoiceCont[orderCont.invoiceType] + '(' + invoicesType[orderCont.invoicesType] + ')'); 55 $('.invoice-type').text(invoiceCont[orderCont.invoiceType] + '(' + invoicesType[orderCont.invoicesType] + ')');
56 } else { 56 } else {
57 $('.invoice-type').text('服装(电子)'); 57 $('.invoice-type').text('服装(电子)');
58 - //$('.invoice-type').text('服装(纸质)'); 58 +
  59 + // $('.invoice-type').text('服装(纸质)');
59 } 60 }
60 } 61 }
61 62
@@ -193,15 +194,15 @@ function orderCompute() { @@ -193,15 +194,15 @@ function orderCompute() {
193 skuList: isLimitGood() ? orderInfo('skuList') : undefined 194 skuList: isLimitGood() ? orderInfo('skuList') : undefined
194 }; 195 };
195 196
196 - //门票 197 + // 门票
197 if (isTickets) { 198 if (isTickets) {
198 data = { 199 data = {
199 type: 'tickets', 200 type: 'tickets',
200 productSku: productSku, 201 productSku: productSku,
201 buyNumber: buyNumber, 202 buyNumber: buyNumber,
202 yohoCoin: yohoCoin 203 yohoCoin: yohoCoin
203 - }  
204 - }; 204 + };
  205 + }
205 206
206 loading.showLoadingMask(); 207 loading.showLoadingMask();
207 $.ajax({ 208 $.ajax({
@@ -306,7 +307,7 @@ function submitOrder() { @@ -306,7 +307,7 @@ function submitOrder() {
306 // 货到付款的进入订单页面 307 // 货到付款的进入订单页面
307 url = '/home/orderDetail?order_code=' + res.data.order_code; 308 url = '/home/orderDetail?order_code=' + res.data.order_code;
308 } else { 309 } else {
309 - url = '/home/orders/pay?order_code=' + res.data.order_code; 310 + url = '/cart/index/new/pay?order_code=' + res.data.order_code;
310 } 311 }
311 312
312 /* tar add 161116 */ 313 /* tar add 161116 */
@@ -314,7 +315,7 @@ function submitOrder() { @@ -314,7 +315,7 @@ function submitOrder() {
314 window._yas.sendCustomInfo({ 315 window._yas.sendCustomInfo({
315 op: 'YB_SC_TOPAY_CLICK', 316 op: 'YB_SC_TOPAY_CLICK',
316 param: JSON.stringify({ 317 param: JSON.stringify({
317 - C_ID: window._ChannelVary[cookie('_Channel')], 318 + C_ID: window._ChannelVary[window.cookie('_Channel')],
318 ORDER_CODE: res.data.order_code, 319 ORDER_CODE: res.data.order_code,
319 PRD_NUM: $('#goods-num').val(), 320 PRD_NUM: $('#goods-num').val(),
320 ORDER_AMOUNT: res.data.order_amount, 321 ORDER_AMOUNT: res.data.order_amount,
@@ -528,7 +529,7 @@ function ticketsConfirm() { @@ -528,7 +529,7 @@ function ticketsConfirm() {
528 } 529 }
529 530
530 // 校验手机号 531 // 校验手机号
531 -$ticketsMobile.blur(function(e) { 532 +$ticketsMobile.blur(function() {
532 var reg = /^[0123456789]{1,30}$/; 533 var reg = /^[0123456789]{1,30}$/;
533 var mobile = $ticketsMobile.val(); 534 var mobile = $ticketsMobile.val();
534 535
@@ -23,7 +23,7 @@ var $invoiceNotice = $('.invoice-notice'), @@ -23,7 +23,7 @@ var $invoiceNotice = $('.invoice-notice'),
23 isModifyTel = false; 23 isModifyTel = false;
24 24
25 var myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\d{8})$/, 25 var myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\d{8})$/,
26 - linkUrl = $('.address-more').val() || '/cart/index/orderEnsure?cartType=ordinary'; 26 + linkUrl = $('.address-more').val() || '/cart/index/new/orderEnsure?cartType=ordinary';
27 27
28 var C_ID = window._ChannelVary[window.cookie('_Channel')] || 1; 28 var C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
29 29