Authored by 郭成尧

Merge branch 'feature/bundleToCart' into release/5.6

@@ -57,7 +57,8 @@ class ChosePanel { @@ -57,7 +57,8 @@ class ChosePanel {
57 this.maxBuyNum = this.data.cartInfo.limit || 0; // 0表示不限制购买 57 this.maxBuyNum = this.data.cartInfo.limit || 0; // 0表示不限制购买
58 this.skus = this.data.cartInfo.skus || []; 58 this.skus = this.data.cartInfo.skus || [];
59 this.props = this.data.cartInfo.props || []; 59 this.props = this.data.cartInfo.props || [];
60 - this.buyNum = this.minBuyNum = this._defaultBuyNum(); 60 + this.buyNum = this._defaultBuyNum();
  61 + this.minBuyNum = (this.modes.discount && this.data.discountBuy.num) || 1;
61 this.setting = { 62 this.setting = {
62 disableNum: this.disableNum, 63 disableNum: this.disableNum,
63 noChoseText: `请选择${this.props.map(prop => prop.name).join('、')}`, 64 noChoseText: `请选择${this.props.map(prop => prop.name).join('、')}`,