Loki
/
zsw-farm-bxg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

券左边样式显示问题;富文本a链接颜色、遮罩层颜色修改;

home_hotList
whyneedname 2 years ago
parent
66ecdc3bc9
commit
ca6dd16c1e
16 changed files with 83 additions and 167 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      assets/css/reset.css
  2. 2
      assets/css/reset.less
  3. 63
      assets/css/style.css
  4. 70
      assets/css/style.less
  5. 12
      components/CouponListWindow.vue
  6. 3
      pages/activity/DargainDetails/index.vue
  7. 2
      pages/shop/Evaluations/EvaluationDetail/index.vue
  8. 38
      pages/shop/GoodsCon/index.vue
  9. 38
      pages/shop/IntegralGoodsCon/index.vue
  10. 8
      pages/user/coupon/GetCoupon/index.vue
  11. 10
      pages/user/coupon/UserCoupon/index.vue
  12. BIN
      static/images/ceping.png
  13. BIN
      static/images/coupon-bg2.png
  14. BIN
      static/images/coupon-bg3.png
  15. BIN
      static/images/coupon-pattern.png
  16. 2
      uni.scss

2
assets/css/reset.css
Unescape View File

@ -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);
}

2
assets/css/reset.less
Unescape View File

@ -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);}

63
assets/css/style.css
Unescape View File

@ -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%;

70
assets/css/style.less
Unescape View File

@ -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%;

12
components/CouponListWindow.vue
Unescape View File

@ -15,13 +15,7 @@
>
<image class="coupon-bg" src="@/static/images/coupon-bg.png" mode=""></image>
<view class="coupon-left">
<view class="left-bg acea-row">
<view class="radiusLT"></view>
<view class="radiusRT"></view>
<view class="radiusLB"></view>
<view class="radiusRB"></view>
</view>
<image class="coupon-pattern" src="@/static/images/coupon-pattern.png" mode=""></image>
<image class="left-bg" src="@/static/images/coupon-bg2.png" mode=""></image>
<view class="text-box">
<view class="money">¥{{ coupon.couponPrice }}</view>
<!-- <view class="money">7<text>折</text></view> -->
@ -85,10 +79,6 @@
top: -2rpx;
left: 16rpx;
}
.coupon-pattern {
top: 32rpx;
right: 10rpx;
}
.text-box {
padding-top: 28rpx;
padding-left: 32rpx;

3
pages/activity/DargainDetails/index.vue
Unescape View File

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

2
pages/shop/Evaluations/EvaluationDetail/index.vue
Unescape View File

@ -122,7 +122,6 @@
<view class="">分享</view>
</view> -->
</view>
<<<<<<< HEAD
<view class="btn" @click="goGoodsDetail">立即购买</view>
</view>
</view>
@ -138,7 +137,6 @@
id: 0,
info: {},
feelCurrent: 0,
<<<<<<< HEAD
accessibilityCurrent: 0,
editableTabs:[],
tagStyle: {

38
pages/shop/GoodsCon/index.vue
Unescape View File

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

38
pages/shop/IntegralGoodsCon/index.vue
Unescape View File

@ -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%;

8
pages/user/coupon/GetCoupon/index.vue
Unescape View File

@ -33,13 +33,7 @@
<view class="item acea-row row-between" v-cloak v-for="(item, index) in couponsList" :key="index">
<image class="coupon-bg" src="@/static/images/coupon-bg.png" mode=""></image>
<view class="coupon-left">
<view class="left-bg acea-row">
<view class="radiusLT"></view>
<view class="radiusRT"></view>
<view class="radiusLB"></view>
<view class="radiusRB"></view>
</view>
<image class="coupon-pattern" src="@/static/images/coupon-pattern.png" mode=""></image>
<image class="left-bg" src="@/static/images/coupon-bg2.png" mode=""></image>
<view class="text-box">
<view class="money">¥{{ item.couponPrice }}</view>
<!-- <view class="money">7<text>折</text></view> -->

10
pages/user/coupon/UserCoupon/index.vue
Unescape View File

@ -32,14 +32,8 @@
<view class="item acea-row row-between" v-cloak v-for="(item, index) in couponsList" :key="index">
<image class="coupon-bg" src="@/static/images/coupon-bg.png" mode=""></image>
<view class="coupon-left">
<view class="left-bg acea-row"
:style="item._msg == '已过期'?'background: linear-gradient(135deg, #D4D4D4 0%, #B4B4B4 100%);':''">
<view class="radiusLT"></view>
<view class="radiusRT"></view>
<view class="radiusLB"></view>
<view class="radiusRB"></view>
</view>
<image class="coupon-pattern" src="@/static/images/coupon-pattern.png" mode=""></image>
<image v-if="item._msg == '已过期'" class="left-bg" src="@/static/images/coupon-bg3.png" mode=""></image>
<image v-else class="left-bg" src="@/static/images/coupon-bg2.png" mode=""></image>
<view class="text-box">
<view class="money">¥{{ item.couponPrice }}</view>
<!-- <view class="money">7<text>折</text></view> -->

BIN
static/images/ceping.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
static/images/coupon-bg2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
static/images/coupon-bg3.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
static/images/coupon-pattern.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 558 B

2
uni.scss
Unescape View File

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

Write Preview
Loading…
Cancel
Save