diff --git a/src/sku/Sku.js b/src/sku/Sku.js index 5fc4b7247..a41f78941 100644 --- a/src/sku/Sku.js +++ b/src/sku/Sku.js @@ -260,7 +260,6 @@ export default createComponent({ const skuEventBus = new Vue(); this.skuEventBus = skuEventBus; - skuEventBus.$on('sku:close', this.onClose); skuEventBus.$on('sku:select', this.onSelect); skuEventBus.$on('sku:numChange', this.onNumChange); skuEventBus.$on('sku:previewImage', this.onPreviewImage); @@ -339,10 +338,6 @@ export default createComponent({ return t('selectSku'); }, - onClose() { - this.show = false; - }, - onSelect(skuValue) { // 点击已选中的sku时则取消选中 this.selectedSku = @@ -547,11 +542,13 @@ export default createComponent({ return ( {Header}
diff --git a/src/sku/components/SkuHeader.tsx b/src/sku/components/SkuHeader.tsx index 4a34b1399..db0f0e665 100644 --- a/src/sku/components/SkuHeader.tsx +++ b/src/sku/components/SkuHeader.tsx @@ -1,7 +1,6 @@ import { createNamespace } from '../../utils'; import { inherit } from '../../utils/functional'; import { BORDER_BOTTOM } from '../../utils/constant'; -import Icon from '../../icon'; // Types import Vue, { CreateElement, RenderContext } from 'vue/types'; @@ -53,16 +52,7 @@ function SkuHeader(
-
- {slots.default && slots.default()} - { - skuEventBus.$emit('sku:close'); - }} - /> -
+
{slots.default && slots.default()}
); } diff --git a/src/sku/index.less b/src/sku/index.less index 09becfc83..d56e98aa8 100644 --- a/src/sku/index.less +++ b/src/sku/index.less @@ -11,6 +11,12 @@ overflow-y: visible; font-size: @font-size-md; background: @white; + + .van-popup__close-icon { + top: @padding-sm; + color: @sku-icon-gray-color; + font-size: 20px; + } } &-body { @@ -103,15 +109,6 @@ } } - &__close-icon { - position: absolute; - top: @padding-sm; - right: @padding-md; - color: @sku-icon-gray-color; - font-size: 20px; - text-align: center; - } - &-group-container { margin-left: @padding-md; padding: @padding-sm 0 2px; diff --git a/src/sticky/test/__snapshots__/demo.spec.js.snap b/src/sticky/test/__snapshots__/demo.spec.js.snap index 3fa91b535..1172d33f5 100644 --- a/src/sticky/test/__snapshots__/demo.spec.js.snap +++ b/src/sticky/test/__snapshots__/demo.spec.js.snap @@ -4,24 +4,18 @@ exports[`renders demo correctly 1`] = `
-
+
-
+
-
+