From ada23d9ebec7d849ac94c3a3002e4ca8fb71c0c3 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 25 Jun 2020 17:04:18 +0800 Subject: [PATCH] refactor(Sku): rename largePicturePreview to largeImageMode --- src/sku/README.md | 2 +- src/sku/README.zh-CN.md | 2 +- src/sku/Sku.js | 6 +++--- src/sku/components/SkuRow.js | 16 +++++++--------- src/sku/components/SkuRowItem.js | 14 ++++++-------- src/sku/demo/data.ts | 4 ++-- src/sku/demo/index.vue | 8 ++++---- 7 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/sku/README.md b/src/sku/README.md index 637def141..0fe3ac258 100644 --- a/src/sku/README.md +++ b/src/sku/README.md @@ -204,7 +204,7 @@ sku: { previewImgUrl: 'https://img.yzcdn.cn/2p.jpg', } ], - large_picture_preview: true, // Whether to display large image mode + largeImageMode: true, // whether to enable large image mode } ], list: [ diff --git a/src/sku/README.zh-CN.md b/src/sku/README.zh-CN.md index 024b84cb3..e27159ae2 100644 --- a/src/sku/README.zh-CN.md +++ b/src/sku/README.zh-CN.md @@ -212,7 +212,7 @@ sku: { previewImgUrl: 'https://img.yzcdn.cn/2p.jpg', } ], - large_picture_preview: true, // 是否展示大图模式 + largeImageMode: true, // 是否展示大图模式 } ], // 所有 sku 的组合列表,比如红色、M 码为一个 sku 组合,红色、S 码为另一个组合 diff --git a/src/sku/Sku.js b/src/sku/Sku.js index 96eb01d20..65f149bca 100644 --- a/src/sku/Sku.js +++ b/src/sku/Sku.js @@ -680,13 +680,13 @@ export default createComponent({ {this.skuTree.map((skuTreeItem) => ( 6} > {skuTreeItem.v.map((skuValue, itemIndex) => ( ))} diff --git a/src/sku/components/SkuRow.js b/src/sku/components/SkuRow.js index ce7265d9a..c4f1be592 100644 --- a/src/sku/components/SkuRow.js +++ b/src/sku/components/SkuRow.js @@ -8,7 +8,7 @@ const [createComponent, bem, t] = createNamespace('sku-row'); export default createComponent({ mixins: [ BindEventMixin(function (bind) { - if (!(this.largePicturePreview && this.hasScrollTab)) { + if (!(this.largeImageMode && this.hasScrollTab)) { return false; } @@ -21,7 +21,7 @@ export default createComponent({ ], props: { skuRow: Object, - largePicturePreview: { + largeImageMode: { type: Boolean, default: false, }, @@ -40,7 +40,7 @@ export default createComponent({ }, computed: { scrollStyle() { - if (!(this.largePicturePreview && this.hasScrollTab)) { + if (!(this.largeImageMode && this.hasScrollTab)) { return false; } this.tranX = this.present * 20; @@ -60,7 +60,7 @@ export default createComponent({ }, }, render() { - const { skuRow, largePicturePreview, hasScrollTab } = this; + const { skuRow, largeImageMode, hasScrollTab } = this; const multipleNode = skuRow.is_multiple && ( ({t('multiple')}) ); @@ -86,15 +86,13 @@ export default createComponent({ ); return ( -
+
{skuRow.k} {multipleNode}
- {largePicturePreview ? SkuContent : this.slots()} - {largePicturePreview && hasScrollTab && SkuScroll} + {largeImageMode ? SkuContent : this.slots()} + {largeImageMode && hasScrollTab && SkuScroll}
); }, diff --git a/src/sku/components/SkuRowItem.js b/src/sku/components/SkuRowItem.js index a3624b106..b15301127 100644 --- a/src/sku/components/SkuRowItem.js +++ b/src/sku/components/SkuRowItem.js @@ -10,7 +10,7 @@ export default createComponent({ skuKeyStr: String, skuEventBus: Object, selectedSku: Object, - largePicturePreview: Boolean, + largeImageMode: Boolean, skuList: { type: Array, default: () => [], @@ -20,7 +20,7 @@ export default createComponent({ computed: { imgUrl() { const url = this.skuValue.imgUrl || this.skuValue.img_url; - return this.largePicturePreview + return this.largeImageMode ? url || 'https://img.yzcdn.cn/upload_files/2020/06/24/FmKWDg0bN9rMcTp9ne8MXiQWGtLn.png' : url; @@ -52,7 +52,7 @@ export default createComponent({ genImage(classPrefix) { const { imgUrl } = this; if (imgUrl) { - if (this.largePicturePreview && this.lazyLoad) { + if (this.largeImageMode && this.lazyLoad) { return ( ); @@ -65,7 +65,7 @@ export default createComponent({ render() { const choosed = this.skuValue.id === this.selectedSku[this.skuKeyStr]; - const classPrefix = this.largePicturePreview + const classPrefix = this.largeImageMode ? 'van-sku-row__picture-item' : 'van-sku-row__item'; @@ -78,7 +78,7 @@ export default createComponent({ ]} onClick={this.onSelect} > - {this.largePicturePreview && ( + {this.largeImageMode && ( - + {this.skuValue.name}
diff --git a/src/sku/demo/data.ts b/src/sku/demo/data.ts index 7f7152883..0f000045c 100644 --- a/src/sku/demo/data.ts +++ b/src/sku/demo/data.ts @@ -1,4 +1,4 @@ -export function getSkuData(large_picture_preview = false) { +export function getSkuData(largeImageMode = false) { return { goods_id: '1', quota: 5, @@ -37,7 +37,7 @@ export function getSkuData(large_picture_preview = false) { imgUrl: 'https://b.yzcdn.cn/vant/sku/shoes-3.png', }, ], - large_picture_preview, + largeImageMode, }, { k: '尺寸', diff --git a/src/sku/demo/index.vue b/src/sku/demo/index.vue index 64802cc1c..150d7924a 100644 --- a/src/sku/demo/index.vue +++ b/src/sku/demo/index.vue @@ -79,7 +79,7 @@ - +
- {{ t('largePicturePreview') }} + {{ t('largeImageMode') }}
@@ -188,7 +188,7 @@ export default { customBySlot: '通过插槽定制', customStepper: '自定义步进器', hideSoldoutSku: '隐藏售罄规格', - largePicturePreview: '大图预览模式', + largeImageMode: '大图预览模式', }, 'en-US': { button1: 'Button', @@ -198,7 +198,7 @@ export default { stepperTitle: 'Stepper title', customStepper: 'Custom Stepper', hideSoldoutSku: 'Hide Soldout Sku', - largePicturePreview: 'Large Picture Preview', + largeImageMode: 'Large Image Mode', }, },