From 0509850596b9d275bc49211af4c39b37d2983c7c Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 23 九月 2024 17:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
sub_pages/customer/coupon/coupon.scss | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/sub_pages/customer/coupon/coupon.scss b/sub_pages/customer/coupon/coupon.scss
index 09cf692..535cc84 100644
--- a/sub_pages/customer/coupon/coupon.scss
+++ b/sub_pages/customer/coupon/coupon.scss
@@ -3,8 +3,11 @@
.coupont-item.expired {
- filter: grayscale(100%);
+ filter: grayscale(95%);
.img-has {
+ display: unset;
+ }
+ .img-out {
display: unset;
}
}
@@ -18,10 +21,21 @@
position: absolute;
right: -20rpx;
top: 20rpx;
- background-image: url('../../../static/images/customer/coupon/coupon-has.png');
+ background-image: url('@/static/images/customer/coupon/coupon-has.png');
background-size: 100% 100%;
width: 264rpx;
height: 264rpx;
+ }
+ .img-out {
+ display: none;
+ position: absolute;
+ right: 10rpx;
+ top: -20rpx;
+ background-image: url('@/static/images/customer/coupon/coupon-out.png');
+ background-size: 100% 100%;
+ width: 196rpx;
+ height: 124rpx;
+
}
.tip {
@@ -40,12 +54,12 @@
.container {
z-index: 2;
- background-image: url('../../../static/images/customer/coupon/coupon-bg1.png');
+ background-image: url('@/static/images/customer/coupon/coupon-bg1.png');
// width: 722rpx;
padding: 16rpx 16rpx 16rpx 0rpx;
height: 220rpx;
position: relative;
-
+
.info-price {
width: 180rpx;
padding-top: 40rpx;
@@ -70,7 +84,7 @@
}
.info {
- padding-top: 40rpx;
+ padding-top: 30rpx;
.title {
font-weight: 600;
@@ -78,7 +92,12 @@
color: #333333;
line-height: 50rpx;
text-align: left;
-
+ position: relative;
+ .select-coupon{
+ position: absolute;
+ right: 10rpx;
+ top: -6rpx;
+ }
}
.time {
@@ -87,7 +106,7 @@
color: #666666;
line-height: 40rpx;
text-align: left;
- margin-top: 40rpx;
+ margin-top: 20rpx;
}
}
@@ -102,9 +121,18 @@
margin-top: 20rpx;
.container {
+
.info {
+
+ padding-top: 20rpx;
+ position: relative;
+ .title{
+
+ }
.time {
margin-top: 0rpx;
+ font-size:24rpx;
+ min-height: 44rpx;
}
.button {
@@ -118,7 +146,10 @@
color: rgba(68, 119, 90, 1);
line-height: 46rpx;
text-align: center;
- margin-top: 10rpx;
+ // margin-top: 10rpx;
+ position: absolute;
+ right: 10rpx;
+ bottom: 30rpx;
}
}
}
--
Gitblit v1.9.3