From 2d5090c2b215a5ea7e489d4b50fbf30aae569324 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 26 七月 2024 15:03:01 +0800
Subject: [PATCH] fix bug 接口对接和样式调整

---
 common/self.scss |  108 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/common/self.scss b/common/self.scss
index d99fa0b..e5be877 100644
--- a/common/self.scss
+++ b/common/self.scss
@@ -1,5 +1,5 @@
 /* $self-gray: #9a9da2; */
-:root {
+:root,page {
 	--selfgray: #9a9da2;
 	--self_light_gray: #dce3e9;
 	--title_font_size: 60rpx;
@@ -13,15 +13,24 @@
 	--topicgray: #999999;
 	--topicdarkgray: #936E32;
 }
+$u-main-color: #20613D;
+$main-color: #20613D;
+$u-primary: #20613D;
 body{
 	--tcolor: #3140A2;
 	font-family: PingFangSC-Regular, PingFang SC;
 }
 .topic-font{
-	color: var(--topicolor);
+	color: var(--topicolor) !important;
+}
+.flex-wrap-normal{
+	flex-wrap: nowrap !important;
 }
 .topic-gray{
 	color: var(--topicgray);
+}
+.relative{
+	position: relative;
 }
 .t-red{
 	color: #CE3C39 !important;
@@ -94,6 +103,9 @@
 
 .bg-white {
 	background-color: #FFFFFF;
+}
+.br-4{
+	border-radius: 8rpx;
 }
 
 .bg-app-white {
@@ -168,7 +180,13 @@
 .m-l-40 {
 	margin-left: 80rpx;
 }
-
+.m-l-5{
+	margin-left: 10rpx;
+}
+.m-l-12{
+	margin-left: 24rpx;
+	
+}
 .m-r-a {
 	margin-right: auto;
 }
@@ -186,7 +204,9 @@
 	margin-right: 4rpx;
 
 }
-
+.m-r-5{
+	margin-right: 10rpx;
+}
 .m-r-10 {
 	margin-right: 20rpx;
 
@@ -220,7 +240,9 @@
 .m-r-80 {
 	margin-right: 160rpx;
 }
-
+.m-b-12{
+	margin-bottom: 24rpx;
+}
 .m-b-20 {
 	margin-bottom: 40rpx;
 }
@@ -472,7 +494,10 @@
 .el-icon-arrow-down {
 	font-size: 12px;
 }
-
+.icon-arrow-down {
+	width: 24rpx;
+	height: 24rpx;
+}
 .app-tips {}
 
 .app-tips .app-tip {
@@ -522,7 +547,7 @@
 .button-green-1{
 	height: 80rpx;
 	
-	background: #04BA97;
+	background: var(--topicolor);
 	border-radius: 44rpx;
 	line-height: 80rpx;
 	text-align: center;
@@ -531,7 +556,7 @@
 }
 .button-green-border{
 	height: 80rpx;
-	border: 1px solid  #04BA97;
+	border: 1px solid  var(--topicolor);
 	border-radius: 44rpx;
 	line-height: 80rpx;
 	text-align: center;
@@ -640,6 +665,7 @@
 	bottom: 60rpx;
 	left: 40rpx;
 	right: 40rpx;
+	z-index: 1;
 }
 
 .close-parent{
@@ -662,10 +688,11 @@
 
 .uni-noticebar{
 	border-radius: 10rpx;
-	height: 68rpx;
+	height: 82rpx;
 	.self-uni-notice-bar-icon-left{
-		width: 58rpx;
-		height: 52rpx;
+		width: 38rpx;
+		height: 38rpx;
+		margin-right: 16rpx;
 	}
 	.self-uni-notice-bar-icon{
 		width: 16rpx;
@@ -676,7 +703,7 @@
 .button-green{
 	width: 302rpx;
 	height: 80rpx;
-	background: #04BA97;
+	background: var(--topicolor);
 	border-radius: 62rpx;
 	
 	font-size: 32rpx;
@@ -727,6 +754,7 @@
 		line-height:36rpx;
 		padding-top:30rpx;
 		padding-bottom:30rpx;
+		position: relative;
 		.require::before{
 			content:'*';
 			color:red;
@@ -870,11 +898,45 @@
 	}
 
 	.store-name {
+		font-weight: 600;
+		font-size: 28rpx;
+		color: #000000;
+		line-height: 40rpx;
+	}
+	.store-address{
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #666666;
+		line-height: 34rpx;
+	}
+	.store-to{
+		width: 172rpx;
+		height: 52rpx;
+		background: #E1F0E7;
+		border-radius: 4rpx;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #5B8C71;
+		line-height: 52rpx;
+		text-align: center;
+	}
+	.store-sc{
+		width: 176rpx;
+		height: 64rpx;
+		background: #39AF6E;
+		border-radius: 32rpx;
 		font-weight: 400;
 		font-size: 32rpx;
-		color: #000000;
-		line-height: 96rpx;
+		color: #FFFFFF;
+		line-height: 64rpx;
+		.icon{
+			width: 36rpx;
+			height: 36rpx;
+		}
 	}
+}
+.text-left{
+	text-align: left;
 }
 .img100{
 	background-size: 100% 100%;
@@ -942,9 +1004,21 @@
 	}
 
 
-.before-line::before{
-	border-top: 2rpx solid #EEEEEE;
-}
+
 .img100{
 	background-size: 100% 100%;
+}
+uni-image>img{
+	opacity: 1 !important;
+}
+.component-radio{
+	width: 26rpx;
+	height: 26rpx;
+	min-width: 26rpx;
+	min-height: 26rpx;
+	border-radius: 50%;
+	border: 2rpx solid #20613D;
+	&.cur{
+		background-color:#20613D;
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.3