diff --git a/pages/goods/point.vue b/pages/goods/point.vue index 0360766..b49f7a2 100644 --- a/pages/goods/point.vue +++ b/pages/goods/point.vue @@ -277,10 +277,6 @@ color: #fff; line-height: normal; font-family: OPPOSANS; - - &::before { - font-size: 30rpx; - } } } diff --git a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue index 99b28a5..dfaf875 100644 --- a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue +++ b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue @@ -19,8 +19,11 @@ {{ state.goodsInfo.name }} - - {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }} + + {{ getShowPriceText }} + + + ¥{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }} @@ -92,12 +95,15 @@ import { computed, reactive, watch } from 'vue'; import sheep from '@/sheep'; import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods'; - import { min } from 'lodash-es'; + import { isEmpty, min } from 'lodash-es'; + import { PromotionActivityTypeEnum } from '@/sheep/util/const'; + const emits = defineEmits(['change', 'addCart', 'buy', 'close']); const props = defineProps({ modelValue: { type: Object, - default() {}, + default() { + }, }, show: { type: Boolean, @@ -114,7 +120,14 @@ selectedSku: {}, currentPropertyArray: [], }); - + const getShowPriceText = computed(() => { + let priceText = `¥${fen2yuan(state.goodsInfo.price)}`; + if (!isEmpty(state.selectedSku)) { + const sku = state.selectedSku; + priceText = `${sku.point}积分${!sku.pointPrice ? '' : `+¥${fen2yuan(sku.pointPrice)}`}`; + } + return priceText; + }); const propertyList = convertProductPropertyList(state.goodsInfo.skus); // SKU 列表 const skuList = computed(() => { @@ -344,11 +357,6 @@ font-weight: 500; color: $red; font-family: OPPOSANS; - - &::before { - content: '¥'; - font-size: 24rpx; - } } .stock-text {