diff --git a/framework b/framework index e9d066d..75bbc3b 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec +Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 diff --git a/static/js/shopping-cart/order-ensure.js b/static/js/shopping-cart/order-ensure.js index 5f38c32..5d6387b 100644 --- a/static/js/shopping-cart/order-ensure.js +++ b/static/js/shopping-cart/order-ensure.js @@ -100,8 +100,8 @@ function submitOrder() { data: { addressId: orderInfo('addressId'), cartType: orderInfo('cartType'), - deliveryId: orderInfo('deliveryId') || 1, - deliveryTimeId: orderInfo('deliveryTimeId') || 2, + deliveryId: orderInfo('deliveryId'), + deliveryTimeId: orderInfo('deliveryTimeId'), invoiceText: $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'), invoiceType: $invoice.find('.invoice-type').val() || orderInfo('invoiceType'), msg: $('#msg').find('input').val() || orderInfo('msg'), diff --git a/static/js/shopping-cart/select-coupon.js b/static/js/shopping-cart/select-coupon.js index 3c65b14..02c9516 100644 --- a/static/js/shopping-cart/select-coupon.js +++ b/static/js/shopping-cart/select-coupon.js @@ -30,6 +30,7 @@ $newCoupon.on('submit', function() { if (res.code === 200) { tip.show('优惠券可用'); orderInfo('couponCode', res.data.coupon_code); + orderInfo('couponValue', res.data.coupon_value); window.location.href = '/shoppingCart/orderEnsure?coupon_code=' + res.data.coupon_code; } else { tip.show(res.message); diff --git a/static/sass/shopping-cart/_order-ensure.scss b/static/sass/shopping-cart/_order-ensure.scss index 3ebc3f6..86d72d8 100644 --- a/static/sass/shopping-cart/_order-ensure.scss +++ b/static/sass/shopping-cart/_order-ensure.scss @@ -108,6 +108,10 @@ &.used { color: #f00; } + + .iconfont { + color: #999; + } } .coin-check { @@ -119,6 +123,10 @@ color: #000; } + em { + color: #f00; + } + } .checkbox.icon-checkbox { @@ -191,6 +199,10 @@ } } + .price-cal { + font-family: monospace; + } + .cost { border-top: 1px solid #f7f7f7; line-height: 100rem / $pxConvertRem; diff --git a/template/m.yohobuy.com/actions/index/shoppingCart/order-ensure.phtml b/template/m.yohobuy.com/actions/index/shoppingCart/order-ensure.phtml index 2c3c2fb..b9ddae1 100644 --- a/template/m.yohobuy.com/actions/index/shoppingCart/order-ensure.phtml +++ b/template/m.yohobuy.com/actions/index/shoppingCart/order-ensure.phtml @@ -121,7 +121,7 @@ {{/couponPrice}} <li> <span>YOHO币</span> - - {{yohoCoin}} + - ¥{{yohoCoin}} </li> <li class="cost"> 应付金额: <em>¥{{price}}</em>