diff --git a/common/css/page.css b/common/css/page.css index 98fb34d0..85913c98 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -557,6 +557,9 @@ button:before { .cr-blue { color: #2196F3 !important; } +.cr-blue-dark { + color: #B3BFCB !important; +} /** * 统一背景色 @@ -1356,4 +1359,10 @@ button[disabled].bg-grey { /* #ifndef H5 */ padding-top: calc(var(--status-bar-height) + 10rpx); /* #endif */ +} + +/* 富文本 */ +.diy-rich-text * { + max-width: 100%; + /* width: 100%; */ } \ No newline at end of file diff --git a/components/diy/coupon.vue b/components/diy/coupon.vue index 6bf8e03e..9010dc34 100644 --- a/components/diy/coupon.vue +++ b/components/diy/coupon.vue @@ -363,8 +363,8 @@ .item { flex-basis: auto; flex-shrink: 0; - width: 180rpx; - height: 180rpx; + width: 168rpx; + height: 168rpx; border-radius: 20rpx; margin-top: 20rpx; @@ -411,7 +411,7 @@ font-size: 18rpx; border-radius: 46rpx; position: relative; - top: -4rpx; + top: -10rpx; } } } @@ -803,14 +803,13 @@ .coupon-theme-6 { display: flex; - .item { flex-basis: auto; flex-shrink: 0; border-radius: 24rpx; padding: 12rpx; - width: 280rpx; - height: 200rpx; + width: 268rpx; + height: 188rpx; position: relative; box-sizing: border-box; @@ -876,12 +875,12 @@ } .bottom { - margin-top: 12rpx; + margin-top: 8rpx; text-align: center; .coupon-btn { position: relative; - font-size: 32rpx; + font-size: 28rpx; line-height: 44rpx; font-weight: 500; text-align: center; diff --git a/components/diy/float-window.vue b/components/diy/float-window.vue index ca508fcd..6be9a6b3 100644 --- a/components/diy/float-window.vue +++ b/components/diy/float-window.vue @@ -74,7 +74,7 @@ const { windowWidth, windowHeight } = uni.getSystemInfoSync(); let x = display_location == 'left' ? 10 : windowWidth - 60; // 计算出距离顶部的距离 - const y = Math.ceil(windowHeight * (1 - Number(offset_number_percentage))); + const y = Math.ceil(windowHeight * (1 - Number(offset_number_percentage)) - 20); this.setData({ content_style: float_style == 'shadow' ? `box-shadow: 0 0 40rpx ${float_style_color};border-radius: 50%;` : `background-color: ${float_style_color};border-radius: 50%;`, x: x, diff --git a/components/diy/header.vue b/components/diy/header.vue index 93220eee..9b59f9fd 100644 --- a/components/diy/header.vue +++ b/components/diy/header.vue @@ -12,7 +12,7 @@ - + diff --git a/components/diy/rich-text.vue b/components/diy/rich-text.vue index 4c53268b..2d282520 100644 --- a/components/diy/rich-text.vue +++ b/components/diy/rich-text.vue @@ -1,6 +1,6 @@