Showing
5 changed files
with
17 additions
and
4 deletions
framework @ 75bbc3b0
@@ -100,8 +100,8 @@ function submitOrder() { | @@ -100,8 +100,8 @@ function submitOrder() { | ||
100 | data: { | 100 | data: { |
101 | addressId: orderInfo('addressId'), | 101 | addressId: orderInfo('addressId'), |
102 | cartType: orderInfo('cartType'), | 102 | cartType: orderInfo('cartType'), |
103 | - deliveryId: orderInfo('deliveryId') || 1, | ||
104 | - deliveryTimeId: orderInfo('deliveryTimeId') || 2, | 103 | + deliveryId: orderInfo('deliveryId'), |
104 | + deliveryTimeId: orderInfo('deliveryTimeId'), | ||
105 | invoiceText: $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'), | 105 | invoiceText: $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'), |
106 | invoiceType: $invoice.find('.invoice-type').val() || orderInfo('invoiceType'), | 106 | invoiceType: $invoice.find('.invoice-type').val() || orderInfo('invoiceType'), |
107 | msg: $('#msg').find('input').val() || orderInfo('msg'), | 107 | msg: $('#msg').find('input').val() || orderInfo('msg'), |
@@ -30,6 +30,7 @@ $newCoupon.on('submit', function() { | @@ -30,6 +30,7 @@ $newCoupon.on('submit', function() { | ||
30 | if (res.code === 200) { | 30 | if (res.code === 200) { |
31 | tip.show('优惠券可用'); | 31 | tip.show('优惠券可用'); |
32 | orderInfo('couponCode', res.data.coupon_code); | 32 | orderInfo('couponCode', res.data.coupon_code); |
33 | + orderInfo('couponValue', res.data.coupon_value); | ||
33 | window.location.href = '/shoppingCart/orderEnsure?coupon_code=' + res.data.coupon_code; | 34 | window.location.href = '/shoppingCart/orderEnsure?coupon_code=' + res.data.coupon_code; |
34 | } else { | 35 | } else { |
35 | tip.show(res.message); | 36 | tip.show(res.message); |
@@ -108,6 +108,10 @@ | @@ -108,6 +108,10 @@ | ||
108 | &.used { | 108 | &.used { |
109 | color: #f00; | 109 | color: #f00; |
110 | } | 110 | } |
111 | + | ||
112 | + .iconfont { | ||
113 | + color: #999; | ||
114 | + } | ||
111 | } | 115 | } |
112 | 116 | ||
113 | .coin-check { | 117 | .coin-check { |
@@ -119,6 +123,10 @@ | @@ -119,6 +123,10 @@ | ||
119 | color: #000; | 123 | color: #000; |
120 | } | 124 | } |
121 | 125 | ||
126 | + em { | ||
127 | + color: #f00; | ||
128 | + } | ||
129 | + | ||
122 | } | 130 | } |
123 | 131 | ||
124 | .checkbox.icon-checkbox { | 132 | .checkbox.icon-checkbox { |
@@ -191,6 +199,10 @@ | @@ -191,6 +199,10 @@ | ||
191 | } | 199 | } |
192 | } | 200 | } |
193 | 201 | ||
202 | + .price-cal { | ||
203 | + font-family: monospace; | ||
204 | + } | ||
205 | + | ||
194 | .cost { | 206 | .cost { |
195 | border-top: 1px solid #f7f7f7; | 207 | border-top: 1px solid #f7f7f7; |
196 | line-height: 100rem / $pxConvertRem; | 208 | line-height: 100rem / $pxConvertRem; |
@@ -121,7 +121,7 @@ | @@ -121,7 +121,7 @@ | ||
121 | {{/couponPrice}} | 121 | {{/couponPrice}} |
122 | <li> | 122 | <li> |
123 | <span>YOHO币</span> | 123 | <span>YOHO币</span> |
124 | - - {{yohoCoin}} | 124 | + - ¥{{yohoCoin}} |
125 | </li> | 125 | </li> |
126 | <li class="cost"> | 126 | <li class="cost"> |
127 | 应付金额: <em>¥{{price}}</em> | 127 | 应付金额: <em>¥{{price}}</em> |
-
Please register or login to post a comment