From edca85ed1ed29a178b9472476e98d4350dadcff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 2 Sep 2024 12:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9C=9F=E4=B8=9A=E7=BB=A9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/currentYeji.vue  |   2 +-
 pages/index/previousYeji.vue | 119 +++++++++++++++++++++++++----------
 2 files changed, 88 insertions(+), 33 deletions(-)

diff --git a/pages/index/currentYeji.vue b/pages/index/currentYeji.vue
index ea6d0ac..6a0081d 100644
--- a/pages/index/currentYeji.vue
+++ b/pages/index/currentYeji.vue
@@ -221,7 +221,7 @@
 			wangqi(){//往期收益 跳页
 				// this.wqsyshow = true;
 				uni.navigateTo({
-					url:'/pages/index/previousEarnings?orderType=4'
+					url:'/pages/index/previousYeji?orderType=4'
 				})
 			},
 		}
diff --git a/pages/index/previousYeji.vue b/pages/index/previousYeji.vue
index 7adb4f3..b905c8d 100644
--- a/pages/index/previousYeji.vue
+++ b/pages/index/previousYeji.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="header">
+		<!-- <view class="header">
 			<view class="header-top">
 				<view class="header-top-left">
 					<image src="../../static/index/dangqian1.png" mode=""></image>
@@ -13,6 +13,38 @@
 				<view class="header-bottom-money">{{shouyiMoeny}}</view>
 				<view class="header-text">当前收益</view>
 			</view>
+		</view> -->
+		<view class="header">
+			<view class="header-top">
+				<view class="header-bottom" >
+					<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse4.png"></image>
+					<view>
+						<view class="header-text" style=" margin-top: -5px;">当前业绩</view>
+						<view class="header-bottom-money">{{shouyiMoeny}}</view>
+					</view>
+				</view>
+				<view class="header-top-left">
+					<view style="margin-bottom: 10rpx;">
+						<span class="header-text"></image>当前周期</span>
+					</view>
+					<view>
+						<span class="header-text1">{{startTime}}</span>
+						<span style="color: #029d88; margin-right: 5rpx;">~</span>
+						<span class="header-text1">{{endTime}}</span>
+					</view>
+				</view>
+				<!-- 性别选择 -->
+				<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
+			</view>
+			<view class="flex justify-end">
+				<view  class="header-top-btn"  @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期业绩</view>
+			</view>
+			<!--<view class="header-bottom" style="margin-bottom: 40rpx;">
+				<view class="header-text" style=" margin-top: -5px;">当前收益</view>
+				<view class="header-bottom-money">{{shouyiMoeny}}</view>
+			</view>
+			 性别选择 -->
+			<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
 		</view>
 		<!-- 往期时间选择 -->
 		<u-action-sheet :list="wqlistData"  v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
@@ -35,7 +67,7 @@
 								<view class="mian-title">{{item.entryName}}</view>
 								<view class="mian-dingwei">
 									<image src="../../static/index/dangqian2.png" mode=""></image>
-									<span class="shouyi-text">0.8km</span>
+									<span class="shouyi-text">{{item.km}}km</span>
 								</view>
 							</view>
 							<view class="mian-foot-dan shouyi-text">
@@ -45,10 +77,10 @@
 								服务地址 : {{item.address}}
 							</view>
 							<view class="mian-bottom">
-								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
+								<view class="mian-bottom-xiang shouyi-text">项目金额 :<span>￥{{item.priceTotal}}</span></view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 								</view>
 							</view>
 						</view>
@@ -177,18 +209,25 @@
 		/* background-color: #f7f7f7; */
 	}
 	/deep/.refresh-body{
-		height: 100% !important;
+		height:640px !important;
 		border-top: 2px solid #f7f7f7;
 	}
+	.content{
+		width: 100%;
+		/* height: 100vh; */
+		background-color: #f7f7f7;
+		overflow: hidden;
+	}
 	.mian-bottom{
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+		margin-top: 8rpx;
 	}
 	.mian-foot-adder{
-		margin: 2px 0px;
+		margin: 3px 0px;
 	}
 	.mian-dingwei image{
 		width: 18.75rpx;
@@ -214,19 +253,20 @@
 		margin-bottom: 5px;
 	}
 	.mian-foot-list{
-		width: 75%;
+		width: 73%;
 		display: flex;
 		flex-direction: column;
 	}
 	.mian-foot-img image{
 		width: 100%;
 		height: 100%;
+		border-radius: 20rpx;
 	}
 	.mian-foot-img{
-		width: 158rpx;
-		height: 188rpx;
+		width: 160rpx;
+		height: 160rpx;
 		background: #E6E6E6;
-		border-radius: 14rpx;
+		border-radius: 30rpx;
 	}
 	
 	.mian-foot{
@@ -238,7 +278,7 @@
 	}
 	.shouyi-text{
 		color: #7D7D7D;
-		font-size: 22rpx;
+		font-size: 26rpx;
 	}
 	.mian-head-time span:nth-child(2){
 		color: #11957C;
@@ -249,7 +289,7 @@
 		flex-direction: row;
 		align-items: center;
 		font-weight: 400;
-		font-size: 25rpx;
+		font-size: 26rpx;
 	}
 	.mian-head-biao{
 		width: 130rpx;
@@ -275,11 +315,11 @@
 	.mian-view{
 		width: 95%;
 		background-color: #fff;
-		padding: 10px;
+		padding: 12px;
 		border-radius: 24rpx;
 		display: flex;
 		flex-direction: column;
-		margin-top: 10px;
+		margin: 26rpx auto;
 	}
 	.mian{
 		width: 100%;
@@ -287,27 +327,38 @@
 		flex-direction: column;
 		align-items: center;
 	}
+	.header-bottom{
+		display: flex;
+		align-items: end;
+	}
 	.header-bottom-money{
 		font-weight: bold;
 		font-size: 49rpx;
-		color: #FFFFFF;
+		color: #00b198;
 		margin-bottom: 3px;
 	}
 	.header-top-btn{
 		width: 174rpx;
 		height: 49rpx;
-		line-height: 49rpx;
+		line-height: 46rpx;
 		text-align: center;
-		font-size: 21rpx;
-		color: #333333;
-		background: #FFFFFF;
+		font-size: 26rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
 		border-radius: 24rpx;
+		color: #fff;
 	}
 	.header-text{
 		font-weight: 400;
-		font-size: 22rpx;
-		color: #FFFFFF;
-		margin-top: 2px;
+		font-size: 26rpx;
+		color: #00b198;
+		margin-right: 8rpx;
+	}
+	.header-text1{
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #00b198;
+		margin-right: 8rpx;
+		border-radius: 30rpx;
 	}
 	.header-top-left image{
 		width: 24.31rpx;
@@ -316,9 +367,8 @@
 		margin-top: 3px;
 	}
 	.header-top-left{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
+		margin-top:20rpx;
+		text-align: right;
 	}
 	.header-top{
 		width: 100%;
@@ -328,18 +378,23 @@
 	}
 	.header{
 		width: 100%;
-		height: 300rpx;
+		height: 280rpx;
 		padding: 15px;
-		background-image: url('../../static/index/fun_banner4.png');
+		background:#f7f7f7 url('../../static/index/technician15.png');
 		background-repeat: no-repeat;
-		background-size: 100% 100%;
+		background-size: 100%;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-around;
+		/*border-radius: 24rpx;*/
 	}
-	.content{
-		width: 100%;
-		height: 100vh;
-		background-color: #f7f7f7;
+	
+	.od-number{
+		font-size: 24rpx;
+		color: #7ea866;
+	}
+	.add-text{
+		font-size: 26rpx;
+		color: #999;
 	}
 </style>
\ No newline at end of file