From 03f946d21d4753d13a57ef61cbde7dc1ce44e2e4 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 2 Jul 2024 18:10:24 +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      | 63 ++++++++++++++++++++---------------
 pages/index/currentIncome.vue |  7 ++--
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index da6ba9a..bd56463 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content clock-padding">
 		<view class="header">
 			<view class="header-top">
 				<view class="header-top-left">
@@ -57,10 +57,10 @@
 										<span class="shouyi-text">0.8km</span>
 									</view> -->
 								</view>
-								<view class="mian-foot-dan shouyi-text">
+								<view class="mian-foot-dan od-number" >
 									订单编号 : {{item.ordersNo}}
 								</view>
-								<view class="mian-foot-adder shouyi-text">
+								<view class="mian-foot-adder add-text" >
 									服务地址 : {{item.address}}
 								</view>
 								<view class="mian-bottom">
@@ -96,16 +96,16 @@
 										<span class="shouyi-text">0.8km</span>
 									</view>
 								</view>
-								<view class="mian-foot-dan shouyi-text">
+								<view class="mian-foot-dan  od-number">
 									订单编号 : {{item.ordersNo}}
 								</view>
-								<view class="mian-foot-adder shouyi-text">
+								<view class="mian-foot-adder add-text">
 									服务地址 : {{item.address}}
 								</view>
 								<view class="mian-bottom">
-									<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
+									<view class="mian-bottom-xiang add-text">项目金额 : ￥{{item.price}}</view>
 									<view class="mian-bottom-shou">
-										<span class="shouyi-text">本单收益:  </span>
+										<span class="add-text">本单收益:  </span>
 										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
 									</view>
 								</view>
@@ -269,6 +269,7 @@
 	}
 	/deep/.page-box{
 		width: 100%;
+		background: #f7f7f7;
 	}
 	/deep/.t-loading-box{
 		text-align: center;
@@ -296,14 +297,13 @@
 		margin-bottom: 10px;
 	}
 	.tapNav-list{
-		width: 100%;
-		margin: 0 auto;
+		width: 94%;
+		margin: 8rpx auto;
 		display: flex;
 		flex-direction:row;
 		align-items: center;
 		justify-content: space-between;
-		background-color: #fff;
-	}
+		}
 	.tapNav-view{
 		height: 40px;
 		width: 50%;
@@ -350,6 +350,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+		margin-top: 4px;
 	}
 	.mian-foot-adder{
 		margin: 2px 0px;
@@ -378,30 +379,30 @@
 		margin-bottom: 5px;
 	}
 	.mian-foot-list{
-		width: 75%;
+		width: 73%;
 		display: flex;
 		flex-direction: column;
 	}
-	.mian-foot-img image{
+.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{
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		align-items: center;
 		justify-content: space-between;
 	}
 	.mian-list-top-time span{
-		font-size:25rpx;
+		font-size:26rpx;
 	}
 	.mian-list-top-time span:nth-child(1){
 		color: #7D7D7D;
@@ -446,13 +447,12 @@
 	}
 	.view-title-right{
 		font-weight: 400;
-		font-size: 21rpx;
+		font-size: 26rpx;
 		color: #666666;
 	}
 	.view-title-left-text{
 		font-weight: 400;
-		font-size: 25rpx;
-		color: #333333;
+		font-size: 26rpx;
 		margin-left: 5px;
 	}
 	.view-title-left-shuxian{
@@ -494,15 +494,14 @@
 		height: 49rpx;
 		line-height: 49rpx;
 		text-align: center;
-		font-size: 21rpx;
+		font-size: 26rpx;
 		color: #333333;
 		background: #FFFFFF;
 		border-radius: 24rpx;
-		margin-top: 8rpx;
 	}
 	.header-text{
 		font-weight: 400;
-		font-size: 27rpx;
+		font-size: 28rpx;
 		color: #FFFFFF;
 		margin-top: 2px;
 	}
@@ -527,8 +526,8 @@
 	.header{
 		width: 100%;
 		height: 300rpx;
-		padding: 15px 20px;
-		background:#fff url('../../static/index/fun_banner4.png');
+		padding: 15px;
+		background:#f5f5f5 url('../../static/index/fun_banner4.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		display: flex;
@@ -544,4 +543,16 @@
 		background-color: #f7f7f7;
 		overflow: scroll;
 	}
+	.clock-padding{
+		padding:0rpx 26rpx;
+		font-family: Helvetica Neue, Helvetica, sans-serif;
+	}
+	.od-number{
+	    font-size: 12px;
+	    color: #7ea866;
+	}
+	.add-text{
+	    font-size: 13px;
+	    color: #999;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index 2bcc3c5..5e5f2e1 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -5,13 +5,13 @@
 				<view class="header-top-left" style="margin-top: -10px;">
 					<image src="../../static/index/dangqian1.png" mode=""></image>
 					<span class="header-text">当前周期</span>
-					<span class="header-text" style="font-size: 16px;">{{startTime}}~{{endTime}}</span>
+					<span class="header-text">{{startTime}}~{{endTime}}</span>
 				</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-text" style="font-size: 14px; margin-top: -5px;">当前收益</view>
+				<view class="header-text" style=" margin-top: -5px;">当前收益</view>
 			</view>
 			<!-- 性别选择 -->
 			<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
@@ -330,7 +330,7 @@
 	}
 	.header-text{
 		font-weight: 400;
-		font-size: 28rpx;
+		font-size: 30rpx;
 		color: #FFFFFF;
 		margin-right: 8rpx;
 	}
@@ -344,6 +344,7 @@
 		display: flex;
 		flex-direction: row;
 		align-items: center;
+		align-items: flex-end;
 	}
 	.header-top{
 		width: 100%;