From 5939ffa7b7d1cc6101b242af76bc2a66239bfdbc Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 16 Jul 2024 11:46:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/currentIncome.vue | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index 47bdff3..97a4ffe 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -2,21 +2,26 @@
 	<view class="content">
 		<view class="header">
 			<view class="header-top">
+				<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>
 				<view class="header-top-left">
-					<view>
+					<view style="margin-bottom: 10rpx;">
 						<span class="header-text"></image>当前周期</span>
 					</view>
 					<view>
 						<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
 					</view>
 				</view>
-				<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-bottom-money">{{shouyiMoeny}}</view>
+			<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期收益</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>
 		<t-refresh class="mian" ref="refresh"  v-if="listData.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0" >
@@ -347,10 +352,8 @@
 		padding: 1rpx 10rpx;
 	}
 	.header-top-left{
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
 		margin-top: -10rpx;
+		text-align: right;
 	}
 	.header-top{
 		width: 100%;
@@ -359,15 +362,16 @@
 		justify-content: space-between;
 	}
 	.header{
-		width: 100%;
-		height: 300rpx;
+		height: 280rpx;
 		padding: 15px;
-		background:#f7f7f7 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;
+		margin:0 26rpx;
+		border-radius: 24rpx;
 	}
 	.content{
 		width: 100%;

From 8c4917f335434a19bc9d9fe40c466d10b56afe34 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 16 Jul 2024 13:30:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/currentIncome.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index 97a4ffe..73118f2 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -53,7 +53,7 @@
 								服务地址 : {{item.address}}
 							</view>
 							<view class="mian-bottom">
-								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
+								<view class="shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
 									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
@@ -217,6 +217,7 @@
 		align-items: center;
 		justify-content: space-between;
 		margin-top: 8rpx;
+		font-size: ;
 	}
 	.mian-foot-adder{
 		margin: 3px 0px;
@@ -345,11 +346,9 @@
 	.header-text1{
 		font-weight: 400;
 		font-size: 24rpx;
-		color: #019c88;
+		color: #fff;
 		margin-right: 8rpx;
 		border-radius: 30rpx;
-		background: #fff;
-		padding: 1rpx 10rpx;
 	}
 	.header-top-left{
 		margin-top: -10rpx;