Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-09-12 fb48777cd4c3f086f77b5b26e1d03aebf995f4f5

 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,7 +54,7 @@

         .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;