Authored by 梁志锋

提交gulp ge 文件

@@ -9065,8 +9065,6 @@ var $ = require("jquery"), @@ -9065,8 +9065,6 @@ var $ = require("jquery"),
9065 var dialog = require("js/me/dialog"), 9065 var dialog = require("js/me/dialog"),
9066 tip = require("js/plugin/tip"); 9066 tip = require("js/plugin/tip");
9067 9067
9068 -// orderInfo = require('./order-info').orderInfo;  
9069 -  
9070 var $selectAllBtn = $('.balance .checkbox'), 9068 var $selectAllBtn = $('.balance .checkbox'),
9071 requesting = false; 9069 requesting = false;
9072 9070
@@ -9160,9 +9158,7 @@ $('.icon-del').on('touchstart', function(e) { @@ -9160,9 +9158,7 @@ $('.icon-del').on('touchstart', function(e) {
9160 autoHide: true, 9158 autoHide: true,
9161 fast: true 9159 fast: true
9162 }); 9160 });
9163 -  
9164 - // orderInfo('couponCode', null);  
9165 - // orderInfo('couponName', null); 9161 + window.setCookie('order-info', '');
9166 window.setCookie('_yoho-cart-refreshByDelete', true); 9162 window.setCookie('_yoho-cart-refreshByDelete', true);
9167 window.location.href = '/cart/index/index?cartType=' + $('#cartType').val(); 9163 window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
9168 } else { 9164 } else {
@@ -9427,7 +9423,11 @@ $('.invoice').on('touchend', '.checkbox', function() { @@ -9427,7 +9423,11 @@ $('.invoice').on('touchend', '.checkbox', function() {
9427 } 9423 }
9428 }); 9424 });
9429 9425
9430 -function orderCompute() { 9426 +function orderCompute(firstEnter) {
  9427 + var yohoCoin = orderInfo('yohoCoin');
  9428 + if (firstEnter) {
  9429 + yohoCoin = 0;
  9430 + }
9431 $.ajax({ 9431 $.ajax({
9432 method: 'POST', 9432 method: 'POST',
9433 url: '/cart/index/orderCompute', 9433 url: '/cart/index/orderCompute',
@@ -9436,7 +9436,7 @@ function orderCompute() { @@ -9436,7 +9436,7 @@ function orderCompute() {
9436 deliveryId: orderInfo('deliveryId'), 9436 deliveryId: orderInfo('deliveryId'),
9437 paymentTypeId: orderInfo('paymentTypeId'), 9437 paymentTypeId: orderInfo('paymentTypeId'),
9438 couponCode: orderInfo('couponCode'), 9438 couponCode: orderInfo('couponCode'),
9439 - yohoCoin: orderInfo('yohoCoin') 9439 + yohoCoin: yohoCoin
9440 } 9440 }
9441 }).then(function(res) { 9441 }).then(function(res) {
9442 var priceHtml; 9442 var priceHtml;
@@ -9466,7 +9466,7 @@ function orderCompute() { @@ -9466,7 +9466,7 @@ function orderCompute() {
9466 } 9466 }
9467 9467
9468 // 进入页面计算一次价格 9468 // 进入页面计算一次价格
9469 -orderCompute(); 9469 +//orderCompute(1);
9470 9470
9471 function submitOrder() { 9471 function submitOrder() {
9472 var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'), 9472 var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),
This diff could not be displayed because it is too large.