From 4e7a24d5bd835d3dcb7209994d696efcee17c34d Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 1 Jul 2024 19:11:43 +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

---
 my/order/revenueDetails.vue |  3 ++-
 pages/index/index.vue       | 31 ++++++++++++++++---------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index d331fb0..3002d58 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -2103,7 +2103,8 @@
 		justify-content: space-between;
 		border-bottom: 1px solid #E5E5E5;
 		padding-bottom: 15px;
-		margin-bottom: 7px;
+		margin-bottom: 15px;
+		margin-top: 5px;
 	}
 	.mian-top{
 		width: 100%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 09a56ff..cc85f60 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -120,7 +120,7 @@
 					style="justify-content: space-evenly;text-align: center;">
 					<view class="">
 						<view  style="font-size: 24px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
-						<text style="font-size: 14px; margin-top: 5px;">当前业绩</text>
+						<text style="font-size: 14px; margin-top: 15px;">当前业绩</text>
 						<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
 					</view>
 					<view class="shuxian"></view>
@@ -425,6 +425,18 @@
 					<text
 						style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">今日服务</text>
 				</view>
+				<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
+					<view class="pintuan-title" >
+						<image src="../../static/clock.png" class="pintuan-img"></image>
+						<span class="pintuan-text">服务倒计时</span>
+					</view>
+					<!-- 						<uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
+						:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
+						color="#20C675">
+					</uni-countdown> -->
+					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+						font-size="30" separator-size="30"></u-count-down>
+				</view>
 				<view class="bgwhite radius margin-top-sm padding-bottom-sm"
 					:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
 					v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
@@ -444,18 +456,7 @@
 
 					</view>
 					<view class="xian" v-if="item.status == 6"></view>
-					<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
-						<view class="pintuan-title" >
-							<image src="../../static/clock.png" class="pintuan-img"></image>
-							<span class="pintuan-text">服务倒计时</span>
-						</view>
-						<!-- 						<uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
-							:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
-							color="#20C675">
-						</uni-countdown> -->
-						<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
-							font-size="30" separator-size="30"></u-count-down>
-					</view>
+					
 					<view class=" u-flex u-p-t-30 padding-sm">
 						<view class="u-m-r-10">
 							<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
@@ -1587,7 +1588,7 @@ page {
 
 .djimg {
 	position: absolute;
-	right: 40px;
+	right: 45px;
 	top: 0;
 	background: url(../../static/images/index/vip.png) no-repeat center;
 	background-size: cover;
@@ -1595,7 +1596,7 @@ page {
 	height: 77px;
 	font-size: 22px;
 	text-align: center;
-	line-height: 84px;
+	line-height: 90px;
 }
 
 .xianb {