From 2ddf143b4b497508b528b3a7bd766f628e9a2c26 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 08 九月 2024 18:55:20 +0800
Subject: [PATCH] Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into v2
---
common/global.scss | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 100 insertions(+), 8 deletions(-)
diff --git a/common/global.scss b/common/global.scss
index ca95a4d..2cddd3b 100644
--- a/common/global.scss
+++ b/common/global.scss
@@ -72,18 +72,20 @@
height: 100;
height: 100%;
z-index: -1;
+ background-size: 100% 100%;
}
.component-popup_input_all{
margin: 0 auto;
margin-top: 160rpx;
height: calc(100vh - 300rpx);
+ overflow-y: scroll;
background-color: #fff;
border-radius: 40rpx 40rpx 0rpx 0rpx;
padding: 26rpx;
position: relative;
.button-space{
// border: 2rpx solid #EEEEEE;
- min-height: 124rpx;
+ min-height: 160rpx;
}
.value-items{
@@ -99,10 +101,10 @@
font-weight: 400;
font-size: 28rpx;
line-height: 58rpx;
- padding: 8rpx 30rpx;
+ padding: 8rpx 24rpx;
color: #33a868;
- margin-left: 13rpx;
- margin-right: 13rpx;
+ margin-left: 6rpx;
+ margin-right: 6rpx;
border: 2rpx solid #F1F5F2;
}
.value-item.cur{
@@ -116,8 +118,8 @@
.button-green{
border-top: 2rpx solid #EEEEEE;
- position: absolute;
- bottom: 26rpx;
+ position: fixed;
+ bottom: 80rpx;
left: 26rpx;
right: 26rpx;
height: 78rpx;
@@ -135,6 +137,89 @@
color: #20613D;
line-height: 78rpx;
}
+}
+.component-button-contact{
+ background: none;
+ border: none;
+ box-sizing: 0px;
+ outline: none;
+ border-inline: none;
+ // margin-top: 0px;
+ display: flex;
+ margin-left: 0rpx;
+ margin-right: auto;
+ font-size: 30rpx;
+ flex: 1;
+ padding-left: 0rpx;
+ padding-right: 0rpx;
+ line-height: 40rpx;
+}
+.component-buttons{
+ display: flex;
+ margin-left: auto;
+ width: fit-content;
+
+ .button {
+ // width: 216rpx;
+ padding: 10rpx 20rpx;
+ line-height: 34rpx;
+ font-size: 24rpx;
+ height: 34rpx;
+ background: #20613D;
+ text-align: center;
+ border-radius: 30rpx;
+ min-width: 80rpx;
+
+ }
+
+ .button-1 {
+ padding: 10rpx 20rpx;
+ line-height: 34rpx;
+ font-size: 24rpx;
+ height: 34rpx;
+ background: #20613D;
+ text-align: center;
+ border-radius: 30rpx;
+ min-width: 80rpx;
+ background: #fff;
+ color: #333;
+ border: 2rpx solid #333;
+
+ }
+
+ .button-0 {
+ padding: 10rpx 20rpx;
+ line-height: 34rpx;
+ font-size: 24rpx;
+ height: 34rpx;
+ background: #20613D;
+ text-align: center;
+ border-radius: 30rpx;
+ min-width: 80rpx;
+ color: #fff;
+ border: 2rpx solid #20613D;
+ }
+}
+.component-button-contact::after{
+ display: none !important;
+}
+.component-stock-zero::after{
+ position: absolute;
+ line-height: 100%;
+ // font-size: ;
+ left: -2rpx;
+ right: -2rpx;
+ top: -2rpx;
+ bottom: -2rpx;
+ font-size: 600;
+ content: '已售罄';
+ color: #fff;
+ text-align: center;
+ padding-top: calc(50% - 20rpx);
+ background-color: #52525275;
+}
+.component-stock-zero{
+ position: relative;
}
.component-popup_input{
margin: 0 auto;
@@ -226,8 +311,8 @@
.curnums {
line-height: 60rpx;
- margin-left: 12rpx;
- margin-right: 12rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
}
}
}
@@ -278,3 +363,10 @@
}
+
+
+.u-steps-item{
+ /deep/ .u-text__value{
+ font-size: 28rpx !important;
+ }
+}
--
Gitblit v1.9.3