From 32526e5bddb7b14328b2467cd18783f480b33f3b Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 31 八月 2024 01:51:53 +0800
Subject: [PATCH] update合伙人

---
 pages/home/home.scss |  200 ++++++++++++++++++++++++++++++++------------------
 1 files changed, 128 insertions(+), 72 deletions(-)

diff --git a/pages/home/home.scss b/pages/home/home.scss
index 3c0ab36..0ebf45b 100644
--- a/pages/home/home.scss
+++ b/pages/home/home.scss
@@ -1,7 +1,7 @@
 
 .main-container{
-	// background-image: url('../../static/images/farmer/home/bg.png');
-	background: #E1F0E7;
+	// background-image: url('../../static/images/supplier/home/bg.png');
+	background-color: #E1F0E7;
 	// https://hmy-flower.oss-cn-shanghai.aliyuncs.com/2a/2aa62e6bd1f74456b005d3f57daa54adbg.png
 
 	.top-bg{
@@ -14,85 +14,77 @@
 	.home-banner-image{
 		width: 750rpx;
 		background-size: 100% 100%;
-		height: 472rpx;
+		height: 306rpx;
 		
 	}
 	swiper {
-		height: 472rpx;
+		height: 306rpx;
 	}
 	.swiper-box{
 		position: relative;
 		swiper-item{
 			background-color: #fff;
+			border-radius: 8rpx;
 		}
 	}
-	.home-shop-top{
-		position: relative;
-		// width: 690rpx;
-		height: 488rpx - 36rpx;
-		padding: 18rpx;
-		padding-top: 36rpx;
-		padding-bottom: 0rpx;
-		
-		background: linear-gradient(360deg, #DDECE4 0%, #B8D9C6 100%) #AEDCC7;
-		border-radius: 20rpx;
-		// padding: 1;
-		.title{
-			width: 164rpx;
-			height: 42rpx;
-			margin-bottom: 16rpx;
-		}
-		.icon{
-			position: absolute;
-			width: 114rpx;
-			height: 110rpx;
-			right: 48rpx;
-			top: 20rpx;
-			z-index: 1;
-		}
-		.card-list-item{
-			z-index: 2;
-		}
-	}
-	.home-travel-top{
-		position: relative;
-		// width: 690rpx;
-		min-height: 490rpx - 36rpx - 16rpx;
-		background: #A9DAEB;
-		border-radius: 20rpx;
-		padding: 18rpx;
-		padding-bottom: 16rpx;
-		padding-top: 36rpx;
-		.title{
-			width: 126rpx;
-			height: 40rpx;
-			margin-bottom: 16rpx;
-		}
-		.icon{
-			position: absolute;
-			width: 314rpx;
-			right: 60rpx;
-			top: 26rpx;
-			height:98rpx;
-			z-index: 0;
-			
-		}
-		/deep/ .card-list-item{
-			position: relative;
-			z-index: 2;
-		}
-	}
+
+	
 }
 
 
-
-.main-container.farmer.home{
-	// background-image: url('../../static/images/farmer/home/bg.png');
+.main-container.user-home{
+	min-height: 99vh;
+	padding: 30rpx;
+	background: #F7F7F7;
+	position: relative;
+	.bg-top-green{
+		height: 197px;
+		background: #CAE5D6;
+		position: absolute;
+		left: 0rpx;
+		right: 0rpx;
+		top: 0rpx;
+		z-index: 0;
+	}
+	.school{
+		position: relative;
+		z-index: 1;
+	}
+	.search-container {
+		display: flex;
+		margin: 12rpx 0rpx 20rpx 0rpx;
+		position: relative;
+		z-index: 1;
+	
+		.input {
+			// flex: 1;
+			// max-width: 400rpx;
+			background-color: #fff !important;
+			// line-height: 58rpx;
+			// height: 58rpx;
+			border-radius: 8rpx;
+		}
+	
+		.button {
+			min-width: 120rpx;
+			max-width: 120rpx;
+			margin-left: auto;
+			margin-right: 0rpx;
+			text-align: right;
+			line-height: 70rpx !important;
+			// height: 58rpx !important;
+			// display: flex;
+		}
+	}
+}
+.main-container.home{
+	background-image: url('https://hmy-flower.oss-cn-shanghai.aliyuncs.com/2a/2aa62e6bd1f74456b005d3f57daa54adbg.png');
 	min-height: 99vh;
 	padding: 30rpx;
 	.item-container{
 		padding: 22rpx 28rpx;
 		background-color: #fff;
+		border-radius: 8rpx;
 		.title{
 			font-weight: 600;
 			font-size: 32rpx;
@@ -175,16 +167,61 @@
 			}
 			.title{
 				margin-top: 12rpx;
-				
+				font-weight: 400;
 			}
 			
 		}
 		.tj-panel.pink{
 			background: #E7F6EB;
+			margin-left: auto;
+			
+			.title{
+				color: #20613D;
+				
+			}
 		}
 		.tj-panel.green{
 			background: #FDF4E5;
-			margin-left: auto;
+			
+			.title{
+				color: #936E32;
+				
+			}
+			
+		}
+	}
+	
+	.item-container.partner{
+		padding-bottom: 0rpx;
+		.tj-container{
+			.tj-each{
+				// width: fit-content;
+				flex: 1;
+				.num.total{
+					text-align: left;
+				}
+				.num.status{
+					font-size: 24rpx;
+					text-align: right;
+					// margin-left: auto;
+					// margin-right: 0rpx;
+					// display: inline-block;
+				}
+			}
+			.tj-each:first-child{
+				margin-left: 0rpx;
+				margin-right: auto;
+				flex: unset;
+			}
+			.tj-each:last-child{
+				margin-left: 0rpx;
+				margin-right: auto;
+				flex: unset;
+			}
+		}
+		.line{
+			margin-top: 0rpx;
+			margin-bottom: 0rpx;
 		}
 	}
 	.order-icon{
@@ -203,11 +240,18 @@
 			// margin-top: 24rpx;
 		}
 		.order-desc{
-			font-size: 28rpx;
+			font-size: 24rpx;
 			color: #000000;
 			text-align: center;
 			margin-top: 12rpx;
 		}
+		.order-desc.syst{
+			margin-top: 0rpx;
+		} 
+		.order-desc.wbsp{
+			margin-top: 0rpx;
+		}
+		
 		.img-c{
 			// min-height: 68rpx;
 			// width: fit-content;
@@ -219,10 +263,20 @@
 			// margin-left: auto;
 			// margin-right: auto;
 		}
+		.order-icon.ddgl{
+			margin-top: 8rpx;
+			width: 42rpx;
+			height: 52rpx;
+		}
+		.order-icon.jjpz{
+			margin-top: 8rpx;
+			width: 42rpx;
+			height: 52rpx;
+		}
 		.order-icon.zdjs{
-			// margin-top: -8rpx;
-			width: 54rpx;
-			height: 58rpx;
+			margin-top: 8rpx;
+			width: 42rpx;
+			height: 52rpx;
 		}
 		.order-icon.spgl{
 			margin-top: 6rpx;
@@ -231,18 +285,20 @@
 		}
 		.order-icon.shlp{
 			// margin-top: 16rpx;
-			margin-top: -1rpx;
+			margin-top: 10rpx;
 			width: 54rpx;
 			height: 58rpx;
+			
 		}
 		.order-icon.kkjl{
 			// margin-top: 12rpx;
 			// margin-top: 0rpx;
-			margin-top: -3rpx;
+			// margin-top: -3rpx;
+			margin-top: 10rpx;
 			width: 58rpx;
 			height: 58rpx;
 		}
 
 	}
 	
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3