diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue index c5b2f2f8..d8060bce 100644 --- a/sheep/components/s-coupon-block/s-coupon-block.vue +++ b/sheep/components/s-coupon-block/s-coupon-block.vue @@ -19,6 +19,7 @@ :title="item.amount_text" :value="item.amount" :surplus="item.stock" + :type="item.type" :sellBy="`${item.get_start_time.substring(0, 10)} 至 ${item.get_end_time.substring( 0, 10, @@ -56,6 +57,7 @@ :value="item.amount" :surplus="item.stock" :couponId="item.id" + :type="item.type" :sellBy="`${item.get_start_time.substring(0, 10)} 至 ${item.get_end_time.substring( 0, 10, @@ -93,6 +95,7 @@ :value="item.amount" :surplus="item.stock" :couponId="item.id" + :type="item.type" :sellBy="`${item.get_start_time.substring(0, 10)} 至 ${item.get_end_time.substring( 0, 10, diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue index f7d8b9f1..66f80722 100644 --- a/sheep/components/s-order-card/s-order-card.vue +++ b/sheep/components/s-order-card/s-order-card.vue @@ -71,6 +71,7 @@ .menu-item { height: 160rpx; position: relative; + z-index: 10; .menu-title { font-size: 24rpx; line-height: 24rpx; diff --git a/sheep/components/s-score-block/s-score-block.vue b/sheep/components/s-score-block/s-score-block.vue index 9472b2ed..09658a01 100644 --- a/sheep/components/s-score-block/s-score-block.vue +++ b/sheep/components/s-score-block/s-score-block.vue @@ -189,7 +189,7 @@ .cart-btn { position: absolute; bottom: 10rpx; - right: 10rpx; + right: 20rpx; z-index: 11; height: 50rpx; line-height: 50rpx; diff --git a/sheep/ui/su-coupon/su-coupon.vue b/sheep/ui/su-coupon/su-coupon.vue index a48d1583..2736c891 100644 --- a/sheep/ui/su-coupon/su-coupon.vue +++ b/sheep/ui/su-coupon/su-coupon.vue @@ -11,10 +11,10 @@ }) " > - + - {{ props.value }} - + {{ type === 'reduce' ? value : Number(value) }} + {{ type === 'reduce' ? '元' : '折' }} {{ props.title }} @@ -38,8 +38,8 @@ > - - {{ props.value }} + {{ type === 'reduce' ? value : Number(value) }} + {{ type === 'reduce' ? '元' : '折' }} {{ props.title }} @@ -68,8 +68,8 @@ > - - {{ props.value }} + {{ type === 'reduce' ? value : Number(value) }} + {{ type === 'reduce' ? '元' : '折' }} {{ props.title }} @@ -161,6 +161,10 @@ type: [Number, String], default: 1000, }, + type: { + type: String, + default: '', + }, }); const cardStyle = computed(() => { @@ -189,7 +193,7 @@ .value-unit { color: v-bind('textColor'); font-size: 24rpx; - line-height: 30rpx; + line-height: 38rpx; } .title-text { @@ -238,7 +242,7 @@ .value-unit { color: v-bind('textColor'); font-size: 22rpx; - line-height: 22rpx; + line-height: 28rpx; } .title-text, @@ -285,7 +289,7 @@ .value-unit { color: v-bind('textColor'); font-size: 22rpx; - line-height: 22rpx; + line-height: 32rpx; } .title-text,