diff --git a/assets/css/reset.css b/assets/css/reset.css
index cb5b220..4b3d197 100644
--- a/assets/css/reset.css
+++ b/assets/css/reset.css
@@ -57,6 +57,6 @@ input {
right: 0;
bottom: 0;
z-index: 55;
- background: rgba(125, 125, 125, 0.25);
+ background: rgba(0, 0, 0, 0.6);
backdrop-filter: blur(10rpx);
}
diff --git a/assets/css/reset.less b/assets/css/reset.less
index 14fd16b..da13579 100644
--- a/assets/css/reset.less
+++ b/assets/css/reset.less
@@ -36,7 +36,7 @@ input{line-height: normal; box-sizing:border-box;}
}
.line1{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width: 100%;}
.line2{word-break:break-all;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;}
-.mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:55;background: rgba(125, 125, 125, .25);backdrop-filter: blur(10rpx);}
+.mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:55;background: rgba(0, 0, 0, .6);backdrop-filter: blur(10rpx);}
diff --git a/assets/css/style.css b/assets/css/style.css
index 9144277..935e12f 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -286,6 +286,7 @@ page {
position: absolute;
top: 0;
left: 0;
+ z-index: 0;
}
.coupon-list .item .coupon-left {
width: 498rpx;
@@ -297,35 +298,7 @@ page {
position: absolute;
top: 16rpx;
left: 26rpx;
- background: linear-gradient(135deg, #39D396 0%, #1B8DCC 100%);
- border-radius: -16rpx;
-}
-.coupon-list .item .left-bg .radiusLT {
- width: 50%;
- height: 50%;
- background-image: radial-gradient(16rpx at top left, #F5F6F8 16rpx, transparent);
-}
-.coupon-list .item .left-bg .radiusRT {
- width: 50%;
- height: 50%;
- background-image: radial-gradient(16rpx at top right, #F5F6F8 16rpx, transparent);
-}
-.coupon-list .item .left-bg .radiusLB {
- width: 50%;
- height: 50%;
- background-image: radial-gradient(16rpx at bottom left, #F5F6F8 16rpx, transparent);
-}
-.coupon-list .item .left-bg .radiusRB {
- width: 50%;
- height: 50%;
- background-image: radial-gradient(16rpx at bottom right, #F5F6F8 16rpx, transparent);
-}
-.coupon-list .item .coupon-left .coupon-pattern {
- width: 202rpx;
- height: 64rpx;
- position: absolute;
- top: 46rpx;
- right: 0rpx;
+ z-index: 1;
}
.coupon-list .item .coupon-left .text-box {
padding-top: 46rpx;
@@ -1598,6 +1571,38 @@ page {
width: 100% !important;
display: block !important;
}
+.product-con .entry-mask {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 20;
+ background: rgba(0, 0, 0, 0.6);
+ backdrop-filter: blur(10rpx);
+}
+.product-con .entry-mask .entry-box {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 30;
+ width: 592rpx;
+ height: 374rpx;
+ background: #F1F1F1;
+ box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
+ border-radius: 28rpx;
+ padding: 32rpx;
+}
+.product-con .entry-mask .entry-box .entry {
+ height: 100%;
+ overflow: scroll;
+ font-size: 26rpx;
+ font-family: SourceHanSansSCVF;
+ font-weight: 500;
+ color: #3A3A3C;
+ line-height: 38rpx;
+}
/*产品详情*/
.product-con .footer {
width: 100%;
diff --git a/assets/css/style.less b/assets/css/style.less
index 5db6b33..52cc150 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -453,7 +453,7 @@ page {
position: absolute;
top: 0;
left: 0;
- // z-index: -2;
+ z-index: 0;
}
.coupon-list .item .coupon-left {
@@ -468,37 +468,7 @@ page {
position: absolute;
top: 16rpx;
left: 26rpx;
- // z-index: -1;
- background: linear-gradient(135deg, #39D396 0%, #1B8DCC 100%);
- border-radius: -16rpx;
- .radiusLT {
- width: 50%;
- height: 50%;
- background-image: radial-gradient(16rpx at top left, #F5F6F8 16rpx, transparent);
- }
- .radiusRT {
- width: 50%;
- height: 50%;
- background-image: radial-gradient(16rpx at top right, #F5F6F8 16rpx, transparent);
- }
- .radiusLB {
- width: 50%;
- height: 50%;
- background-image: radial-gradient(16rpx at bottom left, #F5F6F8 16rpx, transparent);
- }
- .radiusRB {
- width: 50%;
- height: 50%;
- background-image: radial-gradient(16rpx at bottom right, #F5F6F8 16rpx, transparent);
- }
-}
-
-.coupon-list .item .coupon-left .coupon-pattern {
- width: 202rpx;
- height: 64rpx;
- position: absolute;
- top: 46rpx;
- right: 0rpx;
+ z-index: 1;
}
.coupon-list .item .coupon-left .text-box {
@@ -3135,6 +3105,42 @@ page {
display: block !important;
}
+.product-con .entry-mask {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 20;
+ background: rgba(0, 0, 0, 0.6);
+ // -webkit-backdrop-filter: blur(10rpx);
+ backdrop-filter: blur(10rpx);
+
+ .entry-box {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 30;
+ width: 592rpx;
+ height: 374rpx;
+ background: #F1F1F1;
+ box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
+ border-radius: 28rpx;
+ padding: 32rpx;
+
+ .entry {
+ height: 100%;
+ overflow: scroll;
+ font-size: 26rpx;
+ font-family: SourceHanSansSCVF;
+ font-weight: 500;
+ color: #3A3A3C;
+ line-height: 38rpx;
+ }
+ }
+}
+
/*产品详情*/
.product-con .footer {
width: 100%;
diff --git a/components/CouponListWindow.vue b/components/CouponListWindow.vue
index fa116f8..58f7c42 100644
--- a/components/CouponListWindow.vue
+++ b/components/CouponListWindow.vue
@@ -15,13 +15,7 @@
>
-
-
-
-
-
-
-
+
¥{{ coupon.couponPrice }}
@@ -85,10 +79,6 @@
top: -2rpx;
left: 16rpx;
}
- .coupon-pattern {
- top: 32rpx;
- right: 10rpx;
- }
.text-box {
padding-top: 28rpx;
padding-left: 32rpx;
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index 4b914e0..4eb12aa 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -1033,7 +1033,8 @@ export default {
text-align: center;
}
.money {
- font-size: 24rpx;
+ font-size: 22rpx;
+ // font-size: 24rpx;
font-family: PingFang SC;
font-weight: 600;
color: #3A3A3C;
diff --git a/pages/shop/Evaluations/EvaluationDetail/index.vue b/pages/shop/Evaluations/EvaluationDetail/index.vue
index 39bc64f..6282e91 100644
--- a/pages/shop/Evaluations/EvaluationDetail/index.vue
+++ b/pages/shop/Evaluations/EvaluationDetail/index.vue
@@ -122,7 +122,6 @@
分享
-->
-<<<<<<< HEAD
立即购买
@@ -138,7 +137,6 @@
id: 0,
info: {},
feelCurrent: 0,
-<<<<<<< HEAD
accessibilityCurrent: 0,
editableTabs:[],
tagStyle: {
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 9b414b4..28096ae 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -413,7 +413,7 @@
entryInfo: {},
showEntry: false,
tagStyle: {
- a: 'color:#2DB5AE;text-decoration:underline;',
+ a: 'color:#0A59F7;text-decoration:underline;',
// p: 'text-indent:2em;',
// span: 'padding: 0rpx 30rpx;text-indent:2em;text-align: justify;text-justify: auto;'
// span: 'padding: 0rpx 30rpx;display: inline-block;',
@@ -1314,42 +1314,6 @@
}
}
- .entry-mask {
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: 20;
- background: rgba(125, 125, 125, 0.25);
- -webkit-backdrop-filter: blur(10rpx);
- backdrop-filter: blur(10rpx);
-
- .entry-box {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- z-index: 30;
- width: 592rpx;
- height: 374rpx;
- background: #F1F1F1;
- box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
- border-radius: 28rpx;
- padding: 32rpx;
-
- .entry {
- height: 100%;
- overflow: scroll;
- font-size: 26rpx;
- font-family: SourceHanSansSCVF;
- font-weight: 500;
- color: #3A3A3C;
- line-height: 38rpx;
- }
- }
- }
-
// .product-con .store-info {
// margin-top: 0.2 * 100rpx;
// background-color: #fff;
diff --git a/pages/shop/IntegralGoodsCon/index.vue b/pages/shop/IntegralGoodsCon/index.vue
index b4a7085..1c7e4fc 100644
--- a/pages/shop/IntegralGoodsCon/index.vue
+++ b/pages/shop/IntegralGoodsCon/index.vue
@@ -182,7 +182,7 @@ export default {
tempName: '全国包邮',
isIntegral: true,
tagStyle: {
- a: 'color:#2DB5AE;text-decoration:underline;',
+ a: 'color:#0A59F7;text-decoration:underline;',
// p: 'text-indent:2em;',
// span: 'padding: 0rpx 32rpx !important;display: inline-block;',
img: 'padding:0;margin:0;font-size:0;display:block;'
@@ -743,42 +743,6 @@ export default {
margin-left: 8rpx;
}
- .entry-mask {
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: 20;
- background: rgba(125, 125, 125, 0.25);
- -webkit-backdrop-filter: blur(10rpx);
- backdrop-filter: blur(10rpx);
-
- .entry-box {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- z-index: 30;
- width: 592rpx;
- height: 374rpx;
- background: #F1F1F1;
- box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
- border-radius: 28rpx;
- padding: 32rpx;
-
- .entry {
- height: 100%;
- overflow: scroll;
- font-size: 26rpx;
- font-family: SourceHanSansSCVF;
- font-weight: 500;
- color: #3A3A3C;
- line-height: 38rpx;
- }
- }
- }
-
.geoPage {
position: fixed;
width: 100%;
diff --git a/pages/user/coupon/GetCoupon/index.vue b/pages/user/coupon/GetCoupon/index.vue
index 82574fa..bf74a19 100644
--- a/pages/user/coupon/GetCoupon/index.vue
+++ b/pages/user/coupon/GetCoupon/index.vue
@@ -33,13 +33,7 @@
-
-
-
-
-
-
-
+
¥{{ item.couponPrice }}
diff --git a/pages/user/coupon/UserCoupon/index.vue b/pages/user/coupon/UserCoupon/index.vue
index b6c0883..d8a648d 100644
--- a/pages/user/coupon/UserCoupon/index.vue
+++ b/pages/user/coupon/UserCoupon/index.vue
@@ -32,14 +32,8 @@
-
-
-
-
-
-
-
+
+
¥{{ item.couponPrice }}
diff --git a/static/images/ceping.png b/static/images/ceping.png
deleted file mode 100644
index 646a047..0000000
Binary files a/static/images/ceping.png and /dev/null differ
diff --git a/static/images/coupon-bg2.png b/static/images/coupon-bg2.png
new file mode 100644
index 0000000..a96d2c4
Binary files /dev/null and b/static/images/coupon-bg2.png differ
diff --git a/static/images/coupon-bg3.png b/static/images/coupon-bg3.png
new file mode 100644
index 0000000..64844fb
Binary files /dev/null and b/static/images/coupon-bg3.png differ
diff --git a/static/images/coupon-pattern.png b/static/images/coupon-pattern.png
deleted file mode 100644
index 01edafe..0000000
Binary files a/static/images/coupon-pattern.png and /dev/null differ
diff --git a/uni.scss b/uni.scss
index a79e2f6..98422a8 100644
--- a/uni.scss
+++ b/uni.scss
@@ -31,7 +31,7 @@ $uni-text-color-disable:#c0c0c0;
$uni-bg-color:#ffffff;
$uni-bg-color-grey:#f8f8f8;
$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.6);//遮罩颜色
/* 边框颜色 */
$uni-border-color:#c8c7cc;