diff --git a/docs/demos/views/sku.vue b/docs/demos/views/sku.vue index 34436aa82..f0e51f1a5 100644 --- a/docs/demos/views/sku.vue +++ b/docs/demos/views/sku.vue @@ -33,6 +33,7 @@ :quota="$t('sku').quota" :quota-used="$t('sku').quota_used" :custom-stepper-config="customStepperConfig" + :message-config="messageConfig" @buy-clicked="onBuyClicked" @add-cart="onAddCartClicked" /> @@ -54,6 +55,7 @@ show-add-cart-btn reset-stepper-on-hide :initial-sku="initialSku" + :message-config="messageConfig" @buy-clicked="onBuyClicked" @add-cart="onAddCartClicked" > @@ -119,9 +121,9 @@ export default { } }, messageConfig: { - uploadImg: () => { - return new Promise((resolve) => { - setTimeout(() => resolve('https://img.yzcdn.cn/upload_files/2017/02/21/FjKTOxjVgnUuPmHJRdunvYky9OHP.jpg!100x100.jpg'), 1000); + uploadImg: (file, img) => { + return new Promise(resolve => { + setTimeout(() => resolve(img), 1000); }); }, uploadMaxSize: 3 diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue index e72a38a78..2864dcd39 100644 --- a/packages/address-edit/index.vue +++ b/packages/address-edit/index.vue @@ -58,10 +58,10 @@ />
- + {{ $t('save') }} - + {{ $t('deleteAddress', computedAddressText) }}
@@ -108,10 +108,10 @@ export default create({ components: { Field, - SwitchCell, - VanButton, Popup, VanArea, + VanButton, + SwitchCell, AddressEditDetail }, @@ -223,7 +223,7 @@ export default create({ }); }, - onSaveAddress() { + onSave() { const items = [ 'name', 'tel', @@ -267,7 +267,7 @@ export default create({ } }, - onDeleteAddress() { + onDelete() { if (this.isDeleting) { return; } diff --git a/packages/address-list/index.vue b/packages/address-list/index.vue index 1505d1ffa..8c4aef022 100644 --- a/packages/address-list/index.vue +++ b/packages/address-list/index.vue @@ -13,10 +13,10 @@ diff --git a/packages/cell-group/index.vue b/packages/cell-group/index.vue index 59fd60221..ff5d6d81d 100644 --- a/packages/cell-group/index.vue +++ b/packages/cell-group/index.vue @@ -5,11 +5,9 @@ diff --git a/packages/cell/index.vue b/packages/cell/index.vue index 7fe972fc1..9c68fe778 100644 --- a/packages/cell/index.vue +++ b/packages/cell/index.vue @@ -38,12 +38,10 @@ diff --git a/packages/contact-list/index.vue b/packages/contact-list/index.vue index 154886745..5804ad7a5 100644 --- a/packages/contact-list/index.vue +++ b/packages/contact-list/index.vue @@ -13,10 +13,10 @@ diff --git a/packages/icon/index.vue b/packages/icon/index.vue index 62c122341..8fb17ab9f 100644 --- a/packages/icon/index.vue +++ b/packages/icon/index.vue @@ -6,16 +6,14 @@ diff --git a/packages/loading/index.vue b/packages/loading/index.vue index 931799100..ff09f5ff1 100644 --- a/packages/loading/index.vue +++ b/packages/loading/index.vue @@ -10,11 +10,9 @@ diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue index fe80a267c..673c06c65 100644 --- a/packages/sku/Sku.vue +++ b/packages/sku/Sku.vue @@ -3,98 +3,91 @@ v-if="!isSkuEmpty" v-model="show" position="bottom" + class="van-sku-container" :close-on-click-overlay="closeOnClickOverlay" :get-container="getContainer" > -
-
- - + + + +
+ + + + +
+ + + +
+ + + + + + - - -
- - - - -
-
- - - -
-
- - - - - - - - - - - -
- - - - -
+ :selected-num="selectedNum" + :stepper-title="stepperTitle" + :sku-stock-num="sku.stock_num" + :quota="quota" + :quota-used="quotaUsed" + :disable-stepper-input="disableStepperInput" + :hide-stock="hideStock" + :custom-stepper-config="customStepperConfig" + /> + + + + +
+ + + + @@ -225,9 +218,8 @@ export default create({ return; } - const windowHeight = window.innerHeight; // header高度82px, sku actions高度50px，如果改动了样式自己传下bodyOffsetTop调整下 - const maxHeight = windowHeight - this.bodyOffsetTop; + const maxHeight = window.innerHeight - this.bodyOffsetTop; return { maxHeight: maxHeight + 'px' @@ -268,12 +260,12 @@ export default create({ const skuEventBus = new Vue(); this.skuEventBus = skuEventBus; - skuEventBus.$on('sku:close', this.onCloseClicked); - skuEventBus.$on('sku:select', this.onSkuSelected); + skuEventBus.$on('sku:close', this.onClose); + skuEventBus.$on('sku:select', this.onSelect); skuEventBus.$on('sku:numChange', this.onNumChange); skuEventBus.$on('sku:overLimit', this.onOverLimit); - skuEventBus.$on('sku:addCart', this.onAddCartClicked); - skuEventBus.$on('sku:buy', this.onBuyClicked); + skuEventBus.$on('sku:addCart', this.onAddCart); + skuEventBus.$on('sku:buy', this.onBuy); this.resetSelectedSku(this.skuTree); // 组件初始化后的钩子，抛出skuEventBus @@ -315,19 +307,17 @@ export default create({ } if (this.isSkuCombSelected) { - const error = this.validateSkuMessages(); - // sku留言没有错误则校验通过 - return error; - } else { - return this.$t('spec'); + return this.validateSkuMessages(); } + + return this.$t('spec'); }, - onCloseClicked() { + onClose() { this.show = false; }, - onSkuSelected(skuValue) { + onSelect(skuValue) { // 点击已选中的sku时则取消选中 this.selectedSku = this.selectedSku[skuValue.skuKeyStr] === skuValue.id @@ -367,11 +357,11 @@ export default create({ } }, - onAddCartClicked() { + onAddCart() { this.onBuyOrAddCart('add-cart'); }, - onBuyClicked() { + onBuy() { this.onBuyOrAddCart('buy-clicked'); }, diff --git a/packages/sku/components/SkuHeader.vue b/packages/sku/components/SkuHeader.vue index 9c5c9ca72..24d592a72 100644 --- a/packages/sku/components/SkuHeader.vue +++ b/packages/sku/components/SkuHeader.vue @@ -1,12 +1,14 @@ @@ -18,11 +20,11 @@ export default create({ name: 'sku-header', props: { - skuEventBus: Object, sku: Object, + goods: Object, + skuEventBus: Object, selectedSku: Object, - selectedSkuComb: Object, - goods: Object + selectedSkuComb: Object }, computed: { @@ -32,6 +34,7 @@ export default create({ // 优先使用选中sku的图片 return skuImg || this.goods.picture; }, + price() { if (this.selectedSkuComb) { return (this.selectedSkuComb.price / 100).toFixed(2); diff --git a/packages/sku/components/SkuImgUploader.vue b/packages/sku/components/SkuImgUploader.vue index 4f8785eca..c6b472e02 100644 --- a/packages/sku/components/SkuImgUploader.vue +++ b/packages/sku/components/SkuImgUploader.vue @@ -2,56 +2,51 @@
+ :max-size="maxSize * 1024 * 1024" + accept="image/*" + @oversize="$toast($t('maxSize', maxSize))" + >
{{ $t('uploading') }}
 -
+
- - - + class="van-sku-img-uploader__img" + > +
-
+
- +