diff --git a/docs/demos/mock/sku.js b/docs/demos/mock/sku.js index 828a00312..5d5732349 100644 --- a/docs/demos/mock/sku.js +++ b/docs/demos/mock/sku.js @@ -366,7 +366,7 @@ export default { extend: null, kdt_id: 55, discount_price: 0, - stock_num: 6, + stock_num: 4, stock_mode: 0, is_sell: null, combin_sku: false, @@ -506,7 +506,7 @@ export default { alias: '2oml0r0n5vytj', quota: 15, is_virtual: '0', - quota_used: 0, + quota_used: 1, goods_info: { title: 'Goods Name', picture: 'https://img.yzcdn.cn/upload_files/2017/03/16/Fs_OMbSFPa183sBwvG_94llUYiLa.jpeg?imageView2/2/w/100/h/100/q/75/format/jpg', diff --git a/docs/demos/views/sku.vue b/docs/demos/views/sku.vue index 29e95078b..a930134fd 100644 --- a/docs/demos/views/sku.vue +++ b/docs/demos/views/sku.vue @@ -11,6 +11,7 @@ :quota="$t('sku').quota" :quota-used="$t('sku').quota_used" :reset-stepper-on-hide="true" + :reset-selected-sku-on-hide="true" :disable-stepper-input="true" @buy-clicked="handleBuyClicked" @add-cart="handleAddCartClicked" diff --git a/docs/markdown/en-US/sku.md b/docs/markdown/en-US/sku.md index 89e2fe8ff..41945a0ad 100644 --- a/docs/markdown/en-US/sku.md +++ b/docs/markdown/en-US/sku.md @@ -20,6 +20,7 @@ Vue.use(Sku); :quota="quota" :quota-used="quotaUsed" :reset-stepper-on-hide="resetStepperOnHide" + :reset-selected-sku-on-hide="resetSelectedSkuOnHide" :disable-stepper-input="disableStepperInput" @buy-clicked="handleBuyClicked" @add-cart="handleAddCartClicked" @@ -70,6 +71,7 @@ Vue.use(Sku); | quota | Quota (0 as no limit) | `Number` | `0` | - | | quota-used | Used quota | `Number` | `0` | - | | reset-stepper-on-hide | Whether to reset stepper when hide | `Boolean` | `false` | - | +| reset-selected-sku-on-hide | Whether to reset selected sku when hide | `Boolean` | `false` | - | | disable-stepper-input | Whether to disable stepper input | `Boolean` | `false` | - | | stepper-title | Quantity title | `String` | `Quantity` | - | @@ -85,6 +87,7 @@ Vue.use(Sku); | Name | Description | |-----------|-----------| | sku-header | Custom header | +| sku-body-top | Custom content before sku-group | | sku-group | Custom sku | | extra-sku-group | Extra custom content | | sku-stepper | Custom stepper | diff --git a/docs/markdown/zh-CN/sku.md b/docs/markdown/zh-CN/sku.md index 0993d4538..57c0895ef 100644 --- a/docs/markdown/zh-CN/sku.md +++ b/docs/markdown/zh-CN/sku.md @@ -20,6 +20,7 @@ Vue.use(Sku); :quota="quota" :quota-used="quotaUsed" :reset-stepper-on-hide="resetStepperOnHide" + :reset-selected-sku-on-hide="resetSelectedSkuOnHide" :disable-stepper-input="disableStepperInput" @buy-clicked="handleBuyClicked" @add-cart="handleAddCartClicked" @@ -71,6 +72,7 @@ Vue.use(Sku); | quota | 限购数(0表示不限购) | `Number` | `0` | - | | quota-used | 已经购买过的数量 | `Number` | `0` | - | | reset-stepper-on-hide | 窗口隐藏时重置选择的商品数量 | `Boolean` | `false` | - | +| reset-selected-sku-on-hide | 窗口隐藏时重置已选择的sku | `Boolean` | `false` | - | | disable-stepper-input | 是否禁用sku中stepper的input框 | `Boolean` | `false` | - | | stepper-title | 数量选择组件左侧文案 | `String` | `购买数量` | - | @@ -88,6 +90,7 @@ Sku 组件默认划分好了若干区块,这些区块都定义成了 slot, | 名称 | 说明 | |-----------|-----------| | sku-header | 商品信息展示区,包含商品图片、名称、价格等信息 | +| sku-body-top | sku展示区上方的slot,无默认展示内容,按需使用 | | sku-group | 商品sku展示区 | | extra-sku-group | 额外商品sku展示区,一般用不到 | | sku-stepper | 商品数量选择区 | diff --git a/packages/sku/components/SkuStepper.vue b/packages/sku/components/SkuStepper.vue index 9b7779355..9b2a1264c 100644 --- a/packages/sku/components/SkuStepper.vue +++ b/packages/sku/components/SkuStepper.vue @@ -86,6 +86,7 @@ export default create({ this.limitType = QUOTA_LIMIT; } else { limit = this.stock; + this.limitType = STOCK_LIMIT; } return limit; diff --git a/packages/sku/containers/SkuContainer.vue b/packages/sku/containers/SkuContainer.vue index a5c595d79..fb27be30a 100644 --- a/packages/sku/containers/SkuContainer.vue +++ b/packages/sku/containers/SkuContainer.vue @@ -2,6 +2,7 @@
+
+ + +
+ + +
+ { sku: data.sku, goodsId: data.goods_id, goods: goods, - resetStepperOnHide: true + resetStepperOnHide: true, + resetSelectedSkuOnHide: true } });