From 3e61d39ff889932bf9382ac5f97b281fbeafb14b Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 17:30:46 +0800
Subject: [PATCH] =?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/addClock.vue          | 64 +++++++++++------------
 pages/index/currentIncome.vue     |  4 +-
 pages/index/previousAdditions.vue | 86 ++++++++++++++++---------------
 3 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index 42c9ad5..edb4698 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -2,6 +2,13 @@
 	<view class="content clock-padding">
 		<view class="header">
 			<view class="header-top">
+				<view class="flex">
+					<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse3.png"></image>
+					<view class="header-bottom">
+						<view class="header-text">{{titleData}}</view>
+						<view class="header-bottom-money">{{earnings}}</view>
+					</view>
+				</view>
 				<view class="header-top-left">
 					<view>
 						<span class="header-text"></image>当前周期</span>
@@ -10,13 +17,9 @@
 						<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">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
 			</view>
-			<view class="header-bottom" style="margin-bottom: 40rpx;">
-				<view class="header-bottom-money">
-					{{earnings}}
-				</view>
-				<view class="header-text">{{titleData}}</view>
+			<view class="flex justify-end">
+			<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
 			</view>
 		</view>
 		<view class="tapNav-list">
@@ -298,8 +301,8 @@
 		margin-bottom: 10px;
 	}
 	.tapNav-list{
-		width: 94%;
-		margin: 8rpx auto;
+		background: #fff;
+		width:100%;
 		display: flex;
 		flex-direction:row;
 		align-items: center;
@@ -486,70 +489,65 @@
 		flex-direction: column;
 	}
 	.header-bottom-money{
-		font-weight: bold;
-		font-size: 49rpx;
-		color: #FFFFFF;
+			font-weight: bold;
+			font-size: 49rpx;
+			color: #00b198;
+			margin-bottom: 3px;
+		}
+	.header-bottom{
+		align-items: end;
 	}
 	.header-top-btn{
 		width: 174rpx;
 		height: 49rpx;
-		line-height: 49rpx;
+		line-height: 46rpx;
 		text-align: center;
 		font-size: 26rpx;
-		color: #333333;
-		background: #FFFFFF;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
 		border-radius: 24rpx;
+		color: #fff;	
 	}
 	.header-text{
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #FFFFFF;
+		color: #00b198;
 		margin-right: 8rpx;
 	}
 	.header-text1{
 		font-weight: 400;
 		font-size: 24rpx;
-		color: #019c88;
+		color: #00b198;
 		margin-right: 8rpx;
 		border-radius: 30rpx;
-		background: #fff;
-		padding: 1rpx 10rpx;
-	}
-	.header-top-left image{
-		width: 24.31rpx;
-		height:22.92rpx;
-		margin-right: 2px;
-		margin-top: 3px;
 	}
 	.header-top-left{
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
+		margin-top:10rpx;
+		text-align: right;
 	}
 	.header-top{
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
-		margin-bottom: 10px;
 	}
 	.header{
 		width: 100%;
-		height: 300rpx;
+		height: 280rpx;
 		padding: 15px;
-		background:#f5f5f5 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%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		height: 100vh;
+		/*height: 100vh;*/
 		background-color: #f7f7f7;
 		overflow: scroll;
 	}
diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index 8bbfc23..1a06865 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -5,8 +5,8 @@
 				<view class="header-bottom" >
 					<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse3.png"></image>
 					<view>
-					<view class="header-text" style=" margin-top: -5px;">当前收益</view>
-					<view class="header-bottom-money">{{shouyiMoeny}}</view>
+						<view class="header-text" style=" margin-top: -5px;">当前收益</view>
+						<view class="header-bottom-money">{{shouyiMoeny}}</view>
 					</view>
 				</view>
 				<view class="header-top-left">
diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue
index 8597c1e..8a5f131 100644
--- a/pages/index/previousAdditions.vue
+++ b/pages/index/previousAdditions.vue
@@ -2,6 +2,15 @@
 	<view class="content">
 		<view class="header">
 			<view class="header-top">
+				<view class="flex">
+					<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse3.png"></image>
+					<view class="header-bottom">
+						<view class="header-text">{{titleData}}</view>
+						<view class="header-bottom-money">
+							{{earnings}}
+						</view>
+					</view>
+				</view>
 				<view class="header-top-left">
 					<view>
 						<span class="header-text"></image>当前周期</span>
@@ -10,16 +19,13 @@
 						<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
 					</view>
 				</view>
+				
+			</view>
+			<view class="flex justify-end">
 				<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
 			</view>
-			<view class="header-bottom" style="margin-bottom: 40rpx;">
-				<view class="header-bottom-money">
-					{{earnings}}
-				</view>
-				<view class="header-text">{{titleData}}</view>
-			</view>
+			
 		</view>
-		
 		<!-- 往期时间选择 -->
 		<u-action-sheet :list="wqlistData"  v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
 		
@@ -494,70 +500,66 @@
 		flex-direction: column;
 	}
 	.header-bottom-money{
-		font-weight: bold;
-		font-size: 49rpx;
-		color: #FFFFFF;
+			font-weight: bold;
+			font-size: 49rpx;
+			color: #00b198;
+			margin-bottom: 3px;
+		}
+	.header-bottom{
+		align-items: end;
 	}
 	.header-top-btn{
 		width: 174rpx;
 		height: 49rpx;
-		line-height: 49rpx;
+		line-height: 46rpx;
 		text-align: center;
 		font-size: 26rpx;
-		color: #333333;
-		background: #FFFFFF;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
 		border-radius: 24rpx;
+		color: #fff;	
 	}
 	.header-text{
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #FFFFFF;
+		color: #00b198;
 		margin-right: 8rpx;
 	}
 	.header-text1{
 		font-weight: 400;
 		font-size: 24rpx;
-		color: #019c88;
+		color: #00b198;
 		margin-right: 8rpx;
 		border-radius: 30rpx;
-		background: #fff;
-		padding: 1rpx 10rpx;
-	}
-	.header-top-left image{
-		width: 24.31rpx;
-		height:22.92rpx;
-		margin-right: 2px;
-		margin-top: 3px;
 	}
+	
 	.header-top-left{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
+		margin-top:10rpx;
+		text-align: right;
 	}
 	.header-top{
-	width: 100%;
-	display: flex;
-	flex-direction: row;
-	justify-content: space-between;
-	margin-bottom: 10px;
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
 	}
 	.header{
-	width: 100%;
-	height: 300rpx;
-	padding: 15px;
-	background:#f5f5f5 url('../../static/index/fun_banner4.png');
-	background-repeat: no-repeat;
-	background-size: 100% 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-around;
-	}
+		width: 100%;
+		height: 280rpx;
+		padding: 15px;
+		background:#f7f7f7 url('../../static/index/technician15.png');
+		background-repeat: no-repeat;
+		background-size: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+		/*border-radius: 24rpx;*/
+	}	
 	.content{
 		width: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		height: 100vh;
+		/*height: 100vh;*/
 		background-color: #f7f7f7;
 		overflow: scroll;
 	}