Authored by 郭成尧

Merge branch 'feature/bundleToCart' into release/5.6

@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 89
90 <section class="block"> 90 <section class="block">
91 <ul class="sale-invoice"> 91 <ul class="sale-invoice">
92 - {{#if isOrdinaryCart}} 92 + {{#if coupon.count}}
93 <li class="coupon"> 93 <li class="coupon">
94 <a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/new/selectCoupon{{/if}}"> 94 <a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/new/selectCoupon{{/if}}">
95 <span class="title">优惠券</span> 95 <span class="title">优惠券</span>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-04-06 16:51:52 3 * @Date: 2017-04-06 16:51:52
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-04-12 14:01:07 5 + * @Last Modified time: 2017-04-13 15:45:30
6 */ 6 */
7 7
8 const $ = require('yoho-jquery'); 8 const $ = require('yoho-jquery');
@@ -114,6 +114,7 @@ let bundle = { @@ -114,6 +114,7 @@ let bundle = {
114 * @param {*} e 114 * @param {*} e
115 */ 115 */
116 bundleCheckHandle(e) { 116 bundleCheckHandle(e) {
  117 + let self = this;
117 let selectCheck = $(e.delegateTarget).find('.select'); 118 let selectCheck = $(e.delegateTarget).find('.select');
118 let goodItem = $(e.delegateTarget).find('.good-item'); 119 let goodItem = $(e.delegateTarget).find('.good-item');
119 let skuData = []; 120 let skuData = [];
@@ -142,6 +143,7 @@ let bundle = { @@ -142,6 +143,7 @@ let bundle = {
142 success: function(result) { 143 success: function(result) {
143 if (result.code === 200) { 144 if (result.code === 200) {
144 selectCheck.toggleClass('checked'); 145 selectCheck.toggleClass('checked');
  146 + self.handle.refreshPage(result.data);
145 } 147 }
146 loading.hideLoading(); 148 loading.hideLoading();
147 } 149 }